rpms/kdemultimedia-extras/FC-5 kdemultimedia-3.5.3-config.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 kdemultimedia-extras.spec, 1.3, 1.4 sources, 1.3, 1.4

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10047

Modified Files:
	.cvsignore kdemultimedia-extras.spec sources 
Added Files:
	kdemultimedia-3.5.3-config.patch 
Log Message:
* Fri May 05 2006 Rex Dieter 6:3.5.2-5
- relax Requires: kdemultimedia


kdemultimedia-3.5.3-config.patch:

--- NEW FILE kdemultimedia-3.5.3-config.patch ---
--- kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am.config	2005-02-03 23:48:26.000000000 +0100
+++ kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am	2005-02-28 20:47:00.223979671 +0100
@@ -9,8 +9,8 @@
 
 noinst_LTLIBRARIES  = libworkman.la
 
-libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries)
-libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND)
+libworkman_la_LDFLAGS = $(all_libraries)
+libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTSC_LIBS) $(ARTS_LIBASOUND)
 
 libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\
 database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 May 2006 12:29:24 -0000	1.3
+++ .cvsignore	21 Jul 2006 13:18:37 -0000	1.4
@@ -1 +1,2 @@
 kdemultimedia-3.5.2-patched.tar.bz2
+kdemultimedia-3.5.3-patched.tar.bz2


Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdemultimedia-extras.spec	5 May 2006 12:29:24 -0000	1.3
+++ kdemultimedia-extras.spec	21 Jul 2006 13:18:37 -0000	1.4
@@ -65,9 +65,11 @@
 %endif
 
 Group:   Applications/Multimedia
+#if "%{?core}" == "1"
 Epoch:	 6
-Version: 3.5.2
-Release: 5%{?dist}%{?kde}
+#endif
+Version: 3.5.3
+Release: 2%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -107,9 +109,9 @@
 %{?_with_polypaudio:BuildRequires: polypaudio-devel}
 
 Patch0: kde-libtool.patch
-#Patch2: kdemultimedia-3.4.0-config.patch
-Patch2: kdemultimedia-3.4.0-arts_includes.patch
-Patch4: kdemultimedia-3.4.0-xdg.patch
+Patch1: kdemultimedia-3.4.0-arts_includes.patch
+Patch2: kdemultimedia-3.5.3-config.patch
+Patch3: kdemultimedia-3.4.0-xdg.patch
 
 ## kde-redhat patches
 # unconditinally include oggvorbis_artsplugin 
@@ -189,8 +191,11 @@
 %endif
 
 #patch0 -p1 -b .libtool
-%patch2 -p1 -b .arts_include
-%patch4 -p1 -b .xdg
+%if "%{version}" < "3.5.3"
+%patch1 -p1 -b .arts_include
+%endif
+%patch2 -p1 -b .config
+%patch3 -p1 -b .xdg
 
 #with mpeglib in -extras, not really needed -- Rex
 #patch1000   -p1 -b .oggvorbis_artsplugin
@@ -204,8 +209,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-
 
 DO_NOT_COMPILE=""
 #{!?extras:export  DO_NOT_COMPILE="$DO_NOT_COMPILE juk"}
@@ -215,6 +218,8 @@
 %{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"}
 %{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE mpg123_artsplugin"}
 
+%{?extras:export CPPFLAGS="$CPPFLAGS -I%{_includedir}/kde/arts"}
+
 %configure \
   --includedir=%{_includedir}/kde \
   --disable-rpath \
@@ -435,6 +440,13 @@
 
 
 %changelog
+* Fri Jun 02 2006 Rex Dieter 6:3.5.3-2
+- use -patched source
+- borrow fc's -config.patch
+
+* Wed May 24 2006 Rex Dieter 6:3.5.3-1
+- kde-3.5.3
+
 * Fri May 05 2006 Rex Dieter 6:3.5.2-5
 - relax Requires: kdemultimedia
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 May 2006 12:29:24 -0000	1.3
+++ sources	21 Jul 2006 13:18:37 -0000	1.4
@@ -1 +1,2 @@
 54f9947051ee5cf50c81a5ea382943f1  kdemultimedia-3.5.2-patched.tar.bz2
+52bb137a4605a35e56ec9dc1070e0e28  kdemultimedia-3.5.3-patched.tar.bz2