rpms/kdemultimedia/devel .cvsignore, 1.28, 1.29 kdemultimedia.spec, 1.43, 1.44 sources, 1.29, 1.30 admin-visibility.patch, 1.3, NONE

[fedora-cvs-commits redhat com]

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30656

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Removed Files:
	admin-visibility.patch 
Log Message:
update to 3.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	28 Jun 2005 15:29:35 -0000	1.28
+++ .cvsignore	2 Aug 2005 13:33:11 -0000	1.29
@@ -4,3 +4,4 @@
 kdemultimedia-3.4.0-patched-rc1.tar.bz2
 kdemultimedia-3.4.0-patched.tar.bz2
 kdemultimedia-3.4.1-patched.tar.bz2
+kdemultimedia-3.4.2-patched.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdemultimedia.spec	28 Jun 2005 15:29:35 -0000	1.43
+++ kdemultimedia.spec	2 Aug 2005 13:33:12 -0000	1.44
@@ -26,7 +26,9 @@
 %define patch_name -patched
 %endif
 
-Version: 3.4.1
+%define disable_gcc_check_and_hidden_visibility 1
+
+Version: 3.4.2
 Release: 1
 Epoch: 6
 Name: kdemultimedia
@@ -39,7 +41,6 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdemultimedia-3.4.0-config.patch
-Patch3: admin-visibility.patch
 Patch4: kdemultimedia-3.4.0-xdg.patch
 
 Prereq: /sbin/ldconfig
@@ -104,7 +105,6 @@
 %setup -q -n %{name}-%{version}%{patch_name}
 %patch1 -p1
 %patch2 -p1 -b .config
-%patch3 -p1 -b .gcc
 %patch4 -p1 -b .xdg
 
 # remove aktion, we don't ship xanim (license problems)
@@ -115,6 +115,13 @@
 perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in
 perl -pi -e "s,examples,,g" kmid/Make*
 
+%if %{disable_gcc_check_and_hidden_visibility}
+  # disable gcc check
+  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
+  # disable hidden visibility
+  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
+%endif
+
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -127,10 +134,6 @@
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
 
-%if ! %{build_mpeglib}
-   export DO_NOT_COMPILE="mpeglib mpeglib_artsplug mpg123_artsplugin"
-%endif
-
 %if %{arts}
 export CFLAGS="$CFLAGS `artsc-config --cflags`"
 export CXXFLAGS="$CXXFLAGS `artsc-config --cflags`"
@@ -162,7 +165,7 @@
 %endif
            --disable-xaw
 
-#SMP_MFLAGS=%{?_smp_mflags}
+SMP_MFLAGS=%{?_smp_mflags}
 
 make $SMP_MFLAGS
 make $SMP_MFLAGS -C doc
@@ -180,7 +183,9 @@
 
 %if %{redhatify}
   for f in $RPM_BUILD_ROOT%{appdir}/*.desktop ; do
-    echo "OnlyShowIn=KDE;" >> $f
+    if [ -f $RPM_BUILD_ROOT%{appdir}/*.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> $f
+    fi
   done
 %endif
 
@@ -251,6 +256,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Aug 02 2005 Than Ngo <than redhat com> 6:3.4.2-1
+- update to 3.4.2
+
 * Tue Jun 28 2005 Than Ngo <than redhat com> 6:3.4.1-1 
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	28 Jun 2005 15:29:35 -0000	1.29
+++ sources	2 Aug 2005 13:33:12 -0000	1.30
@@ -1 +1 @@
-3778e9e8d727092a89e84a4ba21d7e7b  kdemultimedia-3.4.1-patched.tar.bz2
+dfd636ebad7ae191f8ac7bc3705dab12  kdemultimedia-3.4.2-patched.tar.bz2


--- admin-visibility.patch DELETED ---