packages: scribus/scribus-docs.patch, scribus/scribus.spec - up to 1.3.8

arekm arekm at pld-linux.org
Mon Aug 16 09:57:08 CEST 2010 

Author: arekm                        Date: Mon Aug 16 07:57:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.3.8

---- Files affected:
packages/scribus:
   scribus-docs.patch (1.1 -> 1.2) , scribus.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: packages/scribus/scribus-docs.patch
diff -u packages/scribus/scribus-docs.patch:1.1 packages/scribus/scribus-docs.patch:1.2
--- packages/scribus/scribus-docs.patch:1.1	Thu Jan 10 13:28:42 2008
+++ packages/scribus/scribus-docs.patch	Mon Aug 16 09:57:03 2010
@@ -1,19 +1,14 @@
-diff -ur scribus-1.3.3.10/CMakeLists.txt SCRIBUS-1.3.3.10-DOCS/CMakeLists.txt
---- scribus-1.3.3.10/CMakeLists.txt	2008-01-08 00:41:31.000000000 +0100
-+++ SCRIBUS-1.3.3.10-DOCS/CMakeLists.txt	2008-01-10 12:41:57.000000000 +0100
-@@ -96,12 +96,11 @@
- ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
- #SHARE
- IF(TAG_VERSION)
--  SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-+  SET(DOCDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/doc/")
- ELSE(TAG_VERSION)
--  SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+  SET(DOCDIR "share/${MAIN_DIR_NAME}/doc/")
- ENDIF (TAG_VERSION)
- ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
--SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+--- scribus-1.3.8/CMakeLists.txt~	2010-07-20 00:51:20.000000000 +0200
++++ scribus-1.3.8/CMakeLists.txt	2010-08-16 08:32:12.760862255 +0200
+@@ -259,9 +259,9 @@
+   SET(DOCDIR "share/doc/")
+ ELSE (WIN32 OR OS2)
+   IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
+-    SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
++    SET(DOCDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/doc/")
+   ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
+-    SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
++    SET(DOCDIR "share/${MAIN_DIR_NAME}/doc/")
+   ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
+ ENDIF (WIN32 OR OS2)
  ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
- SET(ICONDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/icons/")
- ADD_DEFINITIONS("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"")
-

================================================================
Index: packages/scribus/scribus.spec
diff -u packages/scribus/scribus.spec:1.153 packages/scribus/scribus.spec:1.154
--- packages/scribus/scribus.spec:1.153	Mon Aug 16 08:14:39 2010
+++ packages/scribus/scribus.spec	Mon Aug 16 09:57:03 2010
@@ -1,9 +1,5 @@
 # $Revision$, $Date$
 #
-# TODO:
-#	- mimelnk integration? IMHO an unneeded dep, although
-#	  Patrys will disagree propably (WRT to his latest posts ;)
-#
 # Conditional build:
 %bcond_with	cairo	# build with cairo support
 %bcond_without	cups	# build without CUPS support
@@ -11,12 +7,12 @@
 Summary:	Scribus - Open Source Desktop Publishing
 Summary(pl.UTF-8):	Scribus - DTP dla Wolnego Oprogramowania
 Name:		scribus
-Version:	1.3.3.13
-Release:	7
+Version:	1.3.8
+Release:	1
 License:	GPL v2
 Group:		X11/Applications/Publishing
 Source0:	http://dl.sourceforge.net/scribus/%{name}-%{version}.tar.bz2
-# Source0-md5:	e698b0d118c7f037e57163cba302d96e
+# Source0-md5:	660b946ea3ba19e894fb5701832a6b54
 Source1:	%{name}.desktop
 Patch1:		%{name}-standard-font-paths.patch
 Patch2:		%{name}-docs.patch
@@ -39,6 +35,7 @@
 BuildRequires:	openssl-devel
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
+BuildRequires:	podofo-devel
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	qt-devel >= 6:3.0.5
@@ -49,6 +46,7 @@
 Requires:	desktop-file-utils
 Requires:	python-PIL
 Requires:	python-tkinter
+Requires:	shared-mime-info
 Obsoletes:	scribus-scripting
 Obsoletes:	scribus-short-words
 Obsoletes:	scribus-svg
@@ -132,6 +130,9 @@
 
 %cmake . \
 	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
 %if %{with cairo}
 	-DWANT_CAIRO=1
 %else
@@ -150,12 +151,17 @@
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/scribus.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
+mv $RPM_BUILD_ROOT%{_datadir}/mimelnk/* $RPM_BUILD_ROOT%{_datadir}/mime/
+
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.lt_LT.qm $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.lt.qm
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/scribus/*.no.qm
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/{AUTHORS,BUILDING,COPYING,ChangeLog,ChangeLogCVS,ChangeLogSVN,INSTALL,NEWS,PACKAGING,README,README.MacOSX,README.OS2,TODO}
 
+# currently not used, -devel subpackage?
+rm -rf $RPM_BUILD_ROOT%{_includedir}/%{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -173,9 +179,11 @@
 %attr(755,root,root) %{_bindir}/scribus
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/import.prolog
+%{_datadir}/%{name}/unicodenameslist.txt
 # don't mark dictionaries with lang() --misiek
 %{_datadir}/%{name}/dicts
-%{_libdir}/%{name}/keysets
+%{_datadir}/%{name}/editorconfig
+%{_datadir}/%{name}/keysets
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so*
 %dir %{_libdir}/%{name}/plugins/gettext
@@ -185,6 +193,7 @@
 %lang(af) %{_datadir}/%{name}/translations/scribus.af.qm
 %lang(ar) %{_datadir}/%{name}/translations/scribus.ar.qm
 %lang(bg) %{_datadir}/%{name}/translations/scribus.bg.qm
+%lang(bn) %{_datadir}/%{name}/translations/scribus.bn.qm
 %lang(br) %{_datadir}/%{name}/translations/scribus.br.qm
 %lang(ca) %{_datadir}/%{name}/translations/scribus.ca.qm
 %lang(cs) %{_datadir}/%{name}/translations/scribus.cs.qm
@@ -195,7 +204,9 @@
 %lang(de) %{_datadir}/%{name}/translations/scribus.de_ol.qm
 %lang(dz) %{_datadir}/%{name}/translations/scribus.dz.qm
 %lang(el) %{_datadir}/%{name}/translations/scribus.el.qm
+%lang(en_AU) %{_datadir}/%{name}/translations/scribus.en_AU.qm
 %lang(en_GB) %{_datadir}/%{name}/translations/scribus.en_GB.qm
+%lang(en_US) %{_datadir}/%{name}/translations/scribus.en_US.qm
 %lang(eo) %{_datadir}/%{name}/translations/scribus.eo.qm
 %lang(es) %{_datadir}/%{name}/translations/scribus.es.qm
 %lang(es) %{_datadir}/%{name}/translations/scribus.es_LA.qm
@@ -213,8 +224,10 @@
 %lang(nl) %{_datadir}/%{name}/translations/scribus.nl.qm
 %lang(nb) %{_datadir}/%{name}/translations/scribus.nb.qm
 %lang(pl) %{_datadir}/%{name}/translations/scribus.pl.qm
+%lang(pt) %{_datadir}/%{name}/translations/scribus.pt.qm
 %lang(pt_BR) %{_datadir}/%{name}/translations/scribus.pt_BR.qm
 %lang(ru) %{_datadir}/%{name}/translations/scribus.ru.qm
+%lang(sa) %{_datadir}/%{name}/translations/scribus.sa.qm
 %lang(sk) %{_datadir}/%{name}/translations/scribus.sk.qm
 %lang(sl) %{_datadir}/%{name}/translations/scribus.sl.qm
 %lang(sq) %{_datadir}/%{name}/translations/scribus.sq.qm
@@ -241,7 +254,9 @@
 %{_desktopdir}/%{name}.desktop
 %{_mandir}/man1/%{name}.1*
 %lang(pl) %{_mandir}/pl/man1/%{name}.1*
+%lang(de) %{_mandir}/de/man1/%{name}.1*
 %{_pixmapsdir}/%{name}.png
+%{_datadir}/mime/application/vnd.scribus.desktop
 
 #%files devel
 #%defattr(644,root,root,755)
@@ -301,6 +316,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2010/08/16 07:57:03  arekm
+- up to 1.3.8
+
 Revision 1.153  2010/08/16 06:14:39  arekm
 - release 7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scribus/scribus-docs.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scribus/scribus.spec?r1=1.153&r2=1.154&f=u

More information about the pld-cvs-commit mailing list