update to 1.4.5, resolve legal issues
This commit is contained in:
Tom Callaway
parent
66ef18481c
commit
51f70b61b7
|
|
@ -8,14 +8,14 @@ fi
|
|||
version=$1
|
||||
nv=scribus-${version}
|
||||
|
||||
archive=${nv}.tar.xz
|
||||
archive=${nv}.tar.bz2
|
||||
freearchive=${nv}-free.tar.xz
|
||||
|
||||
[ -f ${archive} ] || curl -O http://downloads.sourceforge.net/scribus/scribus-${version}.tar.xz
|
||||
[ -f ${archive} ] || curl -OL http://downloads.sourceforge.net/scribus/scribus-${version}.tar.bz2
|
||||
|
||||
echo "Extracting sources ..."
|
||||
rm -rf ${nv}
|
||||
xzcat $archive | tar xf -
|
||||
tar -xf $archive
|
||||
|
||||
pushd ${nv}
|
||||
|
||||
|
|
@ -37,6 +37,12 @@ rm resources/swatches/Federal_Identity_Program.xml
|
|||
# Remove non-free (CC-BY-SA-NC) dot files
|
||||
rm resources/editorconfig/dot.*
|
||||
|
||||
# Remove non-free dic files
|
||||
rm resources/dicts/hyph_fi.dic
|
||||
|
||||
# Remove license unknown dic files
|
||||
rm resources/dicts/hyph_ia.dic resources/dicts/hyph_sv.dic
|
||||
|
||||
popd
|
||||
|
||||
echo "Creating sources ..."
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
diff -up scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt.lppl scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt
|
||||
--- scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt.lppl 2015-05-07 16:50:30.664715518 -0400
|
||||
+++ scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt 2015-05-07 16:50:53.288550546 -0400
|
||||
@@ -3,6 +3,9 @@ Hyphenation dictionary
|
||||
|
||||
Language: Danish (da DK).
|
||||
Origin: Based on the TeX hyphenation tables
|
||||
+ http://www.ctan.org/tex-archive/language/hyphenation/dkhyphn/dkhyphn.tex
|
||||
+ The TeX hyphenation tables are released under the LaTeX Project
|
||||
+ Public License (LPPL)
|
||||
License: GNU LGPL license.
|
||||
Author: conversion author is Marco Huggenberger<marco@by-night.ch>
|
||||
|
||||
diff -up scribus-1.4.5/resources/dicts/README_is_IS.txt.lppl scribus-1.4.5/resources/dicts/README_is_IS.txt
|
||||
--- scribus-1.4.5/resources/dicts/README_is_IS.txt.lppl 2015-05-07 16:51:32.623263721 -0400
|
||||
+++ scribus-1.4.5/resources/dicts/README_is_IS.txt 2015-05-07 16:51:53.072114610 -0400
|
||||
@@ -2,15 +2,14 @@ Hyphenation dictionary
|
||||
----------------------
|
||||
|
||||
Language: Icelandic (Iceland) (is IS).
|
||||
-Origin: Based on the TeX hyphenation tables
|
||||
+Origin: Based on the TeX hyphenation tables by J�rgen Pind (1987).
|
||||
+ http://www.ctan.org/tex-archive/language/hyphenation/dkhyphn/dkhyphn.tex
|
||||
+ The TeX hyphenation tables are released under the LaTeX Project
|
||||
+ Public License (LPPL)
|
||||
License: LGPL/SISSL license, 2003
|
||||
Author: akig@hi.is (Áki G. Karlsson)
|
||||
|
||||
HYPH is IS hyph_is_IS
|
||||
-
|
||||
-
|
||||
- These patterns were converted from TeX hyphenation patterns by Jörgen Pind
|
||||
- (1987).
|
||||
|
||||
--
|
||||
Áki G. Karlsson
|
||||
55
scribus.spec
55
scribus.spec
|
|
@ -1,9 +1,7 @@
|
|||
Name: scribus
|
||||
Version: 1.4.4
|
||||
Release: 6%{?dist}
|
||||
|
||||
Version: 1.4.5
|
||||
Release: 1%{?dist}
|
||||
Summary: DeskTop Publishing application written in Qt
|
||||
|
||||
Group: Applications/Productivity
|
||||
License: GPLv2+
|
||||
URL: http://www.scribus.net/
|
||||
|
|
@ -14,9 +12,10 @@ Source0: %{name}-%{version}-free.tar.xz
|
|||
Patch1: %{name}-1.4.4-qreal_double.patch
|
||||
# fix build with non-free content removed
|
||||
Patch2: %{name}-1.4.2-nonfree.patch
|
||||
# Fix necessary LPPL attribution
|
||||
Patch3: %{name}-1.4.5-lppl-fixes.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: lcms2-devel
|
||||
|
|
@ -64,6 +63,7 @@ import/export and creation of color separations.
|
|||
%setup -q
|
||||
%patch1 -p1 -b .double
|
||||
%patch2 -p1 -b .nonfree
|
||||
%patch3 -p1
|
||||
|
||||
# recode man page to UTF-8
|
||||
pushd scribus/manpages
|
||||
|
|
@ -115,6 +115,42 @@ desktop-file-install \
|
|||
# remove unwanted stuff
|
||||
rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}
|
||||
|
||||
# Register as an application to be visible in the software center
|
||||
#
|
||||
# NOTE: It would be *awesome* if this file was maintained by the upstream
|
||||
# project, translated and installed into the right place during `make install`.
|
||||
#
|
||||
# See http://www.freedesktop.org/software/appstream/docs/ for more details.
|
||||
#
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
|
||||
cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
|
||||
<!--
|
||||
BugReportURL: http://bugs.scribus.net/view.php?id=12708
|
||||
SentUpstream: 2014-09-18
|
||||
-->
|
||||
<application>
|
||||
<id type="desktop">scribus.desktop</id>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<description>
|
||||
<p>
|
||||
Scribus is a desktop publishing application that allows you to create posters,
|
||||
magazines and books ready to send off to a printing house.
|
||||
It supports professional publishing features, such color separations, CMYK and
|
||||
spot colors, ICC color management, and versatile PDF creation.
|
||||
</p>
|
||||
<!-- FIXME: Probably needs another paragraph or two -->
|
||||
</description>
|
||||
<url type="homepage">http://scribus.net/</url>
|
||||
<screenshots>
|
||||
<screenshot type="default">http://upload.wikimedia.org/wikipedia/commons/f/f4/Scribus-1.3-Linux.png</screenshot>
|
||||
</screenshots>
|
||||
<!-- FIXME: change this to an upstream email address for spec updates
|
||||
<updatecontact>someone_who_cares@upstream_project.org</updatecontact>
|
||||
-->
|
||||
</application>
|
||||
EOF
|
||||
|
||||
%post
|
||||
touch --no-create %{_datadir}/mime/packages &> /dev/null || :
|
||||
|
|
@ -136,6 +172,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
%doc AUTHORS ChangeLog COPYING LINKS README
|
||||
%{_bindir}/%{name}
|
||||
%{_libdir}/%{name}/
|
||||
%{_datadir}/appdata/*%{name}.appdata.xml
|
||||
%{_datadir}/applications/*%{name}.desktop
|
||||
%{_datadir}/mime/packages/%{name}.xml
|
||||
%{_datadir}/pixmaps/*
|
||||
|
|
@ -148,6 +185,14 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu May 7 2015 Tom Callaway <spot@fedoraproject.org> 1.4.5-1
|
||||
- update to 1.4.5
|
||||
- drop non-free and questionable hyphen dic files (bz 1219415)
|
||||
- fix necessary LPPL attributions
|
||||
|
||||
* Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 1.4.4-7
|
||||
- Add an AppData file for the software center
|
||||
|
||||
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.4.4-6
|
||||
- Rebuild for boost 1.57.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue