update to 1.4.2
- remove non-free content from source archive (#887221) - drop doc and devel sub-packages - switch to lcms2
This commit is contained in:
parent
155c3e4627
commit
bd5965dcc5
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ scribus-1.3.8.tar.bz2
|
|||||||
/scribus-1.4.0.tar.bz2
|
/scribus-1.4.0.tar.bz2
|
||||||
/scribus-1.4.1.tar.xz
|
/scribus-1.4.1.tar.xz
|
||||||
/scribus-1.4.1.tar.xz.asc
|
/scribus-1.4.1.tar.xz.asc
|
||||||
|
/scribus-1.4.2-free.tar.xz
|
||||||
|
37
make-free-archive.sh
Normal file
37
make-free-archive.sh
Normal file
@ -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}
|
34
scribus-1.4.2-nonfree.patch
Normal file
34
scribus-1.4.2-nonfree.patch
Normal file
@ -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
|
||||||
|
)
|
76
scribus.spec
76
scribus.spec
@ -1,23 +1,27 @@
|
|||||||
Name: scribus
|
Name: scribus
|
||||||
Version: 1.4.1
|
Version: 1.4.2
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Summary: DeskTop Publishing application written in Qt
|
Summary: DeskTop Publishing application written in Qt
|
||||||
|
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.scribus.net/
|
URL: http://www.scribus.net/
|
||||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
|
# ./make-free-archive %{version}
|
||||||
Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
|
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
|
# use versioned documentation directory
|
||||||
Patch0: %{name}-1.4.0-docdir.patch
|
Patch0: %{name}-1.4.0-docdir.patch
|
||||||
Patch1: %{name}-to-double.patch
|
Patch1: %{name}-to-double.patch
|
||||||
|
# fix build with non-free content removed
|
||||||
|
Patch2: %{name}-1.4.2-nonfree.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
|
|
||||||
BuildRequires: cups-devel
|
BuildRequires: cups-devel
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: lcms-devel
|
BuildRequires: lcms2-devel
|
||||||
BuildRequires: libart_lgpl-devel
|
BuildRequires: libart_lgpl-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
@ -40,7 +44,8 @@ Requires: python
|
|||||||
Requires: python-imaging
|
Requires: python-imaging
|
||||||
Requires: tkinter
|
Requires: tkinter
|
||||||
Requires: shared-mime-info
|
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_provides_in %{_libdir}/%{name}/plugins
|
||||||
%filter_setup
|
%filter_setup
|
||||||
@ -57,32 +62,11 @@ features, such as CMYK color, easy PDF creation, Encapsulated Postscript
|
|||||||
import/export and creation of color separations.
|
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
|
%prep
|
||||||
%setup -q -n Scribus
|
%setup -q
|
||||||
%patch0 -p1 -b .docdir
|
%patch0 -p1 -b .docdir
|
||||||
%patch1 -p1 -b .double
|
%patch1 -p1 -b .double
|
||||||
|
%patch2 -p1 -b .nonfree
|
||||||
|
|
||||||
# recode man page to UTF-8
|
# recode man page to UTF-8
|
||||||
pushd scribus/manpages
|
pushd scribus/manpages
|
||||||
@ -106,7 +90,7 @@ done
|
|||||||
%build
|
%build
|
||||||
mkdir build
|
mkdir build
|
||||||
pushd build
|
pushd build
|
||||||
%cmake -DWANT_DISTROBUILD=YES ..
|
%cmake -DWANT_DISTROBUILD=YES -DWANT_NOHEADERINSTALL=YES ..
|
||||||
|
|
||||||
make VERBOSE=1 %{?_smp_mflags}
|
make VERBOSE=1 %{?_smp_mflags}
|
||||||
popd
|
popd
|
||||||
@ -128,6 +112,9 @@ desktop-file-install --vendor="fedora" \
|
|||||||
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
|
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
|
||||||
scribus.desktop
|
scribus.desktop
|
||||||
|
|
||||||
|
# remove unwanted stuff
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}
|
||||||
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
|
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
|
||||||
@ -140,12 +127,7 @@ update-desktop-database &> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc %{_defaultdocdir}/%{name}-%{version}/AUTHORS
|
%doc AUTHORS ChangeLog COPYING LINKS README
|
||||||
%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
|
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%{_libdir}/%{name}/
|
%{_libdir}/%{name}/
|
||||||
%{_datadir}/applications/fedora-%{name}.desktop
|
%{_datadir}/applications/fedora-%{name}.desktop
|
||||||
@ -158,24 +140,14 @@ update-desktop-database &> /dev/null || :
|
|||||||
%{_mandir}/pl/man1/*
|
%{_mandir}/pl/man1/*
|
||||||
%{_mandir}/de/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
|
%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
|
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.4.1-4
|
||||||
- rebuild against new libjpeg
|
- rebuild against new libjpeg
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user