Accepting request 62129 from KDE:Distro:Factory

Accepted submit request 62129 from user mrdocs

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

scribus-1.3.9.tar.bz2

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

scribus-1.4.0.rc1.tar.bz2

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

scribus.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Feb 18 15:16:13 UTC 2011 - mrdocs@opensuse.org
+
+-remove some old versioning cruft from spec file 
+
+-------------------------------------------------------------------
+Fri Feb 18 14:30:37 UTC 2011 - mrdocs@opensuse.org
+
+- update to 1.4.0.rc1 1.4.0 is new stable branch
+  +40+ bugs fixed see:
+   http://bugs.scribus.net/changelog_page.php?version_id=68 for
+   versioned change log details 
+- Add Obsoletes/Provides for scribus-templates for those upgrading
+  from 1.3.3.14, former stable.  1.4.0 has new
+  and many additional templates included by default
+
+
 -------------------------------------------------------------------
 Fri Jan 16 00:00:00 CET 2011 - mrdocs@opensuse.org
 

scribus.spec

@@ -19,8 +19,8 @@
 
 
 Name:           scribus
-Version:        1.3.9
+Version:        1.4.0.rc1
-Release:        3
+Release:        0
 License:        GPL
 Summary:        Open Source Page Layout and Desktop Publishing (DTP)
 Url:            http://www.scribus.net/
@@ -45,13 +45,16 @@ BuildRequires:  python-devel
 BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
 
-%if 0%{?suse_version} > 1000
+%if 0%{?suse_version} 
 Requires:       ghostscript-library
 Requires:       python-imaging
 Requires:       tk
 Suggests:       AdobeICCProfiles
 %endif
 
+Provides:   scribus-templates > 1.2
+Obsoletes:  scribus-templates =< 1.2
+
 %description
 Scribus is a open source page layout program which
 produces commercial grade output in PDF and Postscript, primarily,
@@ -77,7 +80,7 @@ Requires:       zlib-devel
 This package provides the development headers for %{name}. It is most useful 
 for developing plugins for %{name}.
 
-%define prefix   /usr
+%define prefix   %_prefix
 
 %prep
 
@@ -109,7 +112,7 @@ cd build
  DESTDIR=%{buildroot}
 
 mkdir -p %{buildroot}%{_datadir}/doc/packages/scribus
-%if 0%{?suse_version} > 1000
+%if 0%{?suse_version} 
 %suse_update_desktop_file -i %{buildroot}%{_datadir}/mimelnk/application/vnd.scribus.desktop Office WordProcessor
 %endif
 
@@ -138,7 +141,7 @@ rm -rf %{buildroot}
 %{_libdir}/scribus
 %{_datadir}/mime/packages/scribus.xml
 %{_datadir}/scribus
-%{_datadir}/doc/scribus-%{version}
+%{_datadir}/doc/scribus
 # This should be owned by filesystem or man, but there are only scribus files:
 %lang(pl) %dir %{_mandir}/pl
 %{_mandir}/pl/man1