rpms/sim/F-9 sim.spec,1.1,1.2

[Pavel Alexeev]

Author: hubbitus

Update of /cvs/pkgs/rpms/sim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31550

Modified Files:
	sim.spec 
Log Message:
- Replace %post -p /sbin/ldconfig by simlply:
	%%post
	/sbin/ldconfig
	And accodingly in %%postun due tu rpmlint warning:
	sim.i386: E: postin-without-ldconfig /usr/lib/libsim.so.0.0.0
	(I not found what mean -p key, but appologise what it designed to run 1 command only)



Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/F-9/sim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sim.spec	30 Sep 2008 09:37:05 -0000	1.1
+++ sim.spec	4 Oct 2008 01:07:10 -0000	1.2
@@ -1,13 +1,12 @@
-%define with_kde 1
+%bcond_with kde
 %define SVNdate 20080923
 %define SVNrev 2261
 
 Name: 		sim
 Version: 		0.9.5
-Release:		0.6.%{SVNdate}svn%{SVNrev}rev
-#svn checkout -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk
+Release:		0.10.%{SVNdate}svn%{SVNrev}rev%{?dist}
+#svn checkout -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk; tar -cjf '%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2' trunk
 Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2
-Distribution:	Fedora
 Summary:		SIM - Multiprotocol Instant Messenger
 Summary(de):	SIM - Multiprotokoll Instant Messenger
 Summary(ru):	SIM - Мультипротокольный Мессенджер
@@ -15,22 +14,20 @@
 Group:		Applications/Internet
 URL:			http://sim-im.berlios.de/
 BuildRequires:	autoconf >= 2.52, automake >= 1.5
-BuildRequires:	gcc, gcc-c++, zlib-devel, libjpeg-devel, expat-devel, flex, libart_lgpl-devel, libpng-devel, gettext, libXScrnSaver-devel
-%if %{with_kde}
+BuildRequires:	zlib-devel, libjpeg-devel, expat-devel, flex, libart_lgpl-devel, libpng-devel, gettext, libXScrnSaver-devel
+%if %{with kde}
 %if %{fedora} == 8
-BuildRequires:		kdebase >= 3.0.0, kdelibs-devel >= 3.0.0
+BuildRequires:	kdebase-devel >= 3.0.0, kdelibs-devel >= 3.0.0
 %else #Fedora gt 8. Lt is not supported
-BuildRequires:	kdelibs3-devel >= 3.0.0
+BuildRequires:	kdebase3-devel >= 3.0.0, kdelibs3-devel >= 3.0.0
 %endif
 %endif
 BuildRequires:	qt-devel >= 3.0.0, openssl-devel, pcre-devel >= 3.9, arts-devel >= 1.0, libxml2-devel, libxslt-devel, boost-devel
-BuildRequires:	zip
+BuildRequires:	zip desktop-file-utils
 Requires:		qt >= 3.0.0, openssl, arts >= 1.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-SIM - Multiprotocol Instant Messenger
-
 SIM (Simple Instant Messenger) is a plugins-based open-
 source instant messenger that supports various protocols
 (ICQ, Jabber, AIM, MSN, LiveJournal, Yahoo!). It uses the 
@@ -63,25 +60,16 @@
 %prep
 %setup -q -n trunk
 make -f admin/Makefile.common
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" 
-
 
 %build
 %configure --disable-rpath \
-%if %{with_kde}
+%if %{with kde}
 	--enable-kde \
 %else
 	--disable-kde \
 %endif
-	$LOCALFLAGS
-
-# Setup for parallel builds
-numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
-if [ "$numprocs" = "0" ]; then
-  numprocs=1
-fi
 
-make -j $numprocs
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,7 +77,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-#Rm symlink, which seems as development.
+# rm symlink since we don't support developping with sim
 %{__rm} $RPM_BUILD_ROOT/%{_libdir}/libsim.so
 
 desktop-file-install --vendor="fedora" \
@@ -98,14 +86,22 @@
 	--dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
 	$RPM_BUILD_ROOT/%{_datadir}/applications/kde/%{name}.desktop
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -120,6 +116,30 @@
 %{_datadir}/services/
 
 %changelog
+* Sat Oct 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.10.20080923svn2261rev
+- Replace %post -p /sbin/ldconfig by simlply:
+	%%post
+	/sbin/ldconfig
+	And accodingly in %%postun due tu rpmlint warning:
+	sim.i386: E: postin-without-ldconfig /usr/lib/libsim.so.0.0.0
+	(I not found what mean -p key, but appologise what it designed to run 1 command only)
+
+* Sat Oct 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.9.20080923svn2261rev
+- Add %%{?dist} into Release!
+- Add icon-update-code into %%post/%%postun. (thanks to Patrice Dumas)
+
+* Sat Oct 4 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.8.20080923svn2261rev
+- Add BR desktop-file-utils
+
+* Fri Oct 3 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.7.20080923svn2261rev
+- By suggestion of Patrice Dumas use macros bcond_with instead of manual define with_kde
+- For Fedora8 BR kdebase changed to kdebase-devel for fedora > 8 add BR kdebase3-devel >= 3.0.0 (Patrice Dumas)
+- Remove CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" and $LOCALFLAGS
+	in configure, and "rm -rf $RPM_BUILD_DIR/%%{name}-%%{version}" in %%clean,
+	gcc and gcc-c++ from BR (Patrice Dumas)
+- Use make %%{?_smp_mflags} instead of manually determine number of CPUs (Patrice Dumas)
+- Remove Distribution: Fedora. (Patrice Dumas)
+
 * Sun Sep 28 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.6.20080923svn2261rev
 - "make install-strip" replaced by "make install" for correct build *-debuginfo package (Marcela Maslanova)