rpms/taglib/F-8 taglib-1.5b1-multilib.patch, NONE, 1.1 taglib-1.5rc1-multilib.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 taglib.spec, 1.23, 1.24
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Feb 21 02:50:26 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/taglib/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21782
Modified Files:
.cvsignore sources taglib.spec
Added Files:
taglib-1.5b1-multilib.patch taglib-1.5rc1-multilib.patch
Log Message:
* Wed Feb 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-1
- taglib-1.5
taglib-1.5b1-multilib.patch:
--- NEW FILE taglib-1.5b1-multilib.patch ---
diff -up taglib-1.5b1/taglib-config.cmake.multilib taglib-1.5b1/taglib-config.cmake
--- taglib-1.5b1/taglib-config.cmake.multilib 2008-01-29 19:30:00.000000000 -0600
+++ taglib-1.5b1/taglib-config.cmake 2008-02-04 08:37:38.000000000 -0600
@@ -14,10 +14,10 @@ EOH
exit 1;
}
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${LIB_INSTALL_DIR}
-includedir=${INCLUDE_INSTALL_DIR}
+taglib_prefix="`pkg-config --variable=prefix taglib`"
+taglib_cflags="`pkg-config --cflags taglib`"
+taglib_libs="`pkg-config --libs taglib`"
+taglib_version="`pkg-config --modversion taglib`"
flags=""
@@ -29,16 +29,16 @@ while test $# -gt 0
do
case $1 in
--libs)
- flags="$flags -L$libdir -ltag"
+ flags="$flags ${taglib_libs}"
;;
--cflags)
- flags="$flags -I$includedir/taglib"
+ flags="$flags ${taglib_cflags}"
;;
--version)
- echo 1.5
+ echo ${taglib_version}
;;
--prefix)
- echo $prefix
+ echo ${taglib_prefix}
;;
*)
echo "$0: unknown option $1"
taglib-1.5rc1-multilib.patch:
--- NEW FILE taglib-1.5rc1-multilib.patch ---
diff -up taglib-1.5rc1/taglib-config.cmake.multilib-2 taglib-1.5rc1/taglib-config.cmake
--- taglib-1.5rc1/taglib-config.cmake.multilib-2 2008-01-29 19:30:00.000000000 -0600
+++ taglib-1.5rc1/taglib-config.cmake 2008-02-13 06:41:11.000000000 -0600
@@ -16,7 +16,6 @@ EOH
prefix=${CMAKE_INSTALL_PREFIX}
exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${LIB_INSTALL_DIR}
includedir=${INCLUDE_INSTALL_DIR}
flags=""
@@ -29,7 +28,7 @@ while test $# -gt 0
do
case $1 in
--libs)
- flags="$flags -L$libdir -ltag"
+ flags="$flags -ltag"
;;
--cflags)
flags="$flags -I$includedir/taglib"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 12 Nov 2007 03:01:30 -0000 1.7
+++ .cvsignore 21 Feb 2008 02:49:50 -0000 1.8
@@ -1,2 +1 @@
-taglib-20070924.tar.gz
-taglib-20071111.tar.gz
+taglib-1.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 12 Nov 2007 03:01:30 -0000 1.7
+++ sources 21 Feb 2008 02:49:50 -0000 1.8
@@ -1 +1 @@
-4502d12ccd0a409584ec12981913a775 taglib-20071111.tar.gz
+7b557dde7425c6deb7bbedd65b4f2717 taglib-1.5.tar.gz
Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-8/taglib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- taglib.spec 12 Nov 2007 03:01:30 -0000 1.23
+++ taglib.spec 21 Feb 2008 02:49:50 -0000 1.24
@@ -1,26 +1,31 @@
-%define svn 20071111
+
+# cvsadmin: http://bugzilla.redhat.com/418271
Name: taglib
Version: 1.5
-Release: 0.6.%{svn}svn%{?dist}
+Release: 1%{?dist}
Summary: Audio Meta-Data Library
Group: System Environment/Libraries
License: LGPLv2
-URL: http://ktown.kde.org/~wheeler/taglib/
-Source0: taglib-%{svn}.tar.gz
-# The tarball is generated with the following script
+URL: http://developer.kde.org/~wheeler/taglib.html
+Source0: http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
+#Source0: taglib-%{svn}.tar.gz
+# The svn tarball is generated with the following script
Source1: taglib-svn.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+# what is this for? why not upstreamed, yet? Aurelien? -- Rex
+Patch0: http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
+# http://bugzilla.redhat.com/343241
+# try 1, use pkg-config
+Patch1: taglib-1.5b1-multilib.patch
+# try 2, kiss omit -L%_libdir
+Patch2: taglib-1.5rc1-multilib.patch
BuildRequires: cmake
BuildRequires: zlib-devel
-
%description
TagLib is a library for reading and editing the meta-data of several
popular audio formats. Currently it supports both ID3v1 and ID3v2 for
@@ -28,7 +33,7 @@
FLAC files.
%package devel
-Summary: Development tools for %{name}
+Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
@@ -37,8 +42,11 @@
%prep
-%setup -q -n taglib
-%patch0 -p1 -b .wchar
+%setup -q -n taglib-%{version}%{?beta}
+
+## omit for now
+#patch0 -p1 -b .wchar
+%patch2 -p1 -b .multilib
%build
@@ -51,39 +59,53 @@
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
rm -fr examples/.deps
rm -fr examples/Makefile*
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
+
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc AUTHORS COPYING.LGPL
%{_libdir}/lib*.so.*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc examples
%{_bindir}/*-config
%{_includedir}/*
%{_libdir}/lib*.so
-#%{_libdir}/lib*.la
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed Feb 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-1
+- taglib-1.5
+
+* Wed Feb 13 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-0.9.rc1
+- taglib-1.5rc1
+- omit taglib-1.4_wchar.diff (for now)
+
+* Mon Feb 04 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-0.8.b1
+- taglib-1.5b1
+
+* Wed Jan 16 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.7.20080116svn
+- svn20080116 snapshot
+- multiarch conflicts (#343241)
+
* Sun Nov 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.6.20071111svn
- svn20071111 snapshot (#376241)
More information about the fedora-extras-commits
mailing list