rpms/taglib/devel taglib-1.5rc1-multilib.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 taglib.spec, 1.26, 1.27
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Feb 13 12:46:19 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30794
Modified Files:
.cvsignore sources taglib.spec
Added Files:
taglib-1.5rc1-multilib.patch
Log Message:
* 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)
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/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 4 Feb 2008 15:16:57 -0000 1.9
+++ .cvsignore 13 Feb 2008 12:45:45 -0000 1.10
@@ -1,2 +1 @@
-taglib-20080116.tar.gz
-taglib-1.5b1.tar.gz
+taglib-1.5rc1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 4 Feb 2008 15:16:57 -0000 1.9
+++ sources 13 Feb 2008 12:45:45 -0000 1.10
@@ -1 +1 @@
-d8564b9fac72490ef02a2d12f4d4e664 taglib-1.5b1.tar.gz
+04c8d35177263d802cbae493cb8b1c83 taglib-1.5rc1.tar.gz
Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- taglib.spec 4 Feb 2008 15:16:57 -0000 1.26
+++ taglib.spec 13 Feb 2008 12:45:45 -0000 1.27
@@ -3,26 +3,29 @@
#define svn 20080116
#define beta %{svn}svn
-%define beta b1
+%define beta rc1
Name: taglib
Version: 1.5
-Release: 0.8.%{?beta}%{?dist}
+Release: 0.9.%{?beta}%{?dist}
Summary: Audio Meta-Data Library
Group: System Environment/Libraries
License: LGPLv2
URL: http://ktown.kde.org/~wheeler/taglib/
-Source0: http://developer.kde.org/~wheeler/files/src/taglib-1.5b1.tar.gz
+Source0: http://developer.kde.org/~wheeler/files/src/taglib-1.5rc1.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)
-# what is this for? why not upstreamed, yet? -- Rex
+# 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
@@ -34,7 +37,7 @@
FLAC files.
%package devel
-Summary: Development tools for %{name}
+Summary: Development file for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
@@ -45,8 +48,9 @@
%prep
%setup -q -n taglib-%{version}%{?beta}
-%patch0 -p1 -b .wchar
-%patch1 -p1 -b .multilib
+## omit for now
+#patch0 -p1 -b .wchar
+%patch2 -p1 -b .multilib
%build
@@ -59,30 +63,31 @@
%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}/*
@@ -91,6 +96,10 @@
%changelog
+* 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
More information about the fedora-extras-commits
mailing list