dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-scribus-1.2.tar.bz2

.gitignore

@@ -0,0 +1 @@
+scribus-1.3.4.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: scribus
-# $Id$
-NAME := scribus
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

scribus-x86_64.patch

@@ -0,0 +1,24 @@
+diff -Nur scribus-1.2.1-orig/scribus/plugins/gettext/htmlim/Makefile.in scribus-1.2.1/scribus/plugins/gettext/htmlim/Makefile.in
+--- scribus-1.2.1-orig/scribus/plugins/gettext/htmlim/Makefile.in	2005-01-08 10:10:04.000000000 +0100
++++ scribus-1.2.1/scribus/plugins/gettext/htmlim/Makefile.in	2005-02-03 01:04:48.654806024 +0100
+@@ -287,7 +287,7 @@
+ target_vendor = @target_vendor@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+-pluginsdir = $(prefix)/lib/scribus/plugins/gettext
++pluginsdir = $(libdir)/scribus/plugins/gettext
+ SUBDIRS = 
+ plugins_LTLIBRARIES = libhtmlim.la
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
+diff -Nur scribus-1.2.1-orig/scribus/plugins/gettext/sxwim/Makefile.in scribus-1.2.1/scribus/plugins/gettext/sxwim/Makefile.in
+--- scribus-1.2.1-orig/scribus/plugins/gettext/sxwim/Makefile.in	2005-01-08 10:10:04.000000000 +0100
++++ scribus-1.2.1/scribus/plugins/gettext/sxwim/Makefile.in	2005-02-03 01:04:28.093931752 +0100
+@@ -303,7 +303,7 @@
+ target_vendor = @target_vendor@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+-pluginsdir = $(prefix)/lib/scribus/plugins/gettext
++pluginsdir = $(libdir)/scribus/plugins/gettext
+ SUBDIRS = 
+ plugins_LTLIBRARIES = libsxwimplugin.la
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)

scribus.desktop

@@ -50,7 +50,7 @@ TryExec=scribus
 Exec=scribus %f
 MimeType=application/x-scribus
 Terminal=false
-Icon=scribusicon.png
+Icon=scribusicon
 Type=Application
 X-StandardInstall=false
 Categories=Qt;Office;X-Misc;

scribus.spec

@@ -1,14 +1,15 @@
 Name:           scribus
-Version:        1.2
-Release:        0.fdr.3
-Summary:        DeskTop Publishing app in QT.
+Version:        1.3.4
+Release:	3%{?dist}
+
+Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scribus.net/
-Source0:        http://www.scribus.org.uk/downloads/1.2/scribus-1.2.tar.bz2
+Source0:        http://dl.sf.net/scribus/scribus-1.3.4.tar.bz2
 Source1:        scribus.xml
-Source2:        scribus.desktop
+Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cups-devel
@@ -19,23 +20,46 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool
+BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
-BuildRequires:  python-devel >= 2.2
-BuildRequires:  qt-devel >= 1:3.0.5
+BuildRequires:  python-devel >= 2.3
+BuildRequires:  qt-devel >= 1:3.3
 BuildRequires:  zlib-devel
+BuildRequires:  freetype-devel
+BuildRequires:  gnutls-devel
 Requires:       ghostscript >= 7.07
-Requires:       python >= 2.2
+Requires:       python >= 2.3
+Requires:       python-imaging
 Requires:       tkinter
 Requires(post): shared-mime-info
 Requires(post): desktop-file-utils
 Requires(postun): shared-mime-info
 Requires(postun): desktop-file-utils
 
+Obsoletes:     scribus-i18n-en
+Obsoletes:     scribus-svg
+Obsoletes:     scribus-scripting
+Obsoletes:     scribus-short-words
+Obsoletes:     scribus-vnla
+Obsoletes:     scribus-i18en
+Obsoletes:     scribus-i18de
+Obsoletes:     scribus-i18fr
+Obsoletes:     scribus-templates
+
+Provides:      scribus-i18n-en
+Provides:      scribus-svg
+Provides:      scribus-scripting
+Provides:      scribus-short-words
+Provides:      scribus-vnla
+Provides:      scribus-i18en
+Provides:      scribus-i18de
+Provides:      scribus-i18fr
+Provides:      scribus-templates
 
 %description
-Scribus is a Layout program for GNU/Linux®, similar to Adobe® PageMaker™,
-QuarkXPress™ or Adobe® InDesign™, except that it is published under the
-GNU GPL.
+Scribus is an desktop open source page layout program with
+the aim of producing commercial grade output in PDF and
+Postscript, primarily, though not exclusively for Linux.
 
 While the goals of the program are for ease of use and simple easy to
 understand tools, Scribus offers support for professional publishing
@@ -44,7 +68,7 @@ import/export and creation of color separations.
 
 
 %package        devel
-Summary:        Header files for Scribus.
+Summary:        Header files for Scribus
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
@@ -53,13 +77,15 @@ Header files for Scribus.
 
 
 %prep
-%setup -q 
+%setup -q
+#%patch -p1 -b .x86_64
 
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure  \
-   --with-pythondir=%{_prefix}
+   --with-pythondir=%{_prefix} \
+   --with-extra-libs=%{_libdir}
 make %{?_smp_mflags}
 
 
@@ -71,10 +97,10 @@ install -p -D -m0644 scribus/icons/scribusicon.png ${RPM_BUILD_ROOT}%{_datadir}/
 install -p -D -m0644 scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png
 install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/scribus.xml
 
-desktop-file-install --vendor fedora                   \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
-  %{SOURCE2}
+desktop-file-install --vendor fedora                \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   \
+  --add-category X-Fedora                           \
+ scribus.desktop
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
@@ -84,12 +110,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %post
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
@@ -102,14 +128,118 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/pixmaps/*
 %{_datadir}/scribus/
 %{_libdir}/scribus/
+%{_mandir}/man1/*
+%{_mandir}/pl/man1/*
+%{_mandir}/de/man1/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_includedir}/scribus/
 
-
 %changelog
+* Fri Dec 28 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.4-3
+- fix inclusion of python scripts as proposed by Todd Zullinger (#312091)
+- fix desktop file
+
+* Thu Aug 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.4-2
+- rebuild for buildid
+- new license tag
+
+* Sat Jun 02 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.4
+- version upgrade
+
+* Mon Dec 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.6-1
+- version upgrade
+
+* Sat Nov 11 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.5-1
+- version upgrade
+
+* Wed Oct 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.4-1
+- version upgrade
+
+* Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.3-1
+- version upgrade (#205962)
+
+* Sun Jun 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.2-2
+- bump
+
+* Tue May 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.2-1
+- version upgrade
+
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.1-1
+- version upgrade
+
+* Tue Mar 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3-1
+- version upgrade
+- add BR gnutls-devel
+
+* Sat Mar 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.2-1
+- upgrade to beta version
+
+* Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1-4
+- Rebuild for Fedora Extras 5
+
+* Wed Feb 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1-3
+- add missing requires python-imaging
+
+* Sat Jan 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1-2
+- rebuild (#178494)
+
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1-1
+- version upgrade
+
+* Thu Jul 7 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.2.2.1-2
+- use dist tag for sanity between branches
+
+* Tue Jul 5 2005 P Linnell <mrdocs AT scribus.info> - 1.2.2.1-1
+- 1.2.2.1 released to fix crash on open with certain 1.2.1 docs
+
+* Sun Jul 3 2005 P Linnell <mrdocs AT scribus.info> - 1.2.2-0.fc4
+- 1.2.2 final
+
+* Tue Jun 28 2005 P Linnell <mrdocs AT scribus.info>- 1.2.2cvs-0
+- test build for 1.2.2cvs
+- Add freetype2 explicit build requirement
+- Add obsoletes. See PACKAGING in the source tarball
+- Change the description per PACKAGING
+- Bump required python. 2.2 is no longer supported.
+
+
+* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 1.2.1-5
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
+* Sun Feb 06 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2.1-3
+- Bumped BR on qt-devel to 3.3.
+
+* Thu Feb  3 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.1-2
+- Fix x86_64 build and summary.
+
+* Sun Jan 09 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2.1-1
+- 1.2.1.
+
+* Sat Dec 04 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2.1-0.1.cvs20041118
+- cvs snapshot.
+
 * Wed Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2-0.fdr.3
 - Redirect output in post/postun, to avoid failure.
 

sources

@@ -1 +1 @@
-7d2c2b228f9a6ff82c9401fd54bdbe16  scribus-1.2.tar.bz2
+cd3bc6cc6c2e2826eb689342e439443d  scribus-1.3.4.tar.bz2