rpms/sim/devel import.log,1.2,1.3 sim.spec,1.1,1.2
Pavel Alexeev
hubbitus at fedoraproject.org
Fri Oct 3 20:41:39 UTC 2008
Author: hubbitus
Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26854/devel
Modified Files:
import.log sim.spec
Log Message:
Changes from review, after accept but by comments in it.
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 30 Sep 2008 21:32:44 -0000 1.2
+++ import.log 3 Oct 2008 20:41:09 -0000 1.3
@@ -1,2 +1,3 @@
sim-0_9_5-0_6_20080923svn2261rev:HEAD:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222767069
sim-0_9_5-0_6_20080923svn2261rev:HEAD:sim-0.9.5-0.6.20080923svn2261rev.src.rpm:1222810315
+sim-0_9_5-0_7_20080923svn2261rev:HEAD:sim-0.9.5-0.7.20080923svn2261rev.src.rpm:1223066373
Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sim.spec 30 Sep 2008 09:32:52 -0000 1.1
+++ sim.spec 3 Oct 2008 20:41:09 -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.7.%{SVNdate}svn%{SVNrev}rev
+#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,12 +14,12 @@
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
@@ -29,8 +28,6 @@
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
@@ -98,10 +86,8 @@
--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
@@ -120,6 +106,15 @@
%{_datadir}/services/
%changelog
+* 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)
More information about the scm-commits
mailing list