[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kdegraphics/devel .cvsignore, 1.26, 1.27 kdegraphics.spec, 1.52, 1.53 sources, 1.27, 1.28 admin-visibility.patch, 1.3, NONE kdegraphics-3.3.2-cleanup.patch, 1.1, NONE kdegraphics-3.4.1-dviwin_draw.patch, 1.1, NONE kdegraphics-3.4.1-gcc4.patch, 1.1, NONE



Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv305

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	admin-visibility.patch kdegraphics-3.3.2-cleanup.patch 
	kdegraphics-3.4.1-dviwin_draw.patch 
	kdegraphics-3.4.1-gcc4.patch 
Log Message:
update to 3.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	28 Jun 2005 21:15:00 -0000	1.26
+++ .cvsignore	11 Aug 2005 10:07:17 -0000	1.27
@@ -5,3 +5,4 @@
 kdegraphics-3.4.0-rc1.tar.bz2
 kdegraphics-3.4.0.tar.bz2
 kdegraphics-3.4.1.tar.bz2
+kdegraphics-3.4.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdegraphics.spec	4 Jul 2005 15:16:47 -0000	1.52
+++ kdegraphics.spec	11 Aug 2005 10:07:18 -0000	1.53
@@ -10,8 +10,10 @@
 
 %define no_scanner_archs s390 s390x
 
-Version: 3.4.1
-Release: 2
+%define disable_gcc_check_and_hidden_visibility 1
+
+Version: 3.4.2
+Release: 1
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -23,9 +25,6 @@
 Patch0: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
-Patch3: admin-visibility.patch
-Patch4: kdegraphics-3.4.1-gcc4.patch
-Patch5: kdegraphics-3.4.1-dviwin_draw.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -260,21 +259,24 @@
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
-%patch3 -p1 -b .gcc
-%patch4 -p1 -b .gcc4
-%patch5 -p1 -b .gcc4
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
 %endif
 
-
 # disable kpovmodeler temporary. waiting for freeglut
 %if !%{kpovmodeler}
    echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
 %endif
 
+%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
@@ -319,7 +321,9 @@
 done
 popd
 
-echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop
+if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop ] ; then
+  echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -352,6 +356,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Aug 11 2005 Than Ngo <than redhat com> 7:3.4.2-1
+- update to 3.4.2
+
 * Mon Jul 04 2005 Than Ngo <than redhat com> 7:3.4.1-2
 - apply gcc4 workaround to fix #162430
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	28 Jun 2005 21:15:00 -0000	1.27
+++ sources	11 Aug 2005 10:07:18 -0000	1.28
@@ -1 +1 @@
-d91ef530a416bd8407abb28103bc049c  kdegraphics-3.4.1.tar.bz2
+50916460952c4142329a7c6a47fe1530  kdegraphics-3.4.2.tar.bz2


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


--- kdegraphics-3.3.2-cleanup.patch DELETED ---


--- kdegraphics-3.4.1-dviwin_draw.patch DELETED ---


--- kdegraphics-3.4.1-gcc4.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]