Logoj0ke.net Open Build Service > Projects > multimedia > dvb > Changes
Sign Up | Log In

Changes of Revision 3

[-] Changed dvb.spec
x
 
1
@@ -1,7 +1,7 @@
2
 #
3
-# spec file for package dvb (Version 1.1.0_CVS20051019)
4
+# spec file for package dvb (Version 1.1.0_CVS20080331)
5
 #
6
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
7
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
8
 # This file and all modifications and additions to the pristine
9
 # package are under the same license as the package itself.
10
 #
11
@@ -9,48 +9,32 @@
12
 #
13
 
14
 # norootforbuild
15
-# usedforbuild    aaa_base acl attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db diffutils e2fsprogs file filesystem fillup findutils flex gawk gcc gdbm gdbm-devel gettext gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libgcc libnscd libstdc++ libtool libusb libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch perl permissions popt procinfo procps psmisc pwdutils rcs readline resmgr rpm sed strace sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel
16
+
17
 
18
 Name:           dvb
19
-BuildRequires:  libusb resmgr
20
-%if %suse_version > 810
21
-%define have_proper_libusb 1
22
-%else
23
-%define have_proper_libusb 0
24
-%endif
25
-%if %suse_version > 930
26
+BuildRequires:  libusb-devel
27
 %define firmwaredir /lib/firmware
28
-%else
29
-%define firmwaredir /usr/lib/hotplug/firmware
30
-%endif
31
-%if 0%{?suse_version} >= 1030
32
-BuildRequires: libusb-devel
33
-%endif
34
-License:        GPL
35
+License:        GPL v2 or later
36
 Group:          Hardware/TV
37
-Autoreqprov:    on
38
-Prereq:         %fillup_prereq %insserv_prereq
39
-Version:        1.1.0_CVS20051019
40
-Release:        17
41
+AutoReqProv:    on
42
+PreReq:         %fillup_prereq %insserv_prereq
43
+Version:        1.1.0_CVS20080331
44
+Release:        1.48
45
 Summary:        Tools for Digital (DVB) TV Cards
46
-Source:         dvb-apps-20051019.tar.bz2
47
+Source:         dvb-apps-20080331.tar.bz2
48
 Source1:        dvb-README.SuSE
49
 Source2:        rcdvb
50
 Source3:        sysconfig.dvb
51
-Source4:        http://linuxtv.org/downloads/firmware/dvb-ttpci-01.fw-261f
52
+Source4:        http://linuxtv.org/downloads/firmware/dvb-ttpci-01.fw-2622
53
 #Source4:      http://212.227.36.83/linuxtv/downloads/firmware/dvb-ttpci-01.fw-261d
54
-Patch0:         dvb-apps-oldkernel.diff
55
-Patch1:         dvb-apps-dvbnet.diff
56
-Patch2:         dvb-apps-various.diff
57
-Patch3:         dvb-apps-Makefile.diff
58
-Patch4:         dvb-apps-femon.diff
59
+Patch:          dvb-apps-dvbnet.diff
60
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
61
 # This package provides the firmware for some cards supported by the
62
 # dvb-ttpci.ko module. Add the modalias dependencies for this module:
63
 # Modules: dvb-ttpci.ko
64
-Supplements: modalias(pci:v00001131d00007146sv0000110Asd00000000bc*sc*i*)
65
-Supplements: modalias(pci:v00001131d00007146sv000013C2sd0000000[0123468AE]bc*sc*i*)
66
-Supplements: modalias(pci:v00001131d00007146sv000013C2sd00001002bc*sc*i*)
67
+Supplements:    modalias(pci:v00001131d00007146sv0000110Asd00000000bc*sc*i*)
68
+Supplements:    modalias(pci:v00001131d00007146sv000013C2sd0000000[0123468AE]bc*sc*i*)
69
+Supplements:    modalias(pci:v00001131d00007146sv000013C2sd00001002bc*sc*i*)
70
 # Generated with: extract-modaliases -i dvb-ttpci kernel-default.rpm
71
 
72
 %description
73
@@ -69,29 +53,21 @@
74
     Johannes Stezenbach <js@convergence.de>
75
     Holger Waechtler <holger@convergence.de>
76
 
77
-%debug_package
78
 %prep
79
 %setup -q -n dvb-apps
80
-%patch0 -p1
81
-%patch1 -p1
82
-%patch2 -p0
83
-%patch3 -p0
84
-%patch4 -p0
85
-find -name CVS -type d | xargs rm -rfv
86
+%patch -p1
87
+find -name .hg -type d | xargs rm -rfv
88
 find -name .cvsignore -type f | xargs rm -fv
89
 find -name '*.orig' -type f | xargs rm -fv
90
 
91
 %build
92
-%if %have_proper_libusb
93
-:
94
-%else
95
-echo "install:" > util/ttusb_dec_reset/Makefile # doesn't build on 8.1
96
-%endif
97
-make CFLAGS="%{optflags} -fno-strict-aliasing" \
98
+rm -rf include/linux
99
+make CFLAGS="%{optflags} -fno-strict-aliasing -fPIC" \
100
    CC=gcc \
101
    bindir=%{_bindir} \
102
-   datadir=%{_datadir} \
103
-   libdir=%{_libdir}
104
+   libdir=%{_libdir} \
105
+   V=1 \
106
+   ttusb_dec_reset=1
107
 
108
 %install
109
 export DESTDIR=%{buildroot}
110
@@ -100,20 +76,14 @@
111
 install -d -m 755 $DESTDIR/usr/{,s}bin $DESTDIR/etc/init.d $DESTDIR/usr/include \
112
    $DESTDIR/var/adm/fillup-templates
113
 #
114
-## include files
115
-#glibc-devel already has include/linux/dvb, move these to include/dvb
116
-install -d -m 755 $DESTDIR/usr/include/dvb/linux/include
117
-cp -a include/linux/dvb $DESTDIR/usr/include/dvb/linux/include
118
-#
119
 ## docu
120
 install -d -m 755 $DESTDIR%{_docdir}/dvb
121
-install -m 644 README TODO $DESTDIR%{_docdir}/dvb
122
+install -m 644 README $DESTDIR%{_docdir}/dvb
123
 install -m 644 %{SOURCE1} $DESTDIR%{_docdir}/dvb/README.SuSE
124
 #
125
 ##
126
 make \
127
    bindir=%{_bindir} \
128
-   datadir=%{_datadir} \
129
    libdir=%{_libdir} \
130
    prefix=%{_prefix} \
131
    includedir=%{_includedir} \
132
@@ -121,11 +91,11 @@
133
    install
134
 install -d -m 755 $DESTDIR/%{_docdir}/%{name}/szap
135
 install -m 644 util/szap/README $DESTDIR/%{_docdir}/%{name}/szap
136
-install -m 755 util/ttusb_dec_reset/README $DESTDIR/%{_docdir}/%{name}/README.ttusb_dec_reset
137
-install -m 755 util/av7110_loadkeys/README $DESTDIR/%{_docdir}/%{name}/README.av7110_loadkeys
138
+install -m 644 util/ttusb_dec_reset/README $DESTDIR/%{_docdir}/%{name}/README.ttusb_dec_reset
139
+install -m 644 util/av7110_loadkeys/README $DESTDIR/%{_docdir}/%{name}/README.av7110_loadkeys
140
 #
141
 # dvbnet
142
-install -m 755 util/dvbnet/net_start.* $DESTDIR/%{_docdir}/%{name}/
143
+install -m 644 util/dvbnet/net_start.* $DESTDIR/%{_docdir}/%{name}/
144
 ## sysconfig & init
145
 install -m 644 %{SOURCE3} $DESTDIR/var/adm/fillup-templates
146
 ln -sf /etc/init.d/dvb $DESTDIR/usr/sbin/rcdvb
147
@@ -140,6 +110,9 @@
148
    break
149
 done
150
 cd -
151
+#
152
+# noone really uses this so far AFAIK
153
+rm -r %{buildroot}%{_includedir} %{buildroot}%{_libdir}/*.a
154
 
155
 %post
156
 %{fillup_and_insserv dvb}
157
@@ -154,79 +127,87 @@
158
 /var/adm/fillup-templates/sysconfig.dvb
159
 %config /etc/init.d/dvb
160
 /usr/sbin/rcdvb
161
-%dir /usr/include/dvb
162
-/usr/include/dvb/*
163
 /usr/bin/*
164
-%{_libdir}/dvb
165
-%{_libdir}/*.so*
166
-%{_libdir}/*.a
167
-%if %suse_version <= 930
168
-%dir /usr/lib/hotplug
169
-%endif
170
+%if %suse_version <= 1020
171
 %dir %{firmwaredir}
172
+%endif
173
+%{_libdir}/*.so
174
 %{firmwaredir}/*
175
-
176
-%changelog -n dvb
177
-* Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com>
178
-- import for SLE_10 build
179
-* Fri Mar 10 2006 - lnussel@suse.de
180
+%changelog
181
+* Mon Mar 31 2008 lnussel@suse.de
182
+- update firmware to version 2622
183
+- update to current development snapshot
184
+  * mostly scan file updates
185
+* Thu Aug  9 2007 olh@suse.de
186
+- remove private include/linux/ files
187
+* Wed May 16 2007 olh@suse.de
188
+- Buildrequires libusb -> libusb-devel
189
+* Fri Mar 16 2007 lnussel@suse.de
190
+- remove /lib/firmware as it's now in the filesystem package
191
+* Mon Mar  5 2007 lnussel@suse.de
192
+- update to current development snapshot
193
+* Mon Sep 11 2006 lnussel@suse.de
194
+- add -fPIC to CFLAGS
195
+* Fri Sep  8 2006 lnussel@suse.de
196
+- update to current development snapshot
197
+* Fri Mar 10 2006 lnussel@suse.de
198
 - add modalias to Supplements (#156864)
199
-* Wed Jan 25 2006 - mls@suse.de
200
+* Wed Jan 25 2006 mls@suse.de
201
[+] Deleted dvb-apps-Makefile.diff ^
[+] Deleted dvb-apps-femon.diff ^
[+] Deleted dvb-apps-oldkernel.diff ^
[+] Deleted dvb-apps-various.diff ^
Changed dvb-apps-20080331.tar.bz2 ^
Deleted dvb-ttpci-01.fw-261f ^
Added dvb-ttpci-01.fw-2622 ^
[+] Changed rcdvb ^