Accepting request 89353 from KDE:Distro:Factory

- merged KDF again

-updated to 1.4.0.rc6
-last RC before 1.4.0 final
 +documentation updates, bug fixes and translation updates
 +http://scribus.net/svn/Scribus/branches/Version135/Scribus/ChangeLog
  for versioned changelog

OBS-URL: https://build.opensuse.org/request/show/89353
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=41

scribus-1.4.0.rc5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a65d0de346a00972447a9bed03e2a3c039023752bf5ce2fffd892a3879c2a80
-size 36661351

scribus-1.4.0.rc6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91b218469f96818d00e0ff606b3524757bda03289e72edfca34462f865ff36e7
+size 39287217

scribus.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Oct 26 08:11:42 UTC 2011 - coolo@suse.com
+
+- merged KDF again
+
+-------------------------------------------------------------------
+Wed Oct 19 04:57:23 UTC 2011 - mrdocs@opensuse.org
+
+-updated to 1.4.0.rc6
+-last RC before 1.4.0 final
+ +documentation updates, bug fixes and translation updates
+ +http://scribus.net/svn/Scribus/branches/Version135/Scribus/ChangeLog
+  for versioned changelog
+ 
 -------------------------------------------------------------------
 Mon Aug 15 13:49:58 UTC 2011 - idonmez@novell.com
 

scribus.spec

@@ -19,8 +19,8 @@
 
 
 Name:           scribus
-Version:        1.4.0.rc5
+Version:        1.4.0.rc6
-Release:        5
+Release:        0
 License:        GPL
 Summary:        Open Source Page Layout and Desktop Publishing (DTP)
 Url:            http://www.scribus.net/
@@ -30,17 +30,20 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  aspell-devel
 BuildRequires:  boost-devel
+BuildRequires:  cairo-devel
 BuildRequires:  cmake >= 2.6.0
 BuildRequires:  cups-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  libQtWebKit-devel
 BuildRequires:  libpodofo-devel
 BuildRequires:  libqt4-devel >= 4.6.0
+BuildRequires:  libtiff-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
 BuildRequires:  python-devel
 BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(libxml-2.0)
 
 %if 0%{?suse_version} 
 Requires:       ghostscript-library
@@ -93,7 +96,6 @@ cmake \
   %if "%{_lib}" == "lib64"
   -DWANT_LIB64=1 \
   %endif
-  -DDOCDIR:PATH=%{_docdir} \
   -DWANT_CAIRO=1 \
   -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
   -DCMAKE_SKIP_RPATH=TRUE \
@@ -104,20 +106,15 @@ make %{_smp_mflags}
 %install
 
 cd build
-%make_install
+ make install \
-
+ DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-mkdir -p %{buildroot}%{_datadir}/applications
-mkdir -p %{buildroot}%{_datadir}/doc/packages/scribus
-
-ln -s %{buildroot}%{_datadir}/scribus/icons/scribus.png %{buildroot}%{_datadir}/pixmaps/scribus.png 
-
-ln -s %{buildroot}%{_datadir}/mimelnk/application/vnd.scribus.desktop  %{buildroot}%{_datadir}/applications/vnd.scribus.desktop
 
 %if 0%{?suse_version} 
 %suse_update_desktop_file -i %{buildroot}%{_datadir}/mimelnk/application/vnd.scribus.desktop Office WordProcessor
 %endif
 
+#update the mime database
+
 %post
 if [ -f /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database /usr/share/mime > /dev/null
@@ -128,27 +125,21 @@ if [ -f /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database /usr/share/mime > /dev/null
 fi
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-, root, root)
-%{_docdir}/scribus
 %{_bindir}/scribus
 %{_mandir}/man?/*.*
 %{_mandir}/*/man?/*.*
 %{_libdir}/scribus
 %{_datadir}/mime/packages/scribus.xml
 %{_datadir}/scribus
-%doc %{_datadir}/doc/scribus
+%{_datadir}/doc/scribus
 # This should be owned by filesystem or man, but there are only scribus files:
 %lang(pl) %dir %{_mandir}/pl
 %lang(pl) %{_mandir}/pl/man1 
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/vnd.scribus.desktop
-%{_datadir}/applications/vnd.scribus.desktop
-%{_datadir}/pixmaps/scribus.png 
 
 %files devel
 %defattr(-, root, root)