rpms/kdelibs/FC-4 kdelibs.spec, 1.100, 1.101 sources, 1.42, 1.43 kdelibs-3.2.0-icon.patch, 1.1, NONE

Fri Apr 7 21:44:03 UTC 2006

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv28304

Modified Files:
	kdelibs.spec sources 
Removed Files:
	kdelibs-3.2.0-icon.patch 
Log Message:
3.5.2



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/kdelibs.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101

--- kdelibs.spec	27 Jan 2006 16:53:43 -0000	1.100
+++ kdelibs.spec	7 Apr 2006 21:44:00 -0000	1.101
@@ -9,7 +9,7 @@
 %define cups_epoch 1
 
 %define qt_version 3.3.4
-%define arts_version 1.5.1
+%define arts_version 1.5.2
 %define kde_major_version 3
 
 %define qtdocdir %{_docdir}/qt-devel-%{qt_version}
@@ -21,7 +21,7 @@
 %define alsa 1
 %define arts 1
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
@@ -34,10 +34,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kde.sh
 Source2: kde.csh
-Source3: kde-applications.menu
 Source4: devices.protocol
+Patch1: kdelibs-3.5.1-xdg-menu.patch
 Patch2: kdelibs-3.0.0-ndebug.patch
-Patch3: kdelibs-3.2.0-icon.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
 Patch5: kdelibs-3.3.0-openssl.patch
 Patch7: kdelibs-3.4.0-menu.patch
@@ -63,9 +62,10 @@
 Requires: redhat-menus >= 1.4
 %endif
 
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): desktop-file-utils
 Requires: fileutils
 Requires: shadow-utils
-Requires: /sbin/ldconfig
 Requires: dev
 Requires: xorg-x11
 
@@ -153,7 +153,7 @@
 
 %prep
 %setup -q
-
+%patch1 -p1 -b .xdg-menu
 %if %{debug} == 0
 %patch2 -p1 -b .debug
 %endif
@@ -184,7 +184,7 @@
 %endif
 
 # set some default FLAGS
-FLAGS="$RPM_OPT_FLAGS"
+FLAGS="%{optflags}"
 
 %if %{debug}
    FLAGS="-O0"
@@ -192,8 +192,8 @@
 
 # workaround for compiler bug on ia64, will be removed later
 %ifarch ia64
-export CFLAGS="$RPM_OPT_FLAGS -O0"
-export CXXFLAGS="$RPM_OPT_FLAGS -O0"
+export CFLAGS="$FLAGS -O0"
+export CXXFLAGS="$FLAGS -O0"
 %endif
 
 export CXXFLAGS="$FLAGS"
@@ -272,22 +272,21 @@
 make apidox
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/services/
+install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/services/
 
-pushd $RPM_BUILD_ROOT%{_docdir}
-ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
+pushd %{buildroot}%{_docdir}
+  ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
 popd
 
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-install -m 755 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/
+mkdir -p %{buildroot}/etc/profile.d
+install -m 755 %{SOURCE1} %{SOURCE2} %{buildroot}/etc/profile.d/
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -297,45 +296,32 @@
 popd
 
 %if %{redhatify}
-	pushd $RPM_BUILD_ROOT%{_datadir}/icons/crystalsvg
-	for s in 16x16 22x22 32x32 48x48 64x64 128x128; do
-		pushd $s/apps/ || continue
-		# package icons
-		ln -sf package_wordprocessing.png redhat-office.png
-		ln -sf package_network.png redhat-internet.png
-		ln -sf package_applications.png redhat-accessories.png
-		ln -sf package_graphics.png redhat-graphics.png
-		ln -sf package_games.png redhat-games.png
-		ln -sf multimedia.png redhat-sound_video.png
-		ln -sf package_settings.png redhat-preferences.png
-		ln -sf package_development.png redhat-programming.png
-		ln -sf ../filesystems/server.png redhat-network-server.png
-		ln -sf ../filesystems/server.png redhat-server_settings.png
-		ln -sf package_utilities.png redhat-system_tools.png
-		ln -sf package_system.png redhat-system_settings.png
-		ln -sf package_utilities.png redhat-tools.png
-		# app icons
-		ln -sf kmail.png redhat-email.png
-		ln -sf konqueror.png redhat-web-browser.png
-		ln -sf kfm.png redhat-filemanager.png
-		ln -sf kfm_home.png redhat-home.png
-		ln -sf kviewshell.png redhat-logviewer.png
-		# system settings
-		ln -sf multimedia.png system-config-soundcard.png
-		popd
-	done
-	popd
-	rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
-	rm -f $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu
-	install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xdg/menus/
-   pushd $RPM_BUILD_ROOT/etc/xdg/menus/
-   ln -s applications-merged kde-applications-merged
-   popd
-	echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
+  # link upstream icon names to the redhat ones in bluecurve
+  for s in 16x16 24x24 32x32 36x36 48x48; do
+    mkdir -p %{buildroot}%{_datadir}/icons/Bluecurve/$s/apps
+    pushd %{buildroot}%{_datadir}/icons/Bluecurve/$s/apps
+    ln -sf redhat-office.png package_wordprocessing.png
+    ln -sf redhat-accessories.png package_applications.png
+    ln -sf redhat-graphics.png package_graphics.png
+    ln -sf redhat-games.png package_games.png
+    ln -sf redhat-programming.png package_development.png
+    ln -sf redhat-system_tools.png package_utilities.png
+    ln -sf redhat-tools.png package_utilities.png
+    # app icons
+    ln -sf redhat-web-browser.png konqueror.png
+    ln -sf redhat-logviewer.png kviewshell.png
+    popd
+  done
+  pushd %{buildroot}/etc/xdg/menus/
+  mv applications.menu kde-applications.menu
+  ln -s applications-merged kde-applications-merged
+  popd
+  echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+  rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %pre
 if [ -d /etc/skel/Desktop/Autostart ]; then
@@ -345,9 +331,21 @@
 fi
 exit 0
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
+%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -383,6 +381,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Fri Apr 07 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Fri Jan 27 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	27 Jan 2006 13:55:21 -0000	1.42
+++ sources	7 Apr 2006 21:44:00 -0000	1.43
@@ -1 +1 @@
-2a22193ae7c23f3759b02723dab02d30  kdelibs-3.5.1.tar.bz2
+367738696dc468859cf90d5a6e8f18a9  kdelibs-3.5.2.tar.bz2


--- kdelibs-3.2.0-icon.patch DELETED ---


