From 833766c4768e8371131f9f7a6be21032969e0115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 2 Jan 2012 10:15:48 +0100
Subject: [PATCH] update to 1.4.0

---
 .gitignore   |  1 +
 scribus.spec | 50 +++++++++++++++++++++++++-------------------------
 sources      |  2 +-
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index fbb1d44..8f9b7b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 scribus-1.3.7.tar.bz2
 scribus-1.3.8.tar.bz2
 /scribus-1.3.9.tar.bz2
+/scribus-1.4.0.tar.bz2
diff --git a/scribus.spec b/scribus.spec
index 7b65fa7..34ab8aa 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
 Name:           scribus
-Version:        1.3.9
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -8,11 +8,6 @@ Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.scribus.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# https://bugzilla.redhat.com/show_bug.cgi?id=506074
-# http://bugs.scribus.net/view.php?id=8232
-Patch0:         %{name}-1.3.9-system-hyphen.patch
-# fix rpath injection
-Patch1:         %{name}-1.3.9-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -28,7 +23,7 @@ BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel
 BuildRequires:  python-imaging-devel
-BuildRequires:  qt-devel
+BuildRequires:  qt4-devel
 BuildRequires:  zlib-devel
 BuildRequires:  freetype-devel
 BuildRequires:  gnutls-devel
@@ -82,9 +77,7 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p2 -b .system-hyphen
-%patch1 -p2 -b .rpath
+%setup -q
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -131,6 +124,9 @@ desktop-file-install --vendor="fedora"                      \
     --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
     scribus.desktop
 
+# rename the docs dir
+mv ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name} ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -148,12 +144,12 @@ update-desktop-database &> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
-%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog
-%doc %{_datadir}/doc/%{name}-%{version}/ChangeLogSVN
-%doc %{_datadir}/doc/%{name}-%{version}/COPYING
-%doc %{_datadir}/doc/%{name}-%{version}/README
-%doc %{_datadir}/doc/%{name}-%{version}/TODO
+%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
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -173,17 +169,21 @@ update-desktop-database &> /dev/null || :
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-%{version}
-%lang(en) %{_datadir}/doc/%{name}-%{version}/en
-%{_datadir}/doc/%{name}-%{version}/BUILDING
-%{_datadir}/doc/%{name}-%{version}/NEWS
-%{_datadir}/doc/%{name}-%{version}/README*
-%{_datadir}/doc/%{name}-%{version}/PACKAGING
-%{_datadir}/doc/%{name}-%{version}/LINKS
-%{_datadir}/doc/%{name}-%{version}/TRANSLATION
+%dir %{_defaultdocdir}/%{name}-%{version}
+%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
+* Mon Jan 02 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-1
+- update to 1.4.0
+
 * Mon Dec 20 2010 Dan Horák <dan[AT]danny.cz> - 1.3.9-2
 - run update-desktop-database in scriptlets too (#664318)
 
diff --git a/sources b/sources
index b0c6e77..ce390f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a54dbf2e10cd88d683d0d34565d29378  scribus-1.3.9.tar.bz2
+119b23cafcd35ebd8488ff499f97eff5  scribus-1.4.0.tar.bz2