Logoj0ke.net Open Build Service > Projects > multimedia:SL11 > taglib > Changes
Sign Up | Log In

Changes of Revision 3

[-] Added taglib.changes
 
1
@@ -0,0 +1,5 @@
2
+-------------------------------------------------------------------
3
+Sun Jul 17 09:13:54 UTC 2011 - cs@linux-administrator.com
4
+
5
+- re-import 
6
+
7
[-] Changed taglib.spec ^
201
 
1
@@ -1,7 +1,7 @@
2
 #
3
-# spec file for package taglib (Version 1.6.3)
4
+# spec file for package taglib
5
 #
6
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
7
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
8
 #
9
 # All modifications and additions to the file contributed by third parties
10
 # remain the property of their copyright owners, unless otherwise agreed
11
@@ -19,84 +19,121 @@
12
 
13
 
14
 Name:           taglib
15
-BuildRequires:  cmake doxygen gcc-c++ graphviz update-desktop-files zlib-devel
16
-%if 0%{?suse_version} > 1020
17
-BuildRequires:  fdupes
18
-%endif
19
-License:        LGPLv2.1+ ; MPL ..
20
-Group:          Development/Libraries/C and C++
21
-Summary:        C++ Library to Parse Metadata in Media Files
22
+Version:        1.7
23
+Release:        7
24
+License:        LGPLv2.1+ ; MPLv1.1 ..
25
+Summary:        Audio Meta-Data Library
26
 Url:            http://ktown.kde.org/~wheeler/taglib/
27
-# bug437293
28
-%ifarch ppc64
29
-Obsoletes:      taglib-64bit
30
-%endif
31
-#
32
-Version:        1.6.3
33
-Release:        2
34
-Source0:        %name-%version.tar.bz2
35
-Source1:        %name.desktop
36
-Source2:        baselibs.conf
37
+Group:          System/Libraries
38
+# http://ktown.kde.org/~wheeler/files/src/taglib-1.7.tar.gz
39
+Source0:        %{name}-%{version}.tar.bz2
40
+Source1:        %{name}.desktop
41
+Source100:      baselibs.conf
42
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
43
+BuildRequires:  cmake
44
+BuildRequires:  doxygen
45
+BuildRequires:  fdupes
46
+BuildRequires:  gcc-c++
47
+BuildRequires:  graphviz-gnome
48
+BuildRequires:  libcppunit-devel
49
+BuildRequires:  pkg-config
50
+%if 0%{?suse_version}
51
+BuildRequires:  update-desktop-files
52
+%endif
53
+BuildRequires:  zlib-devel
54
+Requires:       libtag1 = %{version}
55
+Requires:       libtag_c0 = %{version}
56
 
57
 %description
58
-libtag provides a C++ interface for reading additional data (stored in
59
-TAGs) from MP3, Ogg Vorbis, and MPEG files.
60
+TagLib is a library for reading and editing the meta-data of several popular
61
+audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg
62
+Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack
63
+TrueAudio, WAV, AIFF, MP4 and ASF files.
64
 
65
-
66
-
67
-Authors:
68
---------
69
-    Scott Wheeler <wheeler@kde.org>
70
-
71
-%package devel
72
-Group:          Development/Libraries/C and C++
73
+%package -n libtag1
74
 License:        LGPLv2.1+
75
-Summary:        C++ Library to Parse Metadata in media files
76
-Requires:       taglib = %{version} libstdc++-devel
77
-# bug437293
78
-%ifarch ppc64
79
-Obsoletes:      taglib-devel-64bit
80
-%endif
81
-#
82
-
83
-%description devel
84
-libtag provides a C++ interface for reading additional data (stored in
85
-TAGs) from MP3, Ogg Vorbis, and MPEG files.
86
+Summary:        Audio Meta-Data Library
87
+Group:          System/Libraries
88
+# Without this the old taglib package containing the libraries isn't removed when this package is installed.
89
+# The only alternative is for the libraries to Require: taglib version-release, badness 440
90
+Conflicts:      taglib <= 1.6.3
91
+
92
+%description -n libtag1
93
+TagLib is a library for reading and editing the meta-data of several popular
94
+audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg
95
+Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack
96
+TrueAudio, WAV, AIFF, MP4 and ASF files.
97
 
98
+%package -n libtag_c0
99
+License:        LGPLv2.1+
100
+Summary:        Audio Meta-Data Library
101
+Group:          System/Libraries
102
+# Without this the old taglib package containing the libraries isn't removed when this package is installed.
103
+# The only alternative is for the libraries to Require: taglib version-release, badness 440
104
+Conflicts:      taglib <= 1.6.3
105
+
106
+%description -n libtag_c0
107
+TagLib is a library for reading and editing the meta-data of several popular
108
+audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg
109
+Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack
110
+TrueAudio, WAV, AIFF, MP4 and ASF files.
111
 
112
+%package -n libtag-devel
113
+License:        LGPLv2.1+
114
+Summary:        Development files for taglib
115
+Group:          Development/Libraries/C and C++
116
+Requires:       libstdc++-devel
117
+Requires:       libtag_c0 = %{version}-%{release}
118
+Requires:       libtag1 = %{version}-%{release}
119
+# taglib-devel was last used in openSUSE 11.4 (taglib-devel-1.6.2)
120
+# The last taglib-devel used was version 1.6.3 from multimedia:libs.
121
+Provides:       taglib-devel = %{version}
122
+Obsoletes:      taglib-devel <= 1.6.3
123
 
124
-Authors:
125
---------
126
-    Scott Wheeler <wheeler@kde.org>
127
+%description -n libtag-devel
128
+This package contains development files for taglib.
129
 
130
 %prep
131
 %setup -q
132
-#%{__make} -f Makefile.cvs
133
 
134
 %build
135
+mkdir build
136
+cd build
137
 export CXXFLAGS="%{optflags}"
138
 export CFLAGS="%{optflags}"
139
-_libsuffix=$(echo %_lib | cut -b4-)
140
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTS:BOOL=ON -DLIB_SUFFIX=$_libsuffix -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON .
141
-%{__make} %{?jobs:-j %jobs} VERBOSE=1
142
-cd doc
143
-doxygen taglib.doxygen
144
+_libsuffix=$(echo %{_lib} | cut -b4-)
145
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTS:BOOL=ON -DLIB_SUFFIX=$_libsuffix -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON ..
146
+make %{?_smp_mflags} VERBOSE=1
147
+cd ..
148
+
149
+doxygen -u
150
+doxygen
151
 
152
 %install
153
-%{__make} DESTDIR="%{buildroot}" install
154
+cd build
155
+%makeinstall
156
+cd ..
157
+
158
 # install susehelp file
159
-%{__mkdir_p} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/
160
-%{__install} -m 0644 %SOURCE1 \
161
-        %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/
162
-%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/%name.desktop
163
-%{__mkdir_p} %{buildroot}%_defaultdocdir/%name
164
-%{__cp} -a AUTHORS doc/html \
165
-      %{buildroot}%_defaultdocdir/%name/
166
-%if 0%{?suse_version} > 1020
167
-%fdupes %{buildroot}
168
+mkdir -p %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/
169
+install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/
170
+
171
+%if 0%{?suse_version}
172
+%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/%{name}.desktop
173
 %endif
174
 
175
+# Documentation
176
+mkdir -p %{buildroot}%{_defaultdocdir}/libtag-devel
177
+rm -f examples/CMake*
178
+cp -a AUTHORS COPYING.LGPL COPYING.MPL NEWS doc/html/ examples/ %{buildroot}%{_defaultdocdir}/libtag-devel/
179
+
180
+%fdupes -s %{buildroot}
181
+
182
+echo <<EOF >README.taglib
183
+This package only acts as a placeholder until all packages that use taglib
184
+have upgraded to the new package names libtag1 and libtag_c0.
185
+EOF
186
+
187
 %check
188
 # check the library
189
 #pushd tests
190
@@ -104,23 +141,37 @@
191
 #popd
192
 
193
 %clean
194
-%{__rm} -rf %{buildroot}
195
+%{?buildroot:%__rm -rf "%{buildroot}"}
196
 
197
-%post -p /sbin/ldconfig
198
+%post -n libtag1 -p /sbin/ldconfig
199
 
200
-%postun -p /sbin/ldconfig
201
[+] Changed baselibs.conf ^
Changed taglib-1.7.tar.bz2 ^
[+] Changed taglib.desktop ^