[scribus] update to 1.4.1

Dan Horák sharkcz at fedoraproject.org
Wed May 9 10:13:20 UTC 2012


commit ca5df8c36a0678e363762da7b66ca24d23b1b77f
Author: Dan Horák <dan at danny.cz>
Date:   Wed May 9 12:13:15 2012 +0200

    update to 1.4.1

 .gitignore                          |    2 +
 scribus-1.4.0-export-as-image.patch |   21 --------
 scribus-1.4.0-profiles.patch        |   39 ---------------
 scribus-1.4.0-swatches.patch        |   90 -----------------------------------
 scribus.spec                        |   34 ++++---------
 sources                             |    3 +-
 6 files changed, 15 insertions(+), 174 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f9b7b0..5826234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ scribus-1.3.7.tar.bz2
 scribus-1.3.8.tar.bz2
 /scribus-1.3.9.tar.bz2
 /scribus-1.4.0.tar.bz2
+/scribus-1.4.1.tar.xz
+/scribus-1.4.1.tar.xz.asc
diff --git a/scribus.spec b/scribus.spec
index f188991..efad2a9 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,22 +1,16 @@
 Name:           scribus
-Version:        1.4.0
-Release:        5%{?dist}
+Version:        1.4.1
+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.bz2
-# http://bugs.scribus.net/view.php?id=10485
-Patch0:         %{name}-1.4.0-swatches.patch
-# http://bugs.scribus.net/view.php?id=10486
-Patch1:         %{name}-1.4.0-profiles.patch
+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
-Patch2:         %{name}-1.4.0-docdir.patch
-# rhbz#800765 and http://bugs.scribus.net/view.php?id=10509
-Patch3:         %{name}-1.4.0-export-as-image.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         %{name}-1.4.0-docdir.patch
 
 BuildRequires:  cmake
 
@@ -85,11 +79,8 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
 %{summary}
 
 %prep
-%setup -q
-%patch0 -p2 -b .swatches
-%patch1 -p2 -b .profiles
-%patch2 -p1 -b .docdir
-%patch3 -p2 -b .export-as-image
+%setup -q -n Scribus
+%patch0 -p1 -b .docdir
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -137,10 +128,6 @@ desktop-file-install --vendor="fedora"                      \
     scribus.desktop
 
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-
 %post
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database &> /dev/null || :
@@ -152,7 +139,6 @@ update-desktop-database &> /dev/null || :
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}-%{version}/AUTHORS
 %doc %{_defaultdocdir}/%{name}-%{version}/ChangeLog
 %doc %{_defaultdocdir}/%{name}-%{version}/ChangeLogSVN
@@ -172,13 +158,12 @@ update-desktop-database &> /dev/null || :
 %{_mandir}/de/man1/*
 
 %files devel
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_includedir}/%{name}/
 
 %files doc
-%defattr(-,root,root,-)
 %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
@@ -190,6 +175,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sun May 06 2012 Dan Horák <dan[at]danny.cz> - 1.4.1-1
+- update to 1.4.1
+
 * Wed Mar 07 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-5
 - fix crash at export as image (rhbz#800765)
 
diff --git a/sources b/sources
index ce390f4..58cf27c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-119b23cafcd35ebd8488ff499f97eff5  scribus-1.4.0.tar.bz2
+c79593dc61bc137d9e7968b37d070993  scribus-1.4.1.tar.xz
+af78a7dbbadbda553051e51d8eb090ae  scribus-1.4.1.tar.xz.asc


More information about the scm-commits mailing list