rpms/bzr/EL-5 bzr-icon-64.png,NONE,1.1 bzr.spec,1.25,1.26

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/bzr/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12611/EL-5

Modified Files:
	bzr.spec 
Added Files:
	bzr-icon-64.png 
Log Message:

* Mon May 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2-0.6.b1
- Add an icon for bzr.  This lets the gtk and qbzr plugins share the same icon
  for things like associating an image with a file type.



Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/EL-5/bzr.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- bzr.spec	12 Apr 2010 20:50:44 -0000	1.25
+++ bzr.spec	31 May 2010 18:31:28 -0000	1.26
@@ -13,7 +13,7 @@
 %global bzrmajor 2.1
 %global bzrminor .1
 #global bzrrc rc2
-%global release 3
+%global release 4
 
 # Magics to get the dots in Release string correct per the above
 %global subrelease %{?bzrrc:.}%{?bzrrc}
@@ -28,6 +28,7 @@ License:        GPLv2+
 URL:            http://www.bazaar-vcs.org/
 Source0:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz
 Source1:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz.sig
+Source2:        bzr-icon-64.png
 # Merged upstream
 # https://bugs.launchpad.net/bzr/+bug/534330
 Patch0: bzr-old-sphinx.patch
@@ -42,9 +43,8 @@ BuildRequires:  python-sphinx
 Requires:   python-paramiko
 # Workaround Bug #230223 otherwise this would be a soft dependency
 Requires:   python-pycurl
-# ElementTree is part of python2.5 on FC7+
-# This is also needed for EL-5
-%if 0%{?fedora} <= 6
+# ElementTree is part of python2.5 so only needed for EL-5
+%if 0%{?rhel} && 0%{?rhel} <= 5
 BuildRequires:   python-elementtree
 Requires:   python-elementtree
 %endif
@@ -116,6 +116,9 @@ for dir in *; do
 done
 cd ..
 
+install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bzr.png
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,8 +130,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 %{python_sitearch}/bzrlib/
 %{_sysconfdir}/bash_completion.d/
-
-%if 0%{?fedora} > 8 || 0%{?rhel} > 5
+%{_datadir}/pixmaps/bzr.png
+%if 0%{?fedora} || 0%{?rhel} > 5
 %{python_sitearch}/*.egg-info
 %endif
 
@@ -137,6 +140,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_defaultdocdir}/%{name}-doc-%{version}/*
 
 %changelog
+* Mon May 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.1.1-4
+- Add an icon for bzr.  This lets the gtk and qbzr plugins share the same icon
+  for things like associating an image with a file type.
+- Clean up rhel/fedora conditionals bz#537254
+
 * Mon Apr 12 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.1.1-3
 - Clean up some rpmlint warnings