diff --git a/.gitignore b/.gitignore index 8f9b7b0..5826234 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ scribus-1.3.7.tar.bz2 scribus-1.3.8.tar.bz2 /scribus-1.3.9.tar.bz2 /scribus-1.4.0.tar.bz2 +/scribus-1.4.1.tar.xz +/scribus-1.4.1.tar.xz.asc diff --git a/scribus-1.4.0-export-as-image.patch b/scribus-1.4.0-export-as-image.patch deleted file mode 100644 index 4dd399a..0000000 --- a/scribus-1.4.0-export-as-image.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 4617fdc649b10a32206fd974cd9b7a8c824f997c -Author: jghali -Date: Thu Jan 12 23:03:46 2012 +0000 - - #10509 : crash on attempt to export as image - - git-svn-id: svn://scribus.net/branches/Version14x@17196 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/Scribus/scribus/plugins/pixmapexport/export.cpp b/Scribus/scribus/plugins/pixmapexport/export.cpp -index 6ff5e0a..d9e273a 100644 ---- a/Scribus/scribus/plugins/pixmapexport/export.cpp -+++ b/Scribus/scribus/plugins/pixmapexport/export.cpp -@@ -96,7 +96,7 @@ bool PixmapExportPlugin::run(ScribusDoc* doc, QString target) - Q_ASSERT(target.isEmpty()); - Q_ASSERT(!doc->masterPageMode()); - QSharedPointer ex( new ExportBitmap() ); -- QSharedPointer dia( new ExportForm(doc->scMW(), doc, ex->pageDPI, ex->quality, ex->bitmapType) ); -+ QSharedPointer dia( new ExportForm(0, doc, ex->pageDPI, ex->quality, ex->bitmapType) ); - - // interval widgets handling - QString tmp; diff --git a/scribus-1.4.0-profiles.patch b/scribus-1.4.0-profiles.patch deleted file mode 100644 index 9eeac71..0000000 --- a/scribus-1.4.0-profiles.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 38694e19e0c8015a58b71f9b97f551ec0fd14b9e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Mon, 2 Jan 2012 14:34:41 +0100 -Subject: [PATCH] install profiles into datadir instead of libdir - -profiles are architecture independent data files and per FHS they should be -installed into datadir (/usr/share/...) ---- - Scribus/scribus/profiles/CMakeLists.txt | 2 +- - Scribus/scribus/scribuscore.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Scribus/scribus/profiles/CMakeLists.txt b/Scribus/scribus/profiles/CMakeLists.txt -index e53b253..3fe9614 100644 ---- a/Scribus/scribus/profiles/CMakeLists.txt -+++ b/Scribus/scribus/profiles/CMakeLists.txt -@@ -8,5 +8,5 @@ GenericCMYK.txt - Readme - sRGB.icm - srgb.license -- DESTINATION ${LIBDIR}profiles -+ DESTINATION ${SHAREDIR}profiles - ) -diff --git a/Scribus/scribus/scribuscore.cpp b/Scribus/scribus/scribuscore.cpp -index 83fbb65..8d14abd 100644 ---- a/Scribus/scribus/scribuscore.cpp -+++ b/Scribus/scribus/scribuscore.cpp -@@ -332,7 +332,7 @@ void ScribusCore::getCMSProfiles(bool showInfo) - PrinterProfiles.clear(); - InputProfiles.clear(); - InputProfilesCMYK.clear(); -- QString pfad = ScPaths::instance().libDir(); -+ QString pfad = ScPaths::instance().shareDir(); - pfad += "profiles/"; - profDirs = ScPaths::getSystemProfilesDirs(); - profDirs.prepend( prefsManager->appPrefs.ProfileDir ); --- -1.7.4.4 - diff --git a/scribus-1.4.0-swatches.patch b/scribus-1.4.0-swatches.patch deleted file mode 100644 index de59f19..0000000 --- a/scribus-1.4.0-swatches.patch +++ /dev/null @@ -1,90 +0,0 @@ -From bed9392a732deb08c3af06b4872abb6ebb233591 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Mon, 2 Jan 2012 14:24:21 +0100 -Subject: [PATCH] install swatches into datadir instead of libdir - -swatches are architecture independent data files and per FHS they should be -installed into datadir (/usr/share/...) ---- - Scribus/resources/swatches/CMakeLists.txt | 2 +- - Scribus/scribus/colorsetmanager.cpp | 4 ++-- - Scribus/scribus/doc/en/color2.html | 2 +- - Scribus/scribus/doc/it/color2.html | 2 +- - Scribus/scribus/prefsmanager.cpp | 2 +- - 5 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Scribus/resources/swatches/CMakeLists.txt b/Scribus/resources/swatches/CMakeLists.txt -index e841c72..88b6691 100644 ---- a/Scribus/resources/swatches/CMakeLists.txt -+++ b/Scribus/resources/swatches/CMakeLists.txt -@@ -11,5 +11,5 @@ FILE( GLOB RTF_LICENSES *.rtf ) - SET(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING_RESENE.txt" "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt") - - INSTALL(FILES ${GIMP_STYLE_PALETTES} ${XML_PALETTES} ${EPS_PALETTES} ${RTF_LICENSES} ${TXT_LICENSES} -- DESTINATION ${LIBDIR}swatches -+ DESTINATION ${SHAREDIR}swatches - ) -diff --git a/Scribus/scribus/colorsetmanager.cpp b/Scribus/scribus/colorsetmanager.cpp -index a2744c1..40d64bd 100644 ---- a/Scribus/scribus/colorsetmanager.cpp -+++ b/Scribus/scribus/colorsetmanager.cpp -@@ -29,7 +29,7 @@ ColorSetManager::~ColorSetManager() - - void ColorSetManager::initialiseDefaultPrefs(struct ApplicationPrefs& appPrefs) - { -- QString pfadC = ScPaths::instance().libDir()+"swatches/"; -+ QString pfadC = ScPaths::instance().shareDir()+"swatches/"; - QString pfadC2 = pfadC + "Scribus_Basic.xml"; - QFile fiC(pfadC2); - if (!fiC.exists()) -@@ -113,7 +113,7 @@ void ColorSetManager::findPaletteLocations() - { - paletteLocations.clear(); - QStringList locations=ScPaths::instance().getSystemCreateSwatchesDirs(); -- locations << ScPaths::instance().libDir()+"swatches/"; -+ locations << ScPaths::instance().shareDir()+"swatches/"; - locations << ScPaths::getApplicationDataDir() + "swatches/locked/"; - locations << ScPaths::getApplicationDataDir() + "swatches/"; - for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it ) -diff --git a/Scribus/scribus/doc/en/color2.html b/Scribus/scribus/doc/en/color2.html -index 8422bbf..07669ca 100644 ---- a/Scribus/scribus/doc/en/color2.html -+++ b/Scribus/scribus/doc/en/color2.html -@@ -22,7 +22,7 @@ - -

Linux/UNIX

-

If you have installed Scribus with a package management system like RPM, DEB or BSD Ports, the palette files need to be copied to either /usr/lib/scribus/swatches or /usr/local/lib/scribus/swatches. The respective location depends on the configuration of a distribution’s package manager.

--

Those who compiled Scribus themselves need to copy the palette files to installation_directory/lib/scribus/swatches.

-+

Those who compiled Scribus themselves need to copy the palette files to installation_directory/share/scribus/swatches.

-

If you don’t have root permissions, you can also copy the files to /home/user_name/.scribus/swatches/locked.

-

You have to create the folder locked if doesn’t exist.

-

Mac OS X

-diff --git a/Scribus/scribus/doc/it/color2.html b/Scribus/scribus/doc/it/color2.html -index c15764f..9458db3 100644 ---- a/Scribus/scribus/doc/it/color2.html -+++ b/Scribus/scribus/doc/it/color2.html -@@ -21,7 +21,7 @@ - -

Linux/UNIX:

-

Se avete installato Scribus per mezzo di un sistema di gestione dei pacchetti come RPM, DEB o BSD Ports, i file delle raccolte devono essere copiati in /usr/lib/scribus/swatches o /usr/local/lib/scribus/swatches. L'esatta posizione dipende dalla configurazione del gestore di pacchetti di ciascuna distribuzione.

--

Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in installation_directory/lib/scribus/swatches.

-+

Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in installation_directory/share/scribus/swatches.

-

Se non avete permessi di root, potete anche copiare i file in /home/user_name/.scribus/swatches/locked.

-

Se la cartella locked non esiste, dovrete crearla.

-

Mac OS X

-diff --git a/Scribus/scribus/prefsmanager.cpp b/Scribus/scribus/prefsmanager.cpp -index 7d5e02b..f8e9bc7 100644 ---- a/Scribus/scribus/prefsmanager.cpp -+++ b/Scribus/scribus/prefsmanager.cpp -@@ -142,7 +142,7 @@ void PrefsManager::initDefaults() - csm.findPaletteLocations(); - csm.findPalettes(); - /* -- QString pfadC = ScPaths::instance().libDir()+"swatches/"; -+ QString pfadC = ScPaths::instance().shareDir()+"swatches/"; - QString pfadC2 = pfadC + "Scribus_X11.txt"; - QFile fiC(pfadC2); - if (!fiC.exists()) --- -1.7.4.4 - diff --git a/scribus.spec b/scribus.spec index 52eb7c5..ae583da 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,22 +1,17 @@ Name: scribus -Version: 1.4.0 -Release: 3%{?dist} +<<<<<<< HEAD +Version: 1.4.1 +Release: 1%{?dist} Summary: DeskTop Publishing application written in Qt Group: Applications/Productivity License: GPLv2+ URL: http://www.scribus.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -# http://bugs.scribus.net/view.php?id=10485 -Patch0: %{name}-1.4.0-swatches.patch -# http://bugs.scribus.net/view.php?id=10486 -Patch1: %{name}-1.4.0-profiles.patch +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz +Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc # use versioned documentation directory -Patch2: %{name}-1.4.0-docdir.patch -# rhbz#800765 and http://bugs.scribus.net/view.php?id=10509 -Patch3: %{name}-1.4.0-export-as-image.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: %{name}-1.4.0-docdir.patch BuildRequires: cmake @@ -85,11 +80,8 @@ Obsoletes: %{name}-doc < 1.3.5-0.12.beta %{summary} %prep -%setup -q -%patch0 -p2 -b .swatches -%patch1 -p2 -b .profiles -%patch2 -p1 -b .docdir -%patch3 -p2 -b .export-as-image +%setup -q -n Scribus +%patch0 -p1 -b .docdir # recode man page to UTF-8 pushd scribus/manpages @@ -137,10 +129,6 @@ desktop-file-install --vendor="fedora" \ scribus.desktop -%clean -rm -rf ${RPM_BUILD_ROOT} - - %post update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : update-desktop-database &> /dev/null || : @@ -152,7 +140,6 @@ update-desktop-database &> /dev/null || : %files -%defattr(-,root,root,-) %doc %{_defaultdocdir}/%{name}-%{version}/AUTHORS %doc %{_defaultdocdir}/%{name}-%{version}/ChangeLog %doc %{_defaultdocdir}/%{name}-%{version}/ChangeLogSVN @@ -172,13 +159,12 @@ update-desktop-database &> /dev/null || : %{_mandir}/de/man1/* %files devel -%defattr(-,root,root,-) %doc AUTHORS COPYING %{_includedir}/%{name}/ %files doc -%defattr(-,root,root,-) %dir %{_defaultdocdir}/%{name}-%{version} +%lang(de) %{_defaultdocdir}/%{name}-%{version}/de %lang(en) %{_defaultdocdir}/%{name}-%{version}/en %lang(it) %{_defaultdocdir}/%{name}-%{version}/it %{_defaultdocdir}/%{name}-%{version}/BUILDING @@ -190,6 +176,9 @@ update-desktop-database &> /dev/null || : %changelog +* Sun May 06 2012 Dan Horák - 1.4.1-1 +- update to 1.4.1 + * Wed Mar 07 2012 Dan Horák - 1.4.0-3 - fix crash at export as image (rhbz#800765) diff --git a/sources b/sources index ce390f4..58cf27c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -119b23cafcd35ebd8488ff499f97eff5 scribus-1.4.0.tar.bz2 +c79593dc61bc137d9e7968b37d070993 scribus-1.4.1.tar.xz +af78a7dbbadbda553051e51d8eb090ae scribus-1.4.1.tar.xz.asc