rpms/pdfedit/F-9 .cvsignore, 1.6, 1.7 pdfedit-destdir.patch, 1.2, 1.3 pdfedit.spec, 1.9, 1.10 sources, 1.6, 1.7
Bernard Johnson (bjohnson)
fedora-extras-commits at redhat.com
Sun Jun 29 22:17:56 UTC 2008
- Previous message: rpms/Io-language/devel Io-language.spec,1.7,1.8
- Next message: rpms/pdfedit/F-8 .cvsignore, 1.6, 1.7 pdfedit-destdir.patch, 1.2, 1.3 pdfedit.spec, 1.7, 1.8 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bjohnson
Update of /cvs/pkgs/rpms/pdfedit/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14711/F-9
Modified Files:
.cvsignore pdfedit-destdir.patch pdfedit.spec sources
Log Message:
- 0.4.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 29 Aug 2007 21:04:47 -0000 1.6
+++ .cvsignore 29 Jun 2008 22:17:09 -0000 1.7
@@ -1 +1 @@
-pdfedit-0.3.2.tar.bz2
+pdfedit-0.4.1.tar.bz2
pdfedit-destdir.patch:
Index: pdfedit-destdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/F-9/pdfedit-destdir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pdfedit-destdir.patch 29 Apr 2007 19:43:18 -0000 1.2
+++ pdfedit-destdir.patch 29 Jun 2008 22:17:09 -0000 1.3
@@ -1,77 +1,11 @@
---- pdfedit-0.3.1-pristine/src/gui/pdfedit.pro 2007-04-29 11:28:52.000000000 -0600
-+++ pdfedit-0.3.1/src/gui/pdfedit.pro 2007-04-29 13:09:11.000000000 -0600
-@@ -46,56 +46,56 @@
+--- pdfedit-0.4.1/Makefile.in.orig 2008-01-16 06:50:22.000000000 -0700
++++ pdfedit-0.4.1/Makefile.in 2008-06-29 14:15:38.000000000 -0600
+@@ -54,7 +54,7 @@
- #Data files installed in application data path (typically /usr/share/pdfedit)
- # Basic data files
--data.path = $$DATA_PATH
-+data.path = $(QMAKE_DESTDIR)/$$DATA_PATH
- data.files = pdfeditrc *.conf *.qs operator.hint
- # Icons
--data_icon.path = $$DATA_PATH/icon
-+data_icon.path = $(QMAKE_DESTDIR)/$$DATA_PATH/icon
- data_icon.files = icon/*.png icon/*.svg
- # Hi-color icon theme
--data_icon_hicolor.path = $$DATA_PATH/icon/hicolor
-+data_icon_hicolor.path = $(QMAKE_DESTDIR)/$$DATA_PATH/icon/hicolor
- data_icon_hicolor.files = icon/hicolor/*.png
- # Help files (english)
--data_help.path = $$DATA_PATH/help
-+data_help.path = $(QMAKE_DESTDIR)/$$DATA_PATH/help
- data_help.files = help/*.html
- # Help files (czech)
--data_help_cs.path = $$DATA_PATH/help/cs
-+data_help_cs.path = $(QMAKE_DESTDIR)/$$DATA_PATH/help/cs
- data_help_cs.files = help/cs/*.html
- # Help images
--data_help_images.path = $$DATA_PATH/help/images
-+data_help_images.path = $(QMAKE_DESTDIR)/$$DATA_PATH/help/images
- data_help_images.files = ../../doc/user/images/*.png
- # Language files
--data_lang.path = $$DATA_PATH/lang
-+data_lang.path = $(QMAKE_DESTDIR)/$$DATA_PATH/lang
- data_lang.files = lang/*.qm
- # Scripts
--data_scripts.path = $$DATA_PATH/scripts
-+data_scripts.path = $(QMAKE_DESTDIR)/$$DATA_PATH/scripts
- # do not include script files starting with underscore,
- # as they are only for development/testing and not for production use
- data_scripts.files = scripts/[a-z0-9A-Z]*.qs
+ # Target for distributed documentation (un)installation
+ doc-dist-install: doc-dist
+- cd $(DOCROOT) && $(MAKE) doc_dist_install
++ cd $(DOCROOT) && $(MAKE) doc_dist_install INSTALL_ROOT=$(QMAKE_DESTDIR)
- # Documentation installed in documentation path (typically /usr/share/doc)
--doc.path = $$DOC_PATH
-+doc.path = $(QMAKE_DESTDIR)/$$DOC_PATH
- doc.files = ../../doc/user/*.html ../../doc/user/*.pdf ../../doc/LICENSE.GPL ../../README ../../Changelog ../../doc/AUTHORS
--doc_images.path = $$DOC_PATH/images
-+doc_images.path = $(QMAKE_DESTDIR)/$$DOC_PATH/images
- doc_images.files = ../../doc/user/images/*.png
--doc_kernel_images.path = $$DOC_PATH/design/kernel/images
-+doc_kernel_images.path = $(QMAKE_DESTDIR)/$$DOC_PATH/design/kernel/images
- doc_kernel_images.files = ../../doc/design/kernel/images/*.png
--doc_gui_images.path = $$DOC_PATH/gui/images
-+doc_gui_images.path = $(QMAKE_DESTDIR)/$$DOC_PATH/gui/images
- doc_gui_images.files = ../../doc/user/gui/images/*.png
--doc_gui_m_images.path = $$DOC_PATH/gui/menuAndToolbarsFun/images
-+doc_gui_m_images.path = $(QMAKE_DESTDIR)/$$DOC_PATH/gui/menuAndToolbarsFun/images
- doc_gui_m_images.files = ../../doc/user/gui/menuAndToolbarsFun/images/*.png
--doc_design.path = $$DOC_PATH/design
-+doc_design.path = $(QMAKE_DESTDIR)/$$DOC_PATH/design
- doc_design.files = ../../doc/design/*.html ../../doc/design/kernel/*.pdf
--doc_design_images.path = $$DOC_PATH/design/images
-+doc_design_images.path = $(QMAKE_DESTDIR)/$$DOC_PATH/design/images
- doc_design_images.files = ../../doc/design/images/*.png
--doc_examples.path = $$DOC_PATH/examples
-+doc_examples.path = $(QMAKE_DESTDIR)/$$DOC_PATH/examples
- doc_examples.files = ../../doc/examples/*.qs
-
- # Man page installed in man path (typically /usr/share/man/man1)
--pdfedit_manual.path = $$MAN_PATH
-+pdfedit_manual.path = $(QMAKE_DESTDIR)/$$MAN_PATH
- pdfedit_manual.files = ../../doc/user/pdfedit.1
-
- #Binary file installed in binary path (typically /usr/bin)
--pdfedit.path = $$BIN_PATH
-+pdfedit.path = $(QMAKE_DESTDIR)/$$BIN_PATH
- pdfedit.files = pdfedit
-
- # cygwin hack
+ doc-dist-uninstall:
+ cd $(DOCROOT) && $(MAKE) doc_dist_uninstall
Index: pdfedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/F-9/pdfedit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pdfedit.spec 12 Apr 2008 00:17:47 -0000 1.9
+++ pdfedit.spec 29 Jun 2008 22:17:09 -0000 1.10
@@ -1,10 +1,10 @@
Name: pdfedit
-Version: 0.3.2
-Release: 5%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
Summary: A complete pdf document editing solution
Group: Applications/Publishing
-License: GPL
+License: GPLv2
URL: http://sourceforge.net/projects/pdfedit/
Source0: http://downloads.sourceforge.net/pdfedit/%{name}-%{version}.tar.bz2
Source1: pdfedit.desktop
@@ -13,9 +13,15 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel, lesstif-devel, libpaper-devel
-BuildRequires: libXpm-devel, qt3-devel, t1lib-devel
+BuildRequires: libXpm-devel, t1lib-devel
BuildRequires: desktop-file-utils, doxygen
+%if 0%{?fedora} >= 9
+BuildRequires: qt3-devel
+%else
+BuildRequires: qt-devel
+%endif
+
%description
Free pdf editing using PdfEdit. Complete editing of pdf documents is made
possible with PDFedit. You can change either raw pdf objects (for advanced
@@ -29,9 +35,13 @@
%patch0 -p1 -b .destdir
%patch1 -p1 -b .fix-includes
+# fix paths to be relative to rpm build root
+sed -i 's/\(.path\s\+= \)/\1$(QMAKE_DESTDIR)\//' src/gui/pdfedit.pro
+
%build
export QMAKESPEC=linux-g++
-%configure
+# currently boost-iostreams causes an error when running configure
+%configure --without-boost-iostreams
make %{?_smp_mflags}
@@ -44,12 +54,6 @@
mv $RPM_BUILD_ROOT/usr/share/doc/pdfedit \
$RPM_BUILD_ROOT/usr/share/doc/pdfedit-%{version}
-# rebase user docs from ./gui/... and ./gui/menuAndToolbarsFun...
-# to ./ for images
-for file in doc/user/*html; do
- sed -i -e 's/gui\/menuAndToolbarsFun\///g' -e 's/gui\///g' $file
-done
-
# install desktop file
desktop-file-install --vendor="fedora" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -67,6 +71,7 @@
install -p -m 0644 src/gui/icon/pdfedit_icon_64.png \
$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/64x64/apps/pdfedit.png
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -92,15 +97,15 @@
%{_datadir}/%{name}
%{_datadir}/applications/*desktop
%{_datadir}/icons/hicolor/*/apps/pdfedit.png
-%doc Changelog COPYING doc/LICENSE.GPL
-# grab a subsection of the documentation - exclude anything development
-# related:
-# doc/design/{design_doc.html,images} - overall program design
-# doc/programmer/html/* - code documentation
-%doc doc/user/*html doc/user/images doc/user/gui/images
-%doc doc/user/gui/menuAndToolbarsFun/images doc/user/examples
+%{_docdir}
%changelog
+* Sun Jun 29 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.4.1-1
+- 0.4.1
+
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.2-6
+- fix license tag
+
* Fri Apr 11 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.3.2-5
- build fix, now requires qt3-devel instead of qt-devel (bz #440291)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 29 Aug 2007 21:04:47 -0000 1.6
+++ sources 29 Jun 2008 22:17:09 -0000 1.7
@@ -1 +1 @@
-e4ed098f70a4c5675b16b22641f5a182 pdfedit-0.3.2.tar.bz2
+05fdd1d995b863709b7130ca8ed5b431 pdfedit-0.4.1.tar.bz2
- Previous message: rpms/Io-language/devel Io-language.spec,1.7,1.8
- Next message: rpms/pdfedit/F-8 .cvsignore, 1.6, 1.7 pdfedit-destdir.patch, 1.2, 1.3 pdfedit.spec, 1.7, 1.8 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list