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

Changes of Revision 2

[-] Changed faad2.spec
​x
 
1
@@ -1,23 +1,31 @@
2
-Name:           faad2
3
+# norootforbuild
4
+
5
+%define name      faad2
6
+%define version   2.6.1
7
+%define release   1
8
+%define major     0
9
+%define lib       libfaad2
10
+%define libname   %{lib}_%{major}
11
+
12
+Name:           %{name}
13
+Version:        %{version}
14
+Release:        %{release}
15
 Summary:        C library and frontend for decoding MPEG2/4 AAC
16
 Summary(de):    C Bibliothek und Frontend zum Decodieren von MPEG2/4 AAC
17
-Version:        2.5
18
-Release:        1
19
-License:        GPL2
20
-Group:          Applications/Multimedia
21
+License:        GPL v2 or later
22
+Group:          Productivity/Multimedia/Video/Editors and Convertors
23
 URL:            http://www.audiocoding.com/
24
25
-Source0:        faad2-2.5.tar.bz2
26
+Source0:        faad2-2.6.1.tar.bz2
27
28
-Patch0:         faad2-remove-bmp.patch
29
-Patch1:         faad2-libmp4ff.patch
30
+Patch0:         faad2-libmp4ff.patch
31
 BuildRoot:      %{_tmppath}/buildroot-%{name}-%{version}
32
+Requires:       %{libname} = %{version}-%{release}
33
 Requires:       libmp4v2
34
 BuildRequires:  libmp4v2-devel
35
 BuildRequires:  glibc-devel
36
-%if %suse_version <= 1020
37
+BuildRequires:  libogg-devel
38
 BuildRequires:  xmms-devel
39
-%endif
40
 BuildRequires:  id3lib-devel
41
 BuildRequires:  gcc-c++
42
 BuildRequires:  SDL-devel
43
@@ -27,7 +35,8 @@
44
 BuildRequires:  gtk
45
 BuildRequires:  gtk-devel
46
 %endif
47
-# Packmandepends: libmp4v2
48
+Obsoletes:      faad2-drm
49
+Provides:       faad2-drm
50
51
 %description
52
 FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
53
@@ -37,29 +46,43 @@
54
 FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder.
55
56
57
-%package devel
58
+%package -n %{libname}
59
+Group:          System/Libraries
60
+Summary:        Shared library part of faad2
61
+Summary(de):    Bibliotheken zu faad2
62
+Requires:       libmp4v2
63
+Provides:       %{lib} = %{version}-%{release}
64
+
65
+%description -n %{libname}
66
+Shared library part of faad2
67
+
68
+%description -n %{libname} -l de
69
+Bibliotheken zu faad2
70
+
71
+%package -n %{lib}-devel
72
 Summary:        Development files of the FAAD 2 AAC decoder.
73
 Summary(de):    Entwicklerdateien des FAAD 2 AAC Dekoders.
74
-Group:          Development/Libraries
75
-Requires:       %{name} = %{version}-%{release}
76
+Group:          Development/Libraries/C and C++
77
+Requires:       %{libname} = %{version}-%{release}
78
 Requires:       libmp4v2-devel
79
-# Packmandepends: faad2 libmp4v2-devel
80
+Obsoletes:      faad2-devel
81
+Provides:       faad2-devel
82
+Obsoletes:      faad2-drm-devel
83
+Provides:       faad2-drm-devel
84
85
-%description devel
86
+%description -n %{lib}-devel
87
 Header files and development documentation for libfaad.
88
89
-%description -l de devel
90
+%description -n %{lib}-devel -l de
91
 Header-Dateien und Entwicklerdokumtation zur libfaad.
92
93
94
-%if %suse_version <= 1020
95
 %package        xmms-plugin
96
 Summary:        faad2 Xmms input plugin
97
 Summary(de):    faad2 Xmms input plugin
98
 Group:          Productivity/Multimedia/Sound/Players
99
-Requires:       %{name} = %{version}-%{release}
100
+Requires:       %{libname} = %{version}-%{release}
101
 Requires:       xmms >= 1.2.8
102
-# Packmandepends: faad2 xmms
103
104
 %description xmms-plugin
105
 The plugin read aac files with and without ID3tag(version 2.x), AAC files
106
@@ -67,25 +90,21 @@
107
108
 %description -l de xmms-plugin
109
 Das plugin liest AAC Dateien für xmms.
110
-%endif
111
+
112
+%debug_package
113
114
 %prep
115
 %setup -qn faad2
116
-%patch0 -p1
117
-%patch1
118
+%patch0
119
120
 %build
121
 export CFLAGS="$RPM_OPT_FLAGS"
122
 %{__mkdir_p} plugins/bmp
123
 autoreconf -vif
124
-%if %suse_version <= 1020
125
 %suse_update_libdir plugins/xmms/src/Makefile.am
126
-%configure --with-xmms
127
-%else
128
-%configure
129
-%endif
130
+%configure --with-xmms --with-drm
131
132
-%__make
133
+%{__make} %{?jobs:-j%{jobs}}
134
135
 %install
136
 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
137
@@ -106,20 +125,21 @@
138
 %defattr(-, root, root)
139
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
140
 %{_bindir}/*
141
-%{_libdir}/*.so*
142
143
-%files devel
144
+%files -n %{libname}
145
+%defattr(-,root,root)
146
+%{_libdir}/*.so.*
147
+
148
+%files -n %{lib}-devel
149
 %defattr(-, root, root)
150
-%{_libdir}/*.a
151
-%{_libdir}/*.la
152
+%{_libdir}/*.*a
153
+%{_libdir}/*.so
154
 %{_includedir}/*
155
156
-%if %suse_version <= 1020
157
 %files xmms-plugin
158
 %defattr(-, root, root)
159
 %doc plugins/xmms/README
160
 %{_libdir}/xmms/Input/libmp4*
161
-%endif
162
163
 %changelog
164
 * Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com>
165
​
[+] Changed faad2-libmp4ff.patch ^
[+] Deleted faad2-remove-bmp.patch ^
Changed faad2-2.6.1.tar.bz2 ^

Cancel