Merge branch 'master' into epel7

Conflicts:
	scribus.spec

scribus-1.4.0-docdir.patch

@@ -1,15 +0,0 @@
-diff -up scribus-1.4.0/CMakeLists.txt.docdir scribus-1.4.0/CMakeLists.txt
---- scribus-1.4.0/CMakeLists.txt.docdir	2012-01-02 15:06:44.000000000 +0100
-+++ scribus-1.4.0/CMakeLists.txt	2012-01-02 15:06:57.000000000 +0100
-@@ -266,11 +266,7 @@ ELSE (WIN32 OR OS2)
-   IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
-     SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-   ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
--        IF(NOT WANT_VERSIONING)
--            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
--        ELSE(NOT WANT_VERSIONING)
-             SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
--        ENDIF(NOT WANT_VERSIONING)
-   ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
- ENDIF (WIN32 OR OS2)
- ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")

scribus.spec

@@ -11,8 +11,6 @@ URL:            http://www.scribus.net/
 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
-Patch0:         %{name}-1.4.0-docdir.patch
 Patch1:         %{name}-1.4.3-to-double.patch
 # fix build with non-free content removed
 Patch2:         %{name}-1.4.2-nonfree.patch
@@ -64,7 +62,6 @@ import/export and creation of color separations.
 
 %prep
 %setup -q
-%patch0 -p1 -b .docdir
 %patch1 -p1 -b .double
 %patch2 -p1 -b .nonfree
 
@@ -150,6 +147,7 @@ update-desktop-database &> /dev/null || :
 
 * Mon Aug 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-1
 - update to 1.4.3 (#990030)
+- update for unversioned docdir
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild