rpms/pdfedit/EL-5 import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 pdfedit.desktop, 1.1, 1.2 pdfedit.spec, 1.6, 1.7 sources, 1.6, 1.7 pdfedit-destdir.patch, 1.2, NONE

Orion Poplawski orion at fedoraproject.org
Fri Jul 2 18:07:27 UTC 2010


Author: orion

Update of /cvs/pkgs/rpms/pdfedit/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18204/EL-5

Modified Files:
	.cvsignore pdfedit.desktop pdfedit.spec sources 
Added Files:
	import.log 
Removed Files:
	pdfedit-destdir.patch 
Log Message:
Update to 0.4.5 from devel


--- NEW FILE import.log ---
pdfedit-0_4_5-2_fc14:EL-5:pdfedit-0.4.5-2.fc14.src.rpm:1278094029


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	29 Aug 2007 21:04:43 -0000	1.6
+++ .cvsignore	2 Jul 2010 18:07:27 -0000	1.7
@@ -1 +1 @@
-pdfedit-0.3.2.tar.bz2
+pdfedit-0.4.5.tar.bz2


Index: pdfedit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/EL-5/pdfedit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pdfedit.desktop	19 Mar 2007 01:48:55 -0000	1.1
+++ pdfedit.desktop	2 Jul 2010 18:07:27 -0000	1.2
@@ -4,7 +4,7 @@ Name=pdfedit
 GenericName=PDF Editor
 Comment=Edit .pdf files
 Exec=pdfedit
-Icon=pdfedit.png
+Icon=pdfedit
 Terminal=false
 Type=Application
 Categories=Office;


Index: pdfedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/EL-5/pdfedit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pdfedit.spec	29 Aug 2007 21:23:29 -0000	1.6
+++ pdfedit.spec	2 Jul 2010 18:07:27 -0000	1.7
@@ -1,20 +1,31 @@
 Name:           pdfedit
-Version:        0.3.2
+Version:        0.4.5
 Release:        2%{?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
-Patch0:         pdfedit-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  boost-devel, lesstif-devel, libpaper-devel
-BuildRequires:  libXpm-devel, qt-devel, t1lib-devel
+BuildRequires:  boost-devel
+%if 0%{?rhel}
+BuildRequires:  openmotif-devel
+%else
+BuildRequires:  lesstif-devel
+%endif
+BuildRequires:  libpaper-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
@@ -24,11 +35,14 @@ everything is based on a script.
 
 %prep
 %setup -q
+# fix paths to be relative to rpm build root
+sed -i 's/\(.path\s\+= \)/\1$(QMAKE_DESTDIR)\//' src/gui/pdfedit.pro
 
-%patch0 -p1 -b .destdir
 
 %build
 export QMAKESPEC=linux-g++
+# Tools aren't actually installed, so not building them now
+# --enable-pdfedit-core-dev --enable-tools
 %configure
 make %{?_smp_mflags}
 
@@ -36,17 +50,11 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 # DESTDIR is reserved in qmake
-make install QMAKE_DESTDIR=$RPM_BUILD_ROOT
+make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# use rpm standard /usr/share/doc/%{name}-%{version} directory for doc files
-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
+# use rpm standard %{_docdir}/%{name}-%{version} directory for doc files
+mv $RPM_BUILD_ROOT%{_docdir}/%{name} \
+  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 # install desktop file
 desktop-file-install --vendor="fedora"             \
@@ -65,6 +73,7 @@ install -p -m 0644 src/gui/icon/pdfedit_
 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
 
@@ -90,15 +99,66 @@ fi
 %{_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}/%{name}-%{version}
+
 
 %changelog
+* Fri Jul 2 2010 Orion Poplawski <orion at cora.nwra.com> - 0.4.5-2
+- Use openmotif-devel for EPEL
+
+* Tue May 11 2010 Orion Poplawski <orion at cora.nwra.com> - 0.4.5-1
+- Update to 0.4.5
+
+* Tue Apr 13 2010 Orion Poplawski <orion at cora.nwra.com> - 0.4.4.1-1
+- Update to 0.4.4.1
+- Drop zlib and xpdf patches applied upstream
+- Drop destdir patch, use INSTALL_ROOT
+- Drop fix-includes patch
+- Drop .png suffix from icon in .desktop file
+
+* Mon Mar 1 2010 Orion Poplawski <orion at cora.nwra.com> - 0.4.3-5
+- Fix directory ownership (bug #569389)
+
+* Wed Feb 17 2010 Orion Poplawski <orion at cora.nwra.com> - 0.4.3-4
+- Add patch from upstream to fix several security issues in xpdf code:
+  CVE-2009-1188/CVE-2009-3603, CVE-2009-3604, CVE-2009-3606, CVE-2009-3608, 
+  CVE-2009-3609
+
+* Mon Feb 15 2010 Orion Poplawski <orion at cora.nwra.com> - 0.4.3-3
+- Add patch from upstream to fix zlib link issue (bug #565061)
+- Remove old configure option
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Bernard Johnson <bjohnson at symetrix.com> - 0.4.3-1
+- 0.4.3
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 21 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.4.2-1
+- 0.4.2
+- rediff patch from Makefile.in to Makefile
+
+* Tue Sep 30 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.4.1-2
+- fix patch fuzz
+
+* 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)
+
+* Sun Feb 24 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.3.2-4
+- fix includes caught in new gcc-4.3 rebuild
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.3.2-3
+- Autorebuild for GCC 4.3
+
 * Wed Aug 29 2007 Bernard Johnson <bjohnson at symetrix.com> - 0.3.2-2
 - doxygen patch no longer needed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Aug 2007 21:04:43 -0000	1.6
+++ sources	2 Jul 2010 18:07:27 -0000	1.7
@@ -1 +1 @@
-e4ed098f70a4c5675b16b22641f5a182  pdfedit-0.3.2.tar.bz2
+80502ee7f08cdfb867ffdaa92d160a23  pdfedit-0.4.5.tar.bz2


--- pdfedit-destdir.patch DELETED ---



More information about the scm-commits mailing list