- update to 1.3.5-rc3
- fix update path for the doc subpackage (#512498) - preserve directories when installing headers (#511800)
This commit is contained in:
parent
04899f1df5
commit
8ea1515a47
@ -1 +1 @@
|
|||||||
scribus-1.3.5.rc2.tar.bz2
|
scribus-1.3.5.rc3.tar.bz2
|
||||||
|
12
scribus-1.3.5-install-headers.patch
Normal file
12
scribus-1.3.5-install-headers.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
--- 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)
|
56
scribus.spec
56
scribus.spec
@ -1,13 +1,14 @@
|
|||||||
Name: scribus
|
Name: scribus
|
||||||
Version: 1.3.5
|
Version: 1.3.5
|
||||||
Release: 0.13.rc2%{?dist}
|
Release: 0.14.rc3%{?dist}
|
||||||
|
|
||||||
Summary: DeskTop Publishing application written in Qt
|
Summary: DeskTop Publishing application written in Qt
|
||||||
|
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.scribus.net/
|
URL: http://www.scribus.net/
|
||||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.rc2.tar.bz2
|
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
@ -62,6 +63,7 @@ Group: Development/Tools
|
|||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
%if 0%{?fedora} > 9
|
%if 0%{?fedora} > 9
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
Obsoletes: %{name}-doc < 1.3.5-0.12.beta
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@ -69,7 +71,8 @@ BuildArch: noarch
|
|||||||
%{summary}
|
%{summary}
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}.rc2
|
%setup -q -n %{name}-%{version}.rc3
|
||||||
|
%patch1 -p1 -b .install-headers
|
||||||
|
|
||||||
# recode man page to UTF-8
|
# recode man page to UTF-8
|
||||||
pushd scribus/manpages
|
pushd scribus/manpages
|
||||||
@ -85,8 +88,8 @@ chmod a-x scribus/pageitem_latexframe.h
|
|||||||
%build
|
%build
|
||||||
mkdir build
|
mkdir build
|
||||||
pushd build
|
pushd build
|
||||||
%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \
|
%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} ..
|
||||||
-DCMAKE_SKIP_RPATH=YES ../
|
|
||||||
make VERBOSE=1 %{?_smp_mflags}
|
make VERBOSE=1 %{?_smp_mflags}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -102,6 +105,9 @@ install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusdoc.png $
|
|||||||
|
|
||||||
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
|
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
|
||||||
|
|
||||||
|
# remove empty dirs in %{_includedir}
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}%{_includedir}/%{name}/{dicts,doc,dtd,editorconfig,icons,keysets,loremipsum,manpages,profiles,swatches,templates,unicodemap}
|
||||||
|
|
||||||
# install the global desktop file
|
# install the global desktop file
|
||||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/*scribus.desktop
|
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/*scribus.desktop
|
||||||
desktop-file-install --vendor="fedora" \
|
desktop-file-install --vendor="fedora" \
|
||||||
@ -141,27 +147,31 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
|
|||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%dir %{_datadir}/doc/%{name}-1.3.5.rc2
|
%dir %{_datadir}/doc/%{name}-1.3.5.rc3
|
||||||
%lang(cd) %{_datadir}/doc/%{name}-1.3.5.rc2/cs
|
%lang(cd) %{_datadir}/doc/%{name}-1.3.5.rc3/cs
|
||||||
%lang(de) %{_datadir}/doc/%{name}-1.3.5.rc2/de
|
%lang(de) %{_datadir}/doc/%{name}-1.3.5.rc3/de
|
||||||
%lang(en) %{_datadir}/doc/%{name}-1.3.5.rc2/en
|
%lang(en) %{_datadir}/doc/%{name}-1.3.5.rc3/en
|
||||||
%lang(fr) %{_datadir}/doc/%{name}-1.3.5.rc2/fr
|
%lang(fr) %{_datadir}/doc/%{name}-1.3.5.rc3/fr
|
||||||
%lang(pl) %{_datadir}/doc/%{name}-1.3.5.rc2/pl
|
%lang(pl) %{_datadir}/doc/%{name}-1.3.5.rc3/pl
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/AUTHORS
|
%{_datadir}/doc/%{name}-1.3.5.rc3/AUTHORS
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/BUILDING
|
%{_datadir}/doc/%{name}-1.3.5.rc3/BUILDING
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/ChangeLog
|
%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLog
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/ChangeLogSVN
|
%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLogSVN
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/COPYING
|
%{_datadir}/doc/%{name}-1.3.5.rc3/COPYING
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/NEWS
|
%{_datadir}/doc/%{name}-1.3.5.rc3/NEWS
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/README*
|
%{_datadir}/doc/%{name}-1.3.5.rc3/README*
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/TODO
|
%{_datadir}/doc/%{name}-1.3.5.rc3/TODO
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/PACKAGING
|
%{_datadir}/doc/%{name}-1.3.5.rc3/PACKAGING
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/LINKS
|
%{_datadir}/doc/%{name}-1.3.5.rc3/LINKS
|
||||||
%{_datadir}/doc/%{name}-1.3.5.rc2/TRANSLATION
|
%{_datadir}/doc/%{name}-1.3.5.rc3/TRANSLATION
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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)
|
||||||
|
- preserve directories when installing headers (#511800)
|
||||||
|
|
||||||
* Thu Jun 4 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5-0.13.rc2
|
* Thu Jun 4 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5-0.13.rc2
|
||||||
- update to 1.3.5.rc2
|
- update to 1.3.5.rc2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user