rpms/sim/devel sim.spec,1.6,1.7

Pavel Alexeev hubbitus at fedoraproject.org
Mon Oct 6 21:59:44 UTC 2008


Author: hubbitus

Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7269

Modified Files:
	sim.spec 
Log Message:
- Remove $RPM_BUILD_ROOT/%%{_datadir}/mimelnk/application/x-icq.desktop in %%install section for Fedora 8




Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sim.spec	6 Oct 2008 16:12:27 -0000	1.6
+++ sim.spec	6 Oct 2008 21:59:13 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name: 		sim
 Version: 		0.9.5
-Release:		0.11.%{SVNdate}svn%{SVNrev}rev%{?dist}
+Release:		0.12.%{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
 Summary:		SIM - Multiprotocol Instant Messenger
@@ -76,6 +76,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+
+%if %{fedora} == 8
+rm -f $RPM_BUILD_ROOT/%{_datadir}/mimelnk/application/x-icq.desktop
+%endif
+
 %find_lang %{name}
 
 # rm symlink since we don't support developping with sim
@@ -119,6 +124,9 @@
 %{_datadir}/services/
 
 %changelog
+* Tue Oct 7 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.12.20080923svn2261rev
+- Remove $RPM_BUILD_ROOT/%%{_datadir}/mimelnk/application/x-icq.desktop in %%install section for Fedora 8
+
 * Mon Oct 6 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.11.20080923svn2261rev
 - Install /usr/share/mimelnk/application/x-icq.desctop only for fedora > 8. In fedora 8 it is conflicts with same file from kdenetworks
 	( https://admin.fedoraproject.org/updates/sim-0.9.5-0.10.20080923svn2261rev.fc8 ).




More information about the fedora-extras-commits mailing list