X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gcstar.spec;h=655b72a6fffed9f0b5b72af0a1ef380148b6c38b;hb=HEAD;hp=56007cf20454483a7c852b88d2b72b30932d24ed;hpb=80b6807424968fece6fbd354fb1a789e0da5faa0;p=packages%2Fgcstar.git

diff --git a/gcstar.spec b/gcstar.spec
index 56007cf..5a61ff1 100644
--- a/gcstar.spec
+++ b/gcstar.spec
@@ -5,26 +5,22 @@
 #	more then 1 package in 1 file.
 #	Anyway we don't want to provide/requires perl modules from non-standard dirs
 #
-# TODO:
-#	- maybe create subpackage
-#	- fix permssions of /usr/share/gcstar/helpers/xdg-open (or use system xdg-open)
-#	- split font package or rm fonts (included in fonts-TTF-RedHat-liberation?)
-#
-%include	/usr/lib/rpm/macros.perl
 Summary:	GCstar: collection manager
 Summary(hu.UTF-8):	GCstar: gyűjtemény kezelő
 Summary(pl.UTF-8):	GCstar: zarządca kolekcji
 Name:		gcstar
-Version:	1.7.0
-Release:	0.1
+Version:	1.7.1
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://download.gna.org/gcstar/%{name}-%{version}.tar.gz
-# Source0-md5:	94d0c4d6acc912b4b4d3a72d934cc16d
+# Source0-md5:	c109030b9c18c2d71f4d171d1b8c14d9
 Patch0:		%{name}-mandir.patch
 Patch1:		%{name}-desktop.patch
 # copy gcstar perl-libs to /usr/share instead of /usr/lib
 Patch2:		%{name}-perlmoddir.patch
+Patch3:		system-xdgopen.patch
+Patch4:		system-fonts.patch
 URL:		http://www.gcstar.org/
 BuildRequires:	perl-Archive-Zip
 BuildRequires:	perl-Gtk2
@@ -34,16 +30,21 @@ BuildRequires:	perl-XML-LibXML
 BuildRequires:	perl-XML-Simple
 BuildRequires:	perl-libwww
 BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.654
+# for statistics
+Suggests:	fonts-TTF-RedHat-liberation
+Suggests:	perl-Date-Calc
+Suggests:	perl-GD-Graph
+Suggests:	perl-GD
+Requires:	xdg-utils
 Requires(post,postun):	desktop-file-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# parts of Gtk2.pm package
-%define gtk2_subpkgs	Dialog\\\\|MenuBar\\\\|MessageDialog\\\\|ScrolledWindow\\\\|Toolbar\\\\|TreeView\\\\|VBox\\\\|Window
-
-# don't require/provide itself, it isn't in standard search path
-%define	_noautoprov	^perl(GC.*)$
-%define	_noautoreq	^perl(GC.*)$ ^perl(Gtk2::\\\\(%{gtk2_subpkgs}\\\\))$
+# don't provide itself, it isn't in standard search path
+%define	_noautoprov	'perl\\(GC.*\\)'
+# don't require itself, it isn't in standard search path and subpackages of Gtk2.pm
+%define _noautoreq_perl		GC.* Gtk2::Dialog Gtk2::EventBox Gtk2::Frame Gtk2::HBox Gtk2::MenuBar Gtk2::MessageDialog Gtk2::ScrolledWindow Gtk2::SimpleList Gtk2::Table Gtk2::Toolbar Gtk2::TreeView Gtk2::VBox Gtk2::Window
 
 %description
 GCstar is an application to manage different kind of collections. It
@@ -77,6 +78,9 @@ Aktualnie wspiera kolekcje:
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%undos lib/gcstar/GCStats.pm
+%patch4 -p1
 
 #rm BOM from files - it can confuse perl.prov
 find -type f -name '*.pm' | xargs sed -i 's/^\xef\xbb\xbf//'
@@ -85,7 +89,7 @@ find -type f -name '*.pm' | xargs sed -i 's/^\xef\xbb\xbf//'
 rm -rf $RPM_BUILD_ROOT
 
 ./install --text \
-	--nomenu \
+	--nomenu --noclean \
 	--prefix=$RPM_BUILD_ROOT%{_prefix}
 
 install -d $RPM_BUILD_ROOT%{_desktopdir}
@@ -111,6 +115,11 @@ install share/gcstar/icons/gcstar_scalable.svg $RPM_BUILD_ROOT%{_iconsdir}/hicol
 install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
 install share/applications/gcstar.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
 
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/LICENSE
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/helpers/xdg-open
+%{__rmdir} $RPM_BUILD_ROOT%{_datadir}/%{name}/helpers
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -129,9 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %attr(755,root,root) %{_bindir}/gcstar
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/fonts
 %{_datadir}/%{name}/genres
-%{_datadir}/%{name}/helpers
 %{_datadir}/%{name}/html_models
 %{_datadir}/%{name}/icons
 %dir %{_datadir}/%{name}/lib
@@ -182,3 +189,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gcstar.1*
 %{_desktopdir}/gcstar.desktop
 %{_pixmapsdir}/gcstar.png
+%{_iconsdir}/hicolor/*/apps/gcstar.*
+%{_datadir}/mime/packages/gcstar.xml