packages: taglib/taglib.spec - switch to cmake build - enable asf and mp4 s...
cactus
cactus at pld-linux.org
Thu Sep 24 20:43:18 CEST 2009
Author: cactus Date: Thu Sep 24 18:43:18 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- switch to cmake build
- enable asf and mp4 support
---- Files affected:
packages/taglib:
taglib.spec (1.33 -> 1.34)
---- Diffs:
================================================================
Index: packages/taglib/taglib.spec
diff -u packages/taglib/taglib.spec:1.33 packages/taglib/taglib.spec:1.34
--- packages/taglib/taglib.spec:1.33 Thu Sep 24 11:13:12 2009
+++ packages/taglib/taglib.spec Thu Sep 24 20:43:12 2009
@@ -12,8 +12,7 @@
Patch1: kde-ac260-lt.patch
Patch2: taglib-am.patch
URL: http://ktown.kde.org/~wheeler/taglib.html
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake >= 1.6
+BuildRequires: cmake >= 2.6.2
BuildRequires: libstdc++-devel
BuildRequires: perl-base
BuildRequires: pkgconfig
@@ -42,26 +41,25 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
-cp -f /usr/share/automake/config.* admin
-%{__make} -f admin/Makefile.common cvs
-
-%configure \
- --disable-rpath \
- --enable-final \
- --enable-asf \
- --with-qt-libraries=%{_libdir}
-
+install -d build
+cd build
+%cmake \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DLIB_INSTALL_DIR=%{_libdir} \
+ -DWITH_ASF=ON \
+ -DWITH_MP4=ON \
+%if "%{_lib}" == "lib64"
+ -DLIB_SUFFIX=64 \
+%endif
+ ../
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
%clean
@@ -82,8 +80,6 @@
%attr(755,root,root) %{_bindir}/taglib-config
%{_libdir}/libtag.so
%{_libdir}/libtag_c.so
-%{_libdir}/libtag.la
-%{_libdir}/libtag_c.la
%{_pkgconfigdir}/taglib.pc
%{_pkgconfigdir}/taglib_c.pc
%{_includedir}/taglib
@@ -94,6 +90,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.34 2009/09/24 18:43:12 cactus
+- switch to cmake build
+- enable asf and mp4 support
+
Revision 1.33 2009/09/24 09:13:12 paszczus
- added patch to respect automake 1.11
- enabled ASF support
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/taglib/taglib.spec?r1=1.33&r2=1.34&f=u
More information about the pld-cvs-commit
mailing list