rpms/barry/F-10 barry.desktop,1.3,1.4 barry.spec,1.6,1.7

[Christopher D. Stover]

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13146/F-10

Modified Files:
	barry.desktop barry.spec 
Log Message:
Add icon and make changes to spec file.



Index: barry.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-10/barry.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- barry.desktop	30 Jun 2009 23:07:24 -0000	1.3
+++ barry.desktop	1 Jul 2009 23:39:57 -0000	1.4
@@ -5,7 +5,7 @@ Name=Barry Backup
 GenericName=utility
 Comment=Backup your Blackberry
 Exec=barrybackup
-Icon=backup
+Icon=barrybackup
 Terminal=false
 Type=Application
 Categories=Utility;


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-10/barry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- barry.spec	30 Jun 2009 23:07:24 -0000	1.6
+++ barry.spec	1 Jul 2009 23:39:57 -0000	1.7
@@ -1,12 +1,4 @@
 # Fedora <= 8 & ==11 currently supports opensync 0.22
-#%define with_opensync 0
-#%if %{?fedora} < 9
-#    %define with_opensync 1
-#%endif
-#%if %{?fedora} > 10
-#    %define with_opensync 1
-#%endif
-
 %if 0%{?fc9}%{?fc10}
      %define with_opensync 0
 %else
@@ -30,6 +22,7 @@ URL:            http://www.netdirect.ca/
 # (cd build && ../tar-create.sh 0 15)
 Source0:        %{name}-%{version}-20090630.tar.bz2
 Source1:        %{name}.desktop
+Source2:        barrybackup24.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
@@ -65,7 +58,9 @@ This package contains the development li
 %package devel-docs
 Summary: BlackBerry Desktop for Linux - development libraries documentation
 Group: Development/Libraries
+%if 0%{?fedora} >= 10
 BuildArch: noarch
+%endif
 
 %description devel-docs
 This package contains the documentation for the development library files for
@@ -100,10 +95,6 @@ cd gui/
 %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-# Touch-magic to prevent auto* from running.  Thank you Andreas Metzler.
-#touch -r Makefile ./src/Makefile ./src/Makefile.am ./src/Makefile.in \
-#  ./man/Makefile.am ./man/Makefile.in config.h config.h.in Makefile.am \
-#  Makefile.in configure.ac aclocal.m4 configure
 %{__make} %{?_smp_mflags}
 cd ../
 
@@ -143,7 +134,10 @@ cd ../
 # gui tree
 cd gui/
 %{__make} DESTDIR=%{buildroot} install
-desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} 
+desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1}
+%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps
+
+install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/barrybackup.png
 cd ../
 
 # opensync tree
@@ -166,6 +160,7 @@ cd ../
 %{_datadir}/hal/fdi/policy/10osvendor/19-blackberry-acl.fdi
 %{_datadir}/barry/glade/*.glade
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/barrybackup*.png
 
 %config(noreplace) %{_sysconfdir}/ppp/peers/*
 %config(noreplace) %{_sysconfdir}/chatscripts/*.chat
@@ -200,6 +195,18 @@ cd ../
 %clean
 %{__rm} -rf %{buildroot}
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -208,8 +215,9 @@ cd ../
 * Wed Jun 30 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.7.20090630git
 - version/git bump
 - create separate doc package; BZ#508462
-- fixed the opensync build issue; BZ#506609
-- incorporated hal changes; BZ#478851
+- fixed opensync build issue; BZ#506609
+- incorporated hal changes to fix permission issues; BZ#478851
+- add icon for BarryBackup; BZ#483151
 
 * Wed Jun 23 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.6.20090623git
 - version/git bump