rpms/scribus/F-10 scribus-1.3.5-install-headers.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 scribus.spec, 1.37, 1.38 sources, 1.19, 1.20
Dan Horák
sharkcz at fedoraproject.org
Tue Jul 21 20:00:31 UTC 2009
- Previous message (by thread): rpms/scribus/F-11 scribus-1.3.5-install-headers.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 scribus.spec, 1.43, 1.44 sources, 1.20, 1.21
- Next message (by thread): rpms/mash/EL-5 mash-nosigcheck.patch, NONE, 1.1 mash.spec, 1.27, 1.28 mash-multilib-sync.patch, 1.3, NONE mash-multilib_yum_reponame-fix.patch, 1.1, NONE mash-noarch_build_nosrc-fix.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/pkgs/rpms/scribus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7840
Modified Files:
.cvsignore scribus.spec sources
Added Files:
scribus-1.3.5-install-headers.patch
Log Message:
* 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)
scribus-1.3.5-install-headers.patch:
CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE scribus-1.3.5-install-headers.patch ---
--- 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)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore 4 Jun 2009 08:49:20 -0000 1.19
+++ .cvsignore 21 Jul 2009 20:00:30 -0000 1.20
@@ -1 +1 @@
-scribus-1.3.5.rc2.tar.bz2
+scribus-1.3.5.rc3.tar.bz2
Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/scribus.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- scribus.spec 4 Jun 2009 08:49:20 -0000 1.37
+++ scribus.spec 21 Jul 2009 20:00:30 -0000 1.38
@@ -1,13 +1,14 @@
Name: scribus
Version: 1.3.5
-Release: 0.13.rc2%{?dist}
+Release: 0.14.rc3%{?dist}
Summary: DeskTop Publishing application written in Qt
Group: Applications/Productivity
License: GPLv2+
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)
BuildRequires: cmake
@@ -62,6 +63,7 @@ Group: Development/Tools
Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} > 9
BuildArch: noarch
+Obsoletes: %{name}-doc < 1.3.5-0.12.beta
%endif
@@ -69,7 +71,8 @@ BuildArch: noarch
%{summary}
%prep
-%setup -q -n %{name}-%{version}.rc2
+%setup -q -n %{name}-%{version}.rc3
+%patch1 -p1 -b .install-headers
# recode man page to UTF-8
pushd scribus/manpages
@@ -85,8 +88,8 @@ chmod a-x scribus/pageitem_latexframe.h
%build
mkdir build
pushd build
-%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \
- -DCMAKE_SKIP_RPATH=YES ../
+%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} ..
+
make VERBOSE=1 %{?_smp_mflags}
popd
@@ -102,6 +105,9 @@ install -p -D -m0644 ${RPM_BUILD_ROOT}%{
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
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/*scribus.desktop
desktop-file-install --vendor="fedora" \
@@ -141,27 +147,31 @@ update-mime-database %{_datadir}/mime >
%files doc
%defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-1.3.5.rc2
-%lang(cd) %{_datadir}/doc/%{name}-1.3.5.rc2/cs
-%lang(de) %{_datadir}/doc/%{name}-1.3.5.rc2/de
-%lang(en) %{_datadir}/doc/%{name}-1.3.5.rc2/en
-%lang(fr) %{_datadir}/doc/%{name}-1.3.5.rc2/fr
-%lang(pl) %{_datadir}/doc/%{name}-1.3.5.rc2/pl
-%{_datadir}/doc/%{name}-1.3.5.rc2/AUTHORS
-%{_datadir}/doc/%{name}-1.3.5.rc2/BUILDING
-%{_datadir}/doc/%{name}-1.3.5.rc2/ChangeLog
-%{_datadir}/doc/%{name}-1.3.5.rc2/ChangeLogSVN
-%{_datadir}/doc/%{name}-1.3.5.rc2/COPYING
-%{_datadir}/doc/%{name}-1.3.5.rc2/NEWS
-%{_datadir}/doc/%{name}-1.3.5.rc2/README*
-%{_datadir}/doc/%{name}-1.3.5.rc2/TODO
-%{_datadir}/doc/%{name}-1.3.5.rc2/PACKAGING
-%{_datadir}/doc/%{name}-1.3.5.rc2/LINKS
-%{_datadir}/doc/%{name}-1.3.5.rc2/TRANSLATION
+%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
-
%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
- update to 1.3.5.rc2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources 4 Jun 2009 08:49:20 -0000 1.19
+++ sources 21 Jul 2009 20:00:31 -0000 1.20
@@ -1 +1 @@
-161eaae7a97bd9f2824a677e771bd36f scribus-1.3.5.rc2.tar.bz2
+4c030bbec4405743fd2d3f842622351c scribus-1.3.5.rc3.tar.bz2
- Previous message (by thread): rpms/scribus/F-11 scribus-1.3.5-install-headers.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 scribus.spec, 1.43, 1.44 sources, 1.20, 1.21
- Next message (by thread): rpms/mash/EL-5 mash-nosigcheck.patch, NONE, 1.1 mash.spec, 1.27, 1.28 mash-multilib-sync.patch, 1.3, NONE mash-multilib_yum_reponame-fix.patch, 1.1, NONE mash-noarch_build_nosrc-fix.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list