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

Changes of Revision 13

[-] Changed faad2.spec
​x
 
1
@@ -1,11 +1,16 @@
2
+
3
 # norootforbuild
4
-#!BuildIgnore:     post-build-checks
5
-%define name      faad2
6
-%define version   2.6.1
7
-%define release   8
8
-%define major     0
9
-%define lib       libfaad
10
-%define libname   %{lib}%{major}
11
+
12
+%define name       faad2
13
+%define version    2.7
14
+%define release    15
15
+%define major      2
16
+%define oldversion 2.6.1
17
+%define oldmajor   0
18
+%define lib        libfaad
19
+%define libname    %{lib}%{major}
20
+%define oldlibname %{lib}%{oldmajor}
21
+%define libmp4ff   libmp4ff%{oldmajor}
22
23
 Name:           %{name}
24
 Version:        %{version}
25
@@ -16,8 +21,9 @@
26
 Group:          Productivity/Multimedia/Video/Editors and Convertors
27
 URL:            http://www.audiocoding.com/
28
29
-Source0:        http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.bz2
30
-Source1:   %{name}-rpmlintrc
31
+Source0:        faad2-2.7.tar.bz2
32
+Source1:        faad2-2.6.1.tar.bz2
33
+
34
 Patch0:         faad2-libmp4ff.patch
35
 Patch1:         faad2-main_overflow.diff
36
 BuildRoot:      %{_tmppath}/buildroot-%{name}-%{version}
37
@@ -30,7 +36,7 @@
38
 BuildRequires:  id3lib-devel
39
 BuildRequires:  gcc-c++
40
 BuildRequires:  SDL-devel
41
-%if 0%{?suse_version} < 1000 && 0%{?suse_version} > 0
42
+%if 0%{?suse_version} < 1000
43
 BuildRequires:  glib
44
 BuildRequires:  glib-devel
45
 BuildRequires:  gtk
46
@@ -51,22 +57,49 @@
47
 Group:          System/Libraries
48
 Summary:        Shared library part of faad2
49
 Summary(de):    Bibliotheken zu faad2
50
-Requires:       libmp4v2
51
+Provides:       %{lib} = %{version}-%{release}
52
+Provides:       libfaad2_2 = %{version}-%{release}
53
+Obsoletes:      libfaad2_2 < %{version}-%{release}
54
+Provides:       libfaad-2 = %{version}-%{release}
55
+Obsoletes:      libfaad-2 < %{version}-%{release}
56
+
57
+%description -n %{libname}
58
+Shared library part of faad2
59
+
60
+%description -n %{libname} -l de
61
+Bibliotheken zu faad2
62
+
63
+%package -n %{oldlibname}
64
+Group:          System/Libraries
65
+Summary:        Shared library part of faad2
66
+Summary(de):    Bibliotheken zu faad2
67
 Provides:       %{lib} = %{version}-%{release}
68
 Provides:       libfaad2_0 = %{version}-%{release}
69
 Obsoletes:      libfaad2_0 < %{version}-%{release}
70
 Provides:       libfaad-0 = %{version}-%{release}
71
 Obsoletes:      libfaad-0 < %{version}-%{release}
72
73
-%description -n %{libname}
74
+%description -n %{oldlibname}
75
 Shared library part of faad2
76
77
-%description -n %{libname} -l de
78
+%description -n %{oldlibname} -l de
79
 Bibliotheken zu faad2
80
81
+%package -n %{libmp4ff}
82
+Group:          System/Libraries
83
+Summary:        Shared library libmp4ff
84
+Summary(de):    Bibliotheken libmp4ff
85
+Provides:       libmp4ff = %{version}-%{release}
86
+
87
+%description -n %{libmp4ff}
88
+Shared library libmp4ff
89
+
90
+%description -n %{libmp4ff} -l de
91
+Bibliotheken libmp4ff
92
+
93
 %package -n %{lib}-devel
94
-Summary:        Development files of the FAAD 2 AAC decoder
95
-Summary(de):    Entwicklerdateien des FAAD 2 AAC Dekoders
96
+Summary:        Development files of the FAAD 2 AAC decoder.
97
+Summary(de):    Entwicklerdateien des FAAD 2 AAC Dekoders.
98
 Group:          Development/Libraries/C and C++
99
 Requires:       %{libname} = %{version}-%{release}
100
 Requires:       libmp4v2-devel
101
@@ -85,8 +118,8 @@
102
103
104
 %package        xmms-plugin
105
-Summary:        Faad2 Xmms input plugin
106
-Summary(de):    Faad2 Xmms input plugin
107
+Summary:        faad2 Xmms input plugin
108
+Summary(de):    faad2 Xmms input plugin
109
 Group:          Productivity/Multimedia/Sound/Players
110
 Requires:       %{libname} = %{version}-%{release}
111
 Requires:       xmms >= 1.2.8
112
@@ -101,37 +134,46 @@
113
 %debug_package
114
115
 %prep
116
-%setup -qn faad2
117
-chmod 644 README NEWS AUTHORS ChangeLog COPYING TODO
118
+%setup -qn faad2-%{version} -b 1
119
+cd ../faad2
120
 %patch0
121
 %patch1 -p1
122
123
 %build
124
+export CFLAGS="$RPM_OPT_FLAGS -fPIC"
125
+%{__mkdir_p} plugins/bmp
126
+autoreconf -vif
127
+%suse_update_libdir plugins/xmms/src/Makefile.am
128
+%configure --with-xmms --with-pic
129
+%{__make} %{?jobs:-j%{jobs}}
130
+
131
+cd ../faad2
132
 export CFLAGS="$RPM_OPT_FLAGS"
133
 %{__mkdir_p} plugins/bmp
134
 %if 0%{?suse_version} >= 1100
135
 %__sed -i -e "s|dnl AC_PROG_CXX|AC_PROG_CXX|g" configure.in
136
 %endif
137
 autoreconf -vif
138
-%if 0%{?suse_version}
139
 %suse_update_libdir plugins/xmms/src/Makefile.am
140
-%endif
141
-%configure --with-xmms
142
-
143
+%configure
144
 %{__make} %{?jobs:-j%{jobs}}
145
146
+
147
 %install
148
 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
149
-%__make DESTDIR=%{buildroot} install
150
+cd ../faad2
151
+%makeinstall
152
+cd -
153
+%makeinstall
154
 %{__install} -m 644 common/mp4ff/mp4ff.h %{buildroot}%{_includedir}/
155
 %{__install} -m 644 common/mp4ff/mp4ff_int_types.h %{buildroot}%{_includedir}/
156
157
-%post -p /sbin/ldconfig
158
-%postun -p /sbin/ldconfig
159
-
160
 %post -n %{libname} -p /sbin/ldconfig
161
 %postun -n %{libname} -p /sbin/ldconfig
162
163
+%post -n %{oldlibname} -p /sbin/ldconfig
164
+%postun -n %{oldlibname} -p /sbin/ldconfig
165
+
166
 %clean
167
 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
168
169
@@ -139,10 +181,19 @@
170
 %defattr(-, root, root)
171
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
172
 %{_bindir}/*
173
+%{_mandir}/manm/faad.man.gz
174
175
 %files -n %{libname}
176
 %defattr(-,root,root)
177
-%{_libdir}/*.so.*
178
+%{_libdir}/libfaad.so.%{major}*
179
+
180
+%files -n %{oldlibname}
181
+%defattr(-,root,root)
182
+%{_libdir}/libfaad.so.%{oldmajor}*
183
+
184
+%files -n %{libmp4ff}
185
+%defattr(-,root,root)
186
+%{_libdir}/libmp4ff.so.%{oldmajor}*
187
188
 %files -n %{lib}-devel
189
 %defattr(-, root, root)
190
@@ -156,6 +207,5 @@
191
 %{_libdir}/xmms/Input/libmp4*
192
193
 %changelog
194
-* Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com>
195
-- import for SLE_10 build
196
-
197
+* Mon Jun 29 2009 Carsten Schoene <cs@linux-administrator.com> - 2.7.0-15
198
+- import for SLE_11 build
199
​
Added faad2-2.7.tar.bz2 ^
[+] Deleted faad2-rpmlintrc ^

Cancel