[scribus] update to 1.4.2
Dan Horák
sharkcz at fedoraproject.org
Tue Jan 15 18:30:27 UTC 2013
commit bd5965dcc577303b0ef05b0e06b6b4626889cd41
Author: Dan Horák <dan at danny.cz>
Date: Tue Jan 15 19:30:20 2013 +0100
update to 1.4.2
- remove non-free content from source archive (#887221)
- drop doc and devel sub-packages
- switch to lcms2
.gitignore | 1 +
make-free-archive.sh | 37 +++++++++++++++++++++
scribus-1.4.2-nonfree.patch | 34 +++++++++++++++++++
scribus.spec | 76 +++++++++++++-----------------------------
sources | 3 +-
5 files changed, 97 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5826234..18bf60a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ scribus-1.3.8.tar.bz2
/scribus-1.4.0.tar.bz2
/scribus-1.4.1.tar.xz
/scribus-1.4.1.tar.xz.asc
+/scribus-1.4.2-free.tar.xz
diff --git a/make-free-archive.sh b/make-free-archive.sh
new file mode 100644
index 0000000..2c4ea0c
--- /dev/null
+++ b/make-free-archive.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+if [ -z "$1" ]; then
+ echo "version required"
+ exit 1
+fi
+
+version=$1
+nv=scribus-${version}
+
+archive=${nv}.tar.xz
+freearchive=${nv}-free.tar.xz
+
+[ -f ${archive} ] || curl -O http://downloads.sourceforge.net/scribus/scribus-${version}.tar.xz
+
+echo "Extracting sources ..."
+rm -rf ${nv}
+xzcat $archive | tar xf -
+
+pushd ${nv}
+
+# remove docs
+rm -r scribus/doc
+
+# remove non-free profile
+rm scribus/profiles/{sRGB.icm,srgb.license}
+
+# remove non-free content from swatches
+rm resources/swatches/*.eps
+rm resources/swatches/dtp-studio-free-palettes-license.rtf
+rm resources/swatches/GiveLife_Color_System_*.xml
+rm resources/swatches/givelife_colors_license.rtf
+
+popd
+
+echo "Creating sources ..."
+tar cf - ${nv} | xz > ${freearchive}
diff --git a/scribus-1.4.2-nonfree.patch b/scribus-1.4.2-nonfree.patch
new file mode 100644
index 0000000..856775c
--- /dev/null
+++ b/scribus-1.4.2-nonfree.patch
@@ -0,0 +1,34 @@
+diff -up scribus-1.4.2/scribus/CMakeLists.txt.nonfree scribus-1.4.2/scribus/CMakeLists.txt
+--- scribus-1.4.2/scribus/CMakeLists.txt.nonfree 2012-06-07 22:01:10.000000000 +0200
++++ scribus-1.4.2/scribus/CMakeLists.txt 2013-01-15 18:50:11.000000000 +0100
+@@ -2,7 +2,6 @@ IF(WIN32)
+ ADD_DEFINITIONS(-DQT_DLL)
+ ENDIF(WIN32)
+
+-ADD_SUBDIRECTORY(doc)
+ ADD_SUBDIRECTORY(dtd)
+ ADD_SUBDIRECTORY(manpages)
+ ADD_SUBDIRECTORY(colormgmt)
+diff -up scribus-1.4.2/scribus/helpbrowser.cpp.nonfree scribus-1.4.2/scribus/helpbrowser.cpp
+--- scribus-1.4.2/scribus/helpbrowser.cpp.nonfree 2012-06-24 22:43:17.000000000 +0200
++++ scribus-1.4.2/scribus/helpbrowser.cpp 2013-01-15 18:50:11.000000000 +0100
+@@ -716,7 +716,7 @@ QString HelpBrowser::historyFile()
+
+ void HelpBrowser::displayNoHelp()
+ {
+- QString noHelpMsg=tr("<h2><p>Sorry, no manual is installed!</p><p>Please see:</p><ul><li>http://docs.scribus.net for updated documentation</li><li>http://www.scribus.net for downloads</li></ul></h2>",
++ QString noHelpMsg=tr("<h2><p>Sorry, the manual is not installed because it is not freely distributable and thus can't be included in Fedora!</p><p>Please see:</p><ul><li>http://docs.scribus.net for updated documentation</li><li>http://www.scribus.net for downloads</li></ul></h2>",
+ "HTML message for no documentation available to show");
+
+ textBrowser->setText(noHelpMsg);
+diff -up scribus-1.4.2/scribus/profiles/CMakeLists.txt.nonfree scribus-1.4.2/scribus/profiles/CMakeLists.txt
+--- scribus-1.4.2/scribus/profiles/CMakeLists.txt.nonfree 2012-01-03 22:47:01.000000000 +0100
++++ scribus-1.4.2/scribus/profiles/CMakeLists.txt 2013-01-15 18:50:11.000000000 +0100
+@@ -6,7 +6,5 @@ INSTALL(FILES
+ GenericCMYK.icm
+ GenericCMYK.txt
+ Readme
+-sRGB.icm
+-srgb.license
+ DESTINATION ${SHAREDIR}profiles
+ )
diff --git a/scribus.spec b/scribus.spec
index 483730d..9978a66 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,23 +1,27 @@
Name: scribus
-Version: 1.4.1
-Release: 4%{?dist}
+Version: 1.4.2
+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.xz
-Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
+# ./make-free-archive %{version}
+Source0: %{name}-%{version}-free.tar.xz
+#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
Patch0: %{name}-1.4.0-docdir.patch
Patch1: %{name}-to-double.patch
+# fix build with non-free content removed
+Patch2: %{name}-1.4.2-nonfree.patch
BuildRequires: cmake
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
-BuildRequires: lcms-devel
+BuildRequires: lcms2-devel
BuildRequires: libart_lgpl-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@@ -40,7 +44,8 @@ Requires: python
Requires: python-imaging
Requires: tkinter
Requires: shared-mime-info
-Requires: %{name}-doc = %{version}-%{release}
+Obsoletes: %{name}-doc < %{version}-%{release}
+Obsoletes: %{name}-devel < %{version}-%{release}
%filter_provides_in %{_libdir}/%{name}/plugins
%filter_setup
@@ -57,32 +62,11 @@ features, such as CMYK color, easy PDF creation, Encapsulated Postscript
import/export and creation of color separations.
-%package devel
-Summary: Header files for Scribus
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Header files for Scribus.
-
-
-%package doc
-Summary: Documentation files for Scribus
-Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch: noarch
-Obsoletes: %{name}-doc < 1.3.5-0.12.beta
-%endif
-
-
-%description doc
-%{summary}
-
%prep
-%setup -q -n Scribus
+%setup -q
%patch0 -p1 -b .docdir
%patch1 -p1 -b .double
+%patch2 -p1 -b .nonfree
# recode man page to UTF-8
pushd scribus/manpages
@@ -106,7 +90,7 @@ done
%build
mkdir build
pushd build
-%cmake -DWANT_DISTROBUILD=YES ..
+%cmake -DWANT_DISTROBUILD=YES -DWANT_NOHEADERINSTALL=YES ..
make VERBOSE=1 %{?_smp_mflags}
popd
@@ -128,6 +112,9 @@ desktop-file-install --vendor="fedora" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
scribus.desktop
+# remove unwanted stuff
+rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}
+
%post
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
@@ -140,12 +127,7 @@ update-desktop-database &> /dev/null || :
%files
-%doc %{_defaultdocdir}/%{name}-%{version}/AUTHORS
-%doc %{_defaultdocdir}/%{name}-%{version}/ChangeLog
-%doc %{_defaultdocdir}/%{name}-%{version}/ChangeLogSVN
-%doc %{_defaultdocdir}/%{name}-%{version}/COPYING
-%doc %{_defaultdocdir}/%{name}-%{version}/README
-%doc %{_defaultdocdir}/%{name}-%{version}/TODO
+%doc AUTHORS ChangeLog COPYING LINKS README
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
@@ -158,24 +140,14 @@ update-desktop-database &> /dev/null || :
%{_mandir}/pl/man1/*
%{_mandir}/de/man1/*
-%files devel
-%doc AUTHORS COPYING
-%{_includedir}/%{name}/
-
-%files doc
-%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
-%{_defaultdocdir}/%{name}-%{version}/NEWS
-%{_defaultdocdir}/%{name}-%{version}/README*
-%{_defaultdocdir}/%{name}-%{version}/PACKAGING
-%{_defaultdocdir}/%{name}-%{version}/LINKS
-%{_defaultdocdir}/%{name}-%{version}/TRANSLATION
-
%changelog
+* Tue Jan 15 2013 Dan Horák <dan[at]danny.cz> - 1.4.2-1
+- update to 1.4.2
+- remove non-free content from source archive (#887221)
+- drop doc and devel sub-packages
+- switch to lcms2
+
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.4.1-4
- rebuild against new libjpeg
diff --git a/sources b/sources
index 58cf27c..7a2f3a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c79593dc61bc137d9e7968b37d070993 scribus-1.4.1.tar.xz
-af78a7dbbadbda553051e51d8eb090ae scribus-1.4.1.tar.xz.asc
+45b14e0898772fa0c727019ae27adc8d scribus-1.4.2-free.tar.xz
More information about the scm-commits
mailing list