SPECS: scribus.spec - up to 1.3.3.4 - cleanup post/un and %%files

[deejay1]

Author: deejay1                      Date: Sun Oct 29 15:08:59 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.3.3.4
- cleanup post/un and %%files

---- Files affected:
SPECS:
   scribus.spec (1.110 -> 1.111) 

---- Diffs:

================================================================
Index: SPECS/scribus.spec
diff -u SPECS/scribus.spec:1.110 SPECS/scribus.spec:1.111
--- SPECS/scribus.spec:1.110	Fri Sep  1 16:51:05 2006
+++ SPECS/scribus.spec	Sun Oct 29 16:08:53 2006
@@ -11,14 +11,13 @@
 Summary:	Scribus - Open Source Desktop Publishing
 Summary(pl):	Scribus - DTP dla Wolnego Oprogramowania
 Name:		scribus
-Version:	1.3.3.3
-Release:	3
+Version:	1.3.3.4
+Release:	1
 License:	GPL v2
 Group:		X11/Applications/Publishing
 Source0:	http://dl.sourceforge.net/scribus/%{name}-%{version}.tar.bz2
-# Source0-md5:	cde9a4342697a69de60b017f59d32488
+# Source0-md5:	ccd7fb34a77b7e3d83e902fb3f5b731b
 Source1:	%{name}.desktop
-Source2:	%{name}icon.png
 Patch0:		%{name}-python.patch
 Patch1:		%{name}-standard-font-paths.patch
 Patch2:		%{name}-module-fixes.patch
@@ -43,8 +42,7 @@
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
-#BuildRequires:	qt-devel >= 3.0.5
-BuildRequires:	QtCore-devel
+BuildRequires:	qt-devel >= 3.0.5
 BuildRequires:	zlib-devel
 Requires:	python-PIL
 Requires:	python-tkinter
@@ -154,10 +152,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-#Install .desktop, .icon and .xml
+#Install .desktop
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-install scribus.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/scribus.xml
 
 rm -f $RPM_BUILD_ROOT%{_ulibdir}/scribus/*.no.qm
 
@@ -165,14 +161,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
-[ ! -x /usr/bin/update-mime-database ] || /usr/bin/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
+%update_desktop_database_post
+%update_mime_database
 
 %postun
-umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
-[ ! -x /usr/bin/update-mime-database ] || /usr/bin/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
+%update_desktop_database_postun
+%update_mime_database
 
 %files
 %defattr(644,root,root,755)
@@ -237,10 +231,10 @@
 %{_datadir}/mime/packages/scribus.xml
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/*
-#dir %{_datadir}/%{name}/samples
-#{_datadir}/%{name}/samples/*
-#dir %{_datadir}/%{name}/scripts
-#{_datadir}/%{name}/scripts/*
+%dir %{_datadir}/%{name}/samples
+%{_datadir}/%{name}/samples/*.py
+%dir %{_datadir}/%{name}/scripts
+%{_datadir}/%{name}/scripts/*.py
 %{_desktopdir}/%{name}.desktop
 %{_mandir}/man1/%{name}.*
 %lang(pl) %{_mandir}/pl/man1/%{name}.*
@@ -295,6 +289,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2006/10/29 15:08:53  deejay1
+- up to 1.3.3.4
+- cleanup post/un and %%files
+
 Revision 1.110  2006/09/01 14:51:05  cieciwa
 - release 3,
 - s/python-Imaging/python-PIL/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/scribus.spec?r1=1.110&r2=1.111&f=u