[svn] r5256 - in trunk/rpms: . k3b-extras-nonfree

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-03-30 18:31:39 +0200 (Fri, 30 Mar 2007)
New Revision: 5256

Added:
   trunk/rpms/k3b-extras-nonfree/
Removed:
   trunk/rpms/k3b-mp3/
Modified:
   trunk/rpms/k3b-extras-nonfree/k3b-mp3.spec
Log:
Rename in progress

Copied: trunk/rpms/k3b-extras-nonfree (from rev 5248, trunk/rpms/k3b-mp3)

Modified: trunk/rpms/k3b-extras-nonfree/k3b-mp3.spec
===================================================================
--- trunk/rpms/k3b-mp3/k3b-mp3.spec	2007-03-28 21:53:45 UTC (rev 5248)
+++ trunk/rpms/k3b-extras-nonfree/k3b-mp3.spec	2007-03-30 16:31:39 UTC (rev 5256)
@@ -1,6 +1,14 @@
 # $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}
@@ -25,10 +33,12 @@
 
 BuildRequires: k3b
 # Some of these are only to make the configure script happy.
-BuildRequires: XFree86-devel, kdelibs-devel >= 6:3.1, libart_lgpl-devel, arts-devel
+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_kd32: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 = %{version}
 
@@ -50,7 +60,8 @@
 	--without-flac \
 	--with-qt-libraries="$QTDIR/lib"
 
-%{__ln_s} -f %{_libdir}/libk3b.la libk3b/libk3b.la
+%{__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}