rpms/scribus/F-11 .cvsignore, 1.21, 1.22 scribus.spec, 1.44, 1.45 sources, 1.21, 1.22 scribus-1.3.5-install-headers.patch, 1.1, NONE
Dan Horák
sharkcz at fedoraproject.org
Thu Aug 20 12:05:47 UTC 2009
Author: sharkcz
Update of /cvs/pkgs/rpms/scribus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22169
Modified Files:
.cvsignore scribus.spec sources
Removed Files:
scribus-1.3.5-install-headers.patch
Log Message:
* Thu Aug 20 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5.1-1
- update to final 1.3.5.1
- drop the upstreamed "install-headers" patch
- always install doc subpackage (#446148)
- full changelog: http://www.scribus.net/?q=node/193
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 21 Jul 2009 19:59:10 -0000 1.21
+++ .cvsignore 20 Aug 2009 12:05:47 -0000 1.22
@@ -1 +1 @@
-scribus-1.3.5.rc3.tar.bz2
+scribus-1.3.5.1.tar.bz2
Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/scribus.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- scribus.spec 21 Jul 2009 19:59:10 -0000 1.44
+++ scribus.spec 20 Aug 2009 12:05:47 -0000 1.45
@@ -1,6 +1,6 @@
Name: scribus
-Version: 1.3.5
-Release: 0.14.rc3%{?dist}
+Version: 1.3.5.1
+Release: 1%{?dist}
Summary: DeskTop Publishing application written in Qt
@@ -8,7 +8,6 @@ Group: Applications/Productivit
License: GPLv2+
URL: http://www.scribus.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.rc3.tar.bz2
-Patch1: %{name}-1.3.5-install-headers.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -36,6 +35,7 @@ Requires: python >= 2.3
Requires: python-imaging
Requires: tkinter
Requires: shared-mime-info
+Requires: %{name}-doc = %{version}-%{release}
%description
@@ -72,7 +72,6 @@ Obsoletes: %{name}-doc < 1.3.5-0.12
%prep
%setup -q -n %{name}-%{version}.rc3
-%patch1 -p1 -b .install-headers
# recode man page to UTF-8
pushd scribus/manpages
@@ -129,7 +128,12 @@ update-mime-database %{_datadir}/mime >
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog ChangeLogSVN COPYING README TODO
+%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
%{_bindir}/scribus
%{_datadir}/applications/fedora-scribus.desktop
%{_datadir}/mime/packages/scribus.xml
@@ -147,26 +151,27 @@ update-mime-database %{_datadir}/mime >
%files doc
%defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-1.3.5.rc3
-%lang(cd) %{_datadir}/doc/%{name}-1.3.5.rc3/cs
-%lang(de) %{_datadir}/doc/%{name}-1.3.5.rc3/de
-%lang(en) %{_datadir}/doc/%{name}-1.3.5.rc3/en
-%lang(fr) %{_datadir}/doc/%{name}-1.3.5.rc3/fr
-%lang(pl) %{_datadir}/doc/%{name}-1.3.5.rc3/pl
-%{_datadir}/doc/%{name}-1.3.5.rc3/AUTHORS
-%{_datadir}/doc/%{name}-1.3.5.rc3/BUILDING
-%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLog
-%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLogSVN
-%{_datadir}/doc/%{name}-1.3.5.rc3/COPYING
-%{_datadir}/doc/%{name}-1.3.5.rc3/NEWS
-%{_datadir}/doc/%{name}-1.3.5.rc3/README*
-%{_datadir}/doc/%{name}-1.3.5.rc3/TODO
-%{_datadir}/doc/%{name}-1.3.5.rc3/PACKAGING
-%{_datadir}/doc/%{name}-1.3.5.rc3/LINKS
-%{_datadir}/doc/%{name}-1.3.5.rc3/TRANSLATION
+%dir %{_datadir}/doc/%{name}-%{version}
+%lang(cs) %{_datadir}/doc/%{name}-%{version}/cs
+%lang(de) %{_datadir}/doc/%{name}-%{version}/de
+%lang(en) %{_datadir}/doc/%{name}-%{version}/en
+%lang(fr) %{_datadir}/doc/%{name}-%{version}/fr
+%lang(pl) %{_datadir}/doc/%{name}-%{version}/pl
+%{_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
%changelog
+* Thu Aug 20 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5.1-1
+- update to final 1.3.5.1
+- drop the upstreamed "install-headers" patch
+- always install doc subpackage (#446148)
+- full changelog: http://www.scribus.net/?q=node/193
+
* Tue Jul 21 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5-0.14.rc3
- update to 1.3.5-rc3
- fix update path for the doc subpackage (#512498)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 21 Jul 2009 19:59:10 -0000 1.21
+++ sources 20 Aug 2009 12:05:47 -0000 1.22
@@ -1 +1 @@
-4c030bbec4405743fd2d3f842622351c scribus-1.3.5.rc3.tar.bz2
+4cadca0c780491ad61dc2d815776f10b scribus-1.3.5.1.tar.bz2
--- scribus-1.3.5-install-headers.patch DELETED ---
More information about the fedora-extras-commits
mailing list