[svn] r5257 - in trunk/rpms: . k3b-extras
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Fri Mar 30 18:51:12 CEST 2007
Author: dag
Date: 2007-03-30 18:51:11 +0200 (Fri, 30 Mar 2007)
New Revision: 5257
Added:
trunk/rpms/k3b-extras/
trunk/rpms/k3b-extras/k3b-extras-nonfree.spec
Removed:
trunk/rpms/k3b-extras-nonfree/
trunk/rpms/k3b-extras/k3b-mp3.spec
Log:
Rename in progress
Copied: trunk/rpms/k3b-extras (from rev 5256, trunk/rpms/k3b-extras-nonfree)
Copied: trunk/rpms/k3b-extras/k3b-extras-nonfree.spec (from rev 5256, trunk/rpms/k3b-extras-nonfree/k3b-mp3.spec)
===================================================================
--- trunk/rpms/k3b-extras/k3b-extras-nonfree.spec (rev 0)
+++ trunk/rpms/k3b-extras/k3b-extras-nonfree.spec 2007-03-30 16:51:11 UTC (rev 5257)
@@ -0,0 +1,96 @@
+# $Id$
+# Authority: dag
+
+%{?dist: %{expand: %%define %dist 1}}
+
+%{!?dist:%define _with_modxorg 1}
+%{?fc7: %define _with_modxorg 1}
+%{?el5: %define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
+
+%{?fc1:%define _without_kde32 1}
+%{?el3:%define _without_kde32 1}
+%{?rh9:%define _without_kde32 1}
+%{?rh7:%define _without_kde32 1}
+%{?el2:%define _without_kde32 1}
+
+%{!?k3b_version:%define k3b_version %(rpm -q k3b --qf '%{RPMTAG_VERSION}' | tail -1)}
+
+Summary: Additional codec plugins for the k3b CD/DVD burning application
+Name: k3b-extras
+Version: %{k3b_version}
+Release: 1
+License: GPL
+Group: Applications/Multimedia
+URL: http://www.k3b.org/
+
+Source: http://dl.sf.net/k3b/k3b-%{version}.tar.bz2
+# Patch touches globals, better include this.
+Patch0: k3b-0.12.2-statfs.patch
+Patch1: k3b-0.11.24-no-bad-gcc.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+ExcludeArch: s390 s390x
+BuildRequires: k3b
+# Some of these are only to make the configure script happy.
+BuildRequires: kdelibs-devel >= 6:3.1, libart_lgpl-devel, arts-devel
+BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libmusicbrainz-devel
+BuildRequires: gettext, taglib-devel, libmad-devel, lame-devel, ffmpeg-devel
+BuildRequires: libmng-devel, fam-devel, glib2-devel, alsa-lib-devel, esound-devel
+%{!?_without_kde32:BuildRequires: libmng-devel fam-devel glib2-devel alsa-lib-devel esound-devel}
+%{?_with_modxorg:BuildRequires: libX11-devel}
+%{!?_with_modxorg:BuildRequires: XFree86-devel}
+
+Requires: k3b = %{k3b_version}
+
+Obsoletes: k3b-mp3 <= %{version}-%{release}
+Provides: k3b-mp3 = %{version}-%{release}
+
+%description
+Additional decoder/encoder plugins for k3b, a feature-rich and easy to
+handle CD/DVD burning application.
+
+%prep
+%setup -n k3b-%{version}
+#patch0 -p1 -b .statfs
+#patch1 -p1 -b .no-bad-gcc
+
+%build
+source /etc/profile.d/qt.sh
+%configure \
+ --disable-rpath \
+ --with-external-libsamplerate="no" \
+ --without-oggvorbis \
+ --without-flac \
+ --with-qt-libraries="$QTDIR/lib"
+
+%{__ln_s} -f %{_libdir}/libk3bcore.la libk3b/libk3b.la
+#%{__cp} -av %{_libdir}/libk3bcore.la libk3b/libk3b.la
+
+%{__make} -C plugins/decoder/mp3 %{?_smp_mflags}
+%{__make} -C plugins/encoder/lame %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} -C plugins/decoder/mp3 install DESTDIR="%{buildroot}"
+%{__make} -C plugins/encoder/lame install DESTDIR="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/kde3/
+%{_libdir}/kde3/libk3bmaddecoder.*
+%{_libdir}/kde3/libk3blameencoder.*
+%dir %{_datadir}/apps/
+%dir %{_datadir}/apps/k3b/
+%dir %{_datadir}/apps/k3b/plugins/
+%{_datadir}/apps/k3b/plugins/k3bmaddecoder.plugin
+%{_datadir}/apps/k3b/plugins/k3blameencoder.plugin
+
+%changelog
+* Sun Mar 05 2006 Dag Wieers <dag at wieers.com> - 0.12.10-1
+- Imported based on Livna SPEC file.
+- Initial package. (using DAR)
Deleted: trunk/rpms/k3b-extras/k3b-mp3.spec
===================================================================
--- trunk/rpms/k3b-extras-nonfree/k3b-mp3.spec 2007-03-30 16:31:39 UTC (rev 5256)
+++ trunk/rpms/k3b-extras/k3b-mp3.spec 2007-03-30 16:51:11 UTC (rev 5257)
@@ -1,91 +0,0 @@
-# $Id$
-# Authority: dag
-
-%{?dist: %{expand: %%define %dist 1}}
-
-%{!?dist:%define _with_modxorg 1}
-%{?fc7: %define _with_modxorg 1}
-%{?el5: %define _with_modxorg 1}
-%{?fc6: %define _with_modxorg 1}
-%{?fc5: %define _with_modxorg 1}
-
-%{?fc1:%define _without_kde32 1}
-%{?el3:%define _without_kde32 1}
-%{?rh9:%define _without_kde32 1}
-%{?rh7:%define _without_kde32 1}
-%{?el2:%define _without_kde32 1}
-
-%{!?k3b_version:%define k3b_version %(rpm -q k3b --qf '%{RPMTAG_VERSION}' | tail -1)}
-
-Summary: MP3 decoder plugin for k3b CD/DVD burner
-Name: k3b-mp3
-Version: %{k3b_version}
-Release: 1
-License: GPL
-Group: Applications/Multimedia
-URL: http://www.k3b.org/
-
-Source: http://dl.sf.net/k3b/k3b-%{version}.tar.bz2
-# Patch touches globals, better include this.
-Patch0: k3b-0.12.2-statfs.patch
-Patch1: k3b-0.11.24-no-bad-gcc.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildRequires: k3b
-# Some of these are only to make the configure script happy.
-BuildRequires: kdelibs-devel >= 6:3.1, libart_lgpl-devel, arts-devel
-BuildRequires: zlib-devel, libpng-devel, libjpeg-devel
-BuildRequires: gettext, taglib-devel libmad-devel lame-devel
-%{!?_without_kde32:BuildRequires: libmng-devel fam-devel glib2-devel alsa-lib-devel esound-devel}
-%{?_with_modxorg:BuildRequires: libX11-devel}
-%{!?_with_modxorg:BuildRequires: XFree86-devel}
-
-Requires: k3b = %{version}
-
-%description
-MP3 decoder plugin for k3b, a feature-rich and easy to handle CD/DVD
-burning application.
-
-%prep
-%setup -n k3b-%{version}
-#patch0 -p1 -b .statfs
-#patch1 -p1 -b .no-bad-gcc
-
-%build
-source /etc/profile.d/qt.sh
-%configure \
- --disable-rpath \
- --with-external-libsamplerate="no" \
- --without-oggvorbis \
- --without-flac \
- --with-qt-libraries="$QTDIR/lib"
-
-%{__ln_s} -f %{_libdir}/libk3bcore.la libk3b/libk3b.la
-#%{__cp} -av %{_libdir}/libk3bcore.la libk3b/libk3b.la
-
-%{__make} -C plugins/decoder/mp3 %{?_smp_mflags}
-%{__make} -C plugins/encoder/lame %{?_smp_mflags}
-
-%install
-%{__rm} -rf %{buildroot}
-%{__make} -C plugins/decoder/mp3 install DESTDIR="%{buildroot}"
-%{__make} -C plugins/encoder/lame install DESTDIR="%{buildroot}"
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%files
-%defattr(-, root, root, 0755)
-%dir %{_libdir}/kde3/
-%{_libdir}/kde3/libk3bmaddecoder.*
-%{_libdir}/kde3/libk3blameencoder.*
-%dir %{_datadir}/apps/
-%dir %{_datadir}/apps/k3b/
-%dir %{_datadir}/apps/k3b/plugins/
-%{_datadir}/apps/k3b/plugins/k3bmaddecoder.plugin
-%{_datadir}/apps/k3b/plugins/k3blameencoder.plugin
-
-%changelog
-* Sun Mar 05 2006 Dag Wieers <dag at wieers.com> - 0.12.10-1
-- Imported based on Livna SPEC file.
-- Initial package. (using DAR)
More information about the svn-commits
mailing list