rpms
/
scribus
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- move swatches and profiles to datadir 

- fix docdir
This commit is contained in:
Dan Horák 2012-01-02 15:53:19 +01:00
parent ab01f1adf6
commit 2660008e9b
4 changed files with 158 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scribus-1.4.0-docdir.patch Normal file
View File

@ -0,0 +1,15 @@
diff -up scribus-1.4.0/CMakeLists.txt.docdir scribus-1.4.0/CMakeLists.txt
--- scribus-1.4.0/CMakeLists.txt.docdir 2012-01-02 15:06:44.000000000 +0100
+++ scribus-1.4.0/CMakeLists.txt 2012-01-02 15:06:57.000000000 +0100
@@ -266,11 +266,7 @@ ELSE (WIN32 OR OS2)
IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
- IF(NOT WANT_VERSIONING)
- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
- ELSE(NOT WANT_VERSIONING)
SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
- ENDIF(NOT WANT_VERSIONING)
ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
ENDIF (WIN32 OR OS2)
ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")

39
scribus-1.4.0-profiles.patch Normal file
View File

@ -0,0 +1,39 @@
From 38694e19e0c8015a58b71f9b97f551ec0fd14b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
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

90
scribus-1.4.0-swatches.patch Normal file
View File

@ -0,0 +1,90 @@
From bed9392a732deb08c3af06b4872abb6ebb233591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
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 @@
<h4>Linux/UNIX</h4>
<p>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 <code>/usr/lib/scribus/swatches</code> or <code>/usr/local/lib/scribus/swatches</code>. The respective location depends on the configuration of a distribution&rsquo;s package manager.</p>
-<p>Those who compiled Scribus themselves need to copy the palette files to <code>installation_directory/lib/scribus/swatches</code>.</p>
+<p>Those who compiled Scribus themselves need to copy the palette files to <code>installation_directory/share/scribus/swatches</code>.</p>
<p>If you don&rsquo;t have root permissions, you can also copy the files to <code>/home/user_name/.scribus/swatches/locked</code>.</p>
<p>You have to create the folder <code>locked</code> if doesn&rsquo;t exist.</p>
<h4>Mac OS X</h4>
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 @@
<h4>Linux/UNIX:</h4>
<p>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 <code>/usr/lib/scribus/swatches</code> o <code>/usr/local/lib/scribus/swatches</code>. L'esatta posizione dipende dalla configurazione del gestore di pacchetti di ciascuna distribuzione.</p>
-<p>Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in <code>installation_directory/lib/scribus/swatches</code>.</p>
+<p>Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in <code>installation_directory/share/scribus/swatches</code>.</p>
<p>Se non avete permessi di root, potete anche copiare i file in <code>/home/user_name/.scribus/swatches/locked</code>.</p>
<p>Se la cartella <code>locked</code> non esiste, dovrete crearla.</p>
<h4>Mac OS X</h4>
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

21
scribus.spec
View File

@ -1,6 +1,6 @@
Name: scribus
Version: 1.4.0
Release: 1%{?dist}
Release: 1%{?dist}.1
Summary: DeskTop Publishing application written in Qt
@ -8,6 +8,9 @@ Group: Applications/Productivity
License: GPLv2+
URL: http://www.scribus.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0: %{name}-1.4.0-swatches.patch
Patch1: %{name}-1.4.0-profiles.patch
Patch2: %{name}-1.4.0-docdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@ -78,6 +81,9 @@ Obsoletes: %{name}-doc < 1.3.5-0.12.beta
%prep
%setup -q
%patch0 -p2 -b .swatches
%patch1 -p2 -b .profiles
%patch2 -p1 -b .docdir
# recode man page to UTF-8
pushd scribus/manpages
@ -124,9 +130,6 @@ desktop-file-install --vendor="fedora" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
scribus.desktop
# rename the docs dir
mv ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name} ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}
%clean
rm -rf ${RPM_BUILD_ROOT}
@ -151,11 +154,11 @@ update-desktop-database &> /dev/null || :
%doc %{_defaultdocdir}/%{name}-%{version}/README
%doc %{_defaultdocdir}/%{name}-%{version}/TODO
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/pixmaps/*
%{_datadir}/%{name}
%{_datadir}/%{name}/
%exclude %{_datadir}/%{name}/samples/*.py[co]
%exclude %{_datadir}/%{name}/scripts/*.py[co]
%{_mandir}/man1/*
@ -165,7 +168,7 @@ update-desktop-database &> /dev/null || :
%files devel
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_includedir}/%{name}
%{_includedir}/%{name}/
%files doc
%defattr(-,root,root,-)
@ -181,6 +184,10 @@ update-desktop-database &> /dev/null || :
%changelog
* Mon Jan 02 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-1.1
- install profiles and swatches to datadir
- use versioned docdir
* Mon Jan 02 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-1
- update to 1.4.0