rpms/pdfchain/F-11 pdfchain-desktop.patch, 1.1, 1.2 pdfchain.spec, 1.1, 1.2 sources, 1.2, 1.3

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/pdfchain/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12625/F-11

Modified Files:
	pdfchain-desktop.patch pdfchain.spec sources 
Log Message:
Update to 0.123.

pdfchain-desktop.patch:

Index: pdfchain-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pdfchain/F-11/pdfchain-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pdfchain-desktop.patch	27 May 2009 20:06:28 -0000	1.1
+++ pdfchain-desktop.patch	16 Jul 2009 14:29:55 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up pdfchain_v.0.99/pdfchain.desktop.orig pdfchain_v.0.99/pdfchain.desktop
---- pdfchain_v.0.99/pdfchain.desktop.orig	2009-04-06 20:41:34.000000000 +0300
-+++ pdfchain_v.0.99/pdfchain.desktop	2009-05-27 17:08:47.000000000 +0300
+diff -up pdfchain-0.123/application/pdfchain.desktop.orig pdfchain-0.123/application/pdfchain.desktop
+--- pdfchain-0.123/application/pdfchain.desktop.orig	2009-06-18 16:59:53.000000000 +0300
++++ pdfchain-0.123/application/pdfchain.desktop	2009-07-16 17:04:49.756593863 +0300
 @@ -1,16 +1,12 @@
  [Desktop Entry]
 -Version=ALPHA


Index: pdfchain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfchain/F-11/pdfchain.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pdfchain.spec	27 May 2009 20:06:28 -0000	1.1
+++ pdfchain.spec	16 Jul 2009 14:29:55 -0000	1.2
@@ -1,19 +1,21 @@
 Name:		pdfchain
-Version:	0.99
-Release:	3%{?dist}
+Version:	0.123
+Release:	1%{?dist}
 Summary:	A GUI for pdftk
 Group:		Applications/Productivity
 License:	GPLv3
 URL:		http://sourceforge.net/projects/pdfchain
-Source0:	http://downloads.sourceforge.net/pdfchain/%{name}_v.%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/pdfchain/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Patch to make specfile conform to standards
+# Patch to make desktop file conform to standards
 Patch0:		pdfchain-desktop.patch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	glibmm24-devel
 BuildRequires:	gtkmm24-devel
 
+# For dir ownership
+Requires:		hicolor-icon-theme
 Requires:		pdftk
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
@@ -23,39 +25,59 @@ PDF Chain is a GUI for pdftk written wit
 to one pdf file or split. There are also some options and tools.
 
 %prep
-%setup -q -n %{name}_v.%{version}
+%setup -q
 %patch0 -p1
+# Stop if files acquire content
+[ -s NEWS ] && exit 1
+[ -s README ] && exit 1
 
 %build
-# Remove binary in tarball
-make clean
-make CFLAGS="`pkg-config gtkmm-2.4 --cflags --libs` %{optflags}" %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot} 
-install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 %{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
+make install DESTDIR=%{buildroot}
+# Remove doc dir
+rm -rf %{buildroot}%{_prefix}/doc/pdfchain
+# Validate desktop file
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-# Update mime types
 %post
+# Update mime types
 update-desktop-database &> /dev/null || :
+# Update icon cache
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
+# Update mime types
 update-desktop-database &> /dev/null || :
 
+# Update icon cache
+if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+# Update icon cache
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %clean
 rm -rf %{buildroot} 
 
 %files
 %defattr(-,root,root,-)
-%doc doc/changelog.txt doc/copyright.txt doc/license.txt doc/releasenotes.txt
+%doc AUTHORS ChangeLog COPYING
 %{_bindir}/pdfchain
 %{_datadir}/applications/pdfchain.desktop
+%{_datadir}/icons/hicolor/*/apps/pdfchain.png
 %{_datadir}/pixmaps/pdfchain.png
 
 %changelog
+* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.123-1
+- Update to 0.123.
+
 * Wed May 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99-3
 - Added missing BR: desktop-file-utils.
 - Set license as GPLv3 for now.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfchain/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 May 2009 20:06:28 -0000	1.2
+++ sources	16 Jul 2009 14:29:55 -0000	1.3
@@ -1 +1 @@
-0ede5640b1c6f0f2f513e992b60a261f  pdfchain_v.0.99.tar.gz
+88870ffaf28833b85d84b02da60f41a4  pdfchain-0.123.tar.gz