rpms/gnome-specimen/devel .cvsignore, 1.3, 1.4 gnome-specimen.spec, 1.6, 1.7 sources, 1.3, 1.4

[Pablo Martin-Gomez]

Author: bouska

Update of /cvs/pkgs/rpms/gnome-specimen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16571

Modified Files:
	.cvsignore gnome-specimen.spec sources 
Log Message:
Updated to 0.4 and fix a FTBFS bug


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-specimen/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jul 2007 13:38:08 -0000	1.3
+++ .cvsignore	29 Aug 2009 20:34:35 -0000	1.4
@@ -1 +1 @@
-gnome-specimen-0.3.tar.gz
+gnome-specimen-0.4.tar.gz


Index: gnome-specimen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-specimen/devel/gnome-specimen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnome-specimen.spec	25 Jul 2009 00:47:26 -0000	1.6
+++ gnome-specimen.spec	29 Aug 2009 20:34:35 -0000	1.7
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gnome-specimen
-Version:        0.3
-Release:        5%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        A simple tool to view and compare fonts installed on your system
 
 Group:          Applications/System
@@ -27,17 +27,17 @@ your system
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} pyexecdir=%{python_sitelib}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT pyexecdir=%{python_sitelib}
 
-desktop-file-install --vendor="" --delete-original \
+desktop-file-install --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
-  $RPM_BUILD_ROOT%{_datadir}/applications//%{name}.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %find_lang %{name}
@@ -45,7 +45,6 @@ desktop-file-install --vendor="" --delet
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -55,16 +54,17 @@ if [ "$1" -gt 1 ]; then
 fi
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 killall -HUP gconfd-2 || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 
 
 %preun
@@ -78,14 +78,21 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%dir %{python_sitelib}/specimen
+%{python_sitelib}/specimen/*.py*
 %{_bindir}/%{name}
-%{python_sitelib}/specimen
 %{_datadir}/%{name}
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Fri Aug 21 2009 Pablo Martin-Gomez <pablo.martin-gomez at laposte.net> 0.4-1
+- Update to 0.4
+- Fix bug rh #511791 by adding 'pyexecdir=%{python_sitelib}' to make and make install
+- Own the created directory
+- Clean the spec
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-specimen/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jul 2007 13:38:08 -0000	1.3
+++ sources	29 Aug 2009 20:34:35 -0000	1.4
@@ -1 +1 @@
-6f1abf2d6245a890f6778a5f9f25c0c7  gnome-specimen-0.3.tar.gz
+c1af774ee4ab5bd1289699b4094368b3  gnome-specimen-0.4.tar.gz