diff --git a/.cvsignore b/.cvsignore index 08a9c90..48b931a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -scribus-1.3.5.rc3.tar.bz2 +scribus-1.3.5.1.tar.bz2 diff --git a/scribus-1.3.5-install-headers.patch b/scribus-1.3.5-install-headers.patch deleted file mode 100644 index 3276045..0000000 --- a/scribus-1.3.5-install-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- scribus-1.3.5.rc3/scribus/CMakeLists.txt.orig 2009-05-17 23:23:08.000000000 +0200 -+++ scribus-1.3.5.rc3/scribus/CMakeLists.txt 2009-07-21 15:09:25.000000000 +0200 -@@ -834,8 +834,7 @@ ENDIF(APPLEBUNDLE) - - #Install our header files, selected from all existing dirs - IF(NOT WANT_NOHEADERINSTALL) -- FILE( GLOB_RECURSE SCRIBUS_HEADER_FILES *.h ) -- INSTALL(FILES ${SCRIBUS_HEADER_FILES} DESTINATION ${INCLUDEDIR}) -+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${INCLUDEDIR} FILES_MATCHING PATTERN "*.h") - ELSE(NOT WANT_NOHEADERINSTALL) - MESSAGE(STATUS "No source header files will be installed") - ENDIF(NOT WANT_NOHEADERINSTALL) diff --git a/scribus.spec b/scribus.spec index 5ebd06f..dddb83d 100644 --- a/scribus.spec +++ b/scribus.spec @@ -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/Productivity 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.beta %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 > /dev/null 2>&1 || : %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 > /dev/null 2>&1 || : %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 - 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 - 1.3.5-0.14.rc3 - update to 1.3.5-rc3 - fix update path for the doc subpackage (#512498) diff --git a/sources b/sources index 263d593..9becb11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c030bbec4405743fd2d3f842622351c scribus-1.3.5.rc3.tar.bz2 +4cadca0c780491ad61dc2d815776f10b scribus-1.3.5.1.tar.bz2