Compare commits

..

No commits in common. "master" and "f24" have entirely different histories.
master ... f24

3 changed files with 23 additions and 82 deletions

View File

@ -1,10 +0,0 @@
--- scribus-1.4.6-orig/scribus/plugins/import/ps/import.prolog 2009-05-08 21:04:32.000000000 +0200
+++ scribus-1.4.6/scribus/plugins/import/ps/import.prolog 2018-09-17 16:05:24.988900385 +0200
@@ -75,6 +75,7 @@
//doimage exec
} .forceput
end
+/.currentopacityalpha {//.currentopacityalpha} bind def
setglobal
.bindnow

View File

@ -1,12 +0,0 @@
--- a/cmake/modules/FindHUNSPELL.cmake
+++ b/cmake/modules/FindHUNSPELL.cmake
@@ -9,7 +9,7 @@
#Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries
FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
INCLUDE(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE

View File

@ -1,7 +1,8 @@
Name: scribus Name: scribus
Version: 1.4.6 Version: 1.4.6
Release: 17%{?dist} Release: 1%{?dist}
Summary: DeskTop Publishing application written in Qt Summary: DeskTop Publishing application written in Qt
Group: Applications/Productivity
# swatches bring in the fun licenses # swatches bring in the fun licenses
License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+
URL: http://www.scribus.net/ URL: http://www.scribus.net/
@ -15,9 +16,6 @@ Patch1: %{name}-1.4.4-qreal_double.patch
Patch2: %{name}-1.4.2-nonfree.patch Patch2: %{name}-1.4.2-nonfree.patch
# Fix necessary LPPL attribution # Fix necessary LPPL attribution
Patch3: %{name}-1.4.5-lppl-fixes.patch Patch3: %{name}-1.4.5-lppl-fixes.patch
# Fix detection of hunspell-1.4+
Patch4: %{name}-1.4.6-hunspell.patch
Patch5: %{name}-1.4.6-gs-9.24.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: cups-devel BuildRequires: cups-devel
@ -29,8 +27,8 @@ BuildRequires: libpng-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: python2-devel BuildRequires: python-devel
BuildRequires: python2-imaging-devel BuildRequires: python-imaging-devel
BuildRequires: qt4-devel BuildRequires: qt4-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: freetype-devel BuildRequires: freetype-devel
@ -41,9 +39,9 @@ BuildRequires: boost-devel
BuildRequires: podofo-devel BuildRequires: podofo-devel
BuildRequires: hyphen-devel BuildRequires: hyphen-devel
Requires: ghostscript Requires: ghostscript
Requires: python2 Requires: python
Requires: python2-imaging Requires: python-imaging
Requires: python2-tkinter Requires: tkinter
Requires: shared-mime-info Requires: shared-mime-info
Obsoletes: %{name}-doc < %{version}-%{release} Obsoletes: %{name}-doc < %{version}-%{release}
Obsoletes: %{name}-devel < %{version}-%{release} Obsoletes: %{name}-devel < %{version}-%{release}
@ -68,8 +66,6 @@ import/export and creation of color separations.
%patch1 -p1 -b .double %patch1 -p1 -b .double
%patch2 -p1 -b .nonfree %patch2 -p1 -b .nonfree
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1
# recode man page to UTF-8 # recode man page to UTF-8
pushd scribus/manpages pushd scribus/manpages
@ -158,6 +154,22 @@ SentUpstream: 2014-09-18
</application> </application>
EOF EOF
%post
touch --no-create %{_datadir}/mime/packages &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/mime/packages &> /dev/null || :
update-desktop-database &> /dev/null || :
update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
%posttrans
update-desktop-database &> /dev/null || :
update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%files %files
%doc AUTHORS ChangeLog COPYING LINKS README %doc AUTHORS ChangeLog COPYING LINKS README
%{_bindir}/%{name} %{_bindir}/%{name}
@ -175,55 +187,6 @@ EOF
%changelog %changelog
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 13 2018 Caolán McNamara <caolanm@redhat.com> - 1.4.6-15
- rebuild for hunspell-1.7.0
* Mon Sep 17 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.4.6-14
- fix EPS import (bz #1628943)
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Sandro Mani <manisandro@gmail.com> - 1.4.6-12
- Rebuild (podofo)
* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.4.6-11
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.4.6-7
- Rebuild due to bug in RPM (RHBZ #1468476)
* Fri Apr 07 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1.4.6-6
- Fix detection of latest hunspell for spell-checking support (#1425305)
* Mon Feb 06 2017 Kalev Lember <klember@redhat.com> - 1.4.6-5
- Rebuilt for Boost 1.63
* Thu Feb 02 2017 Sandro Mani <manisandro@gmail.com> - 1.4.6-4
- Rebuild (podofo)
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 1.4.6-3
- Rebuilt for Boost 1.63
* Fri Sep 23 2016 Jon Ciesla <limburgher@gmail.com> - 1.4.6-2
- podofo rebuild.
* Tue May 24 2016 Jon Ciesla <limburgher@gmail.com> - 1.4.6-1 * Tue May 24 2016 Jon Ciesla <limburgher@gmail.com> - 1.4.6-1
- 1.4.6 - 1.4.6