rpms/pdfedit/F-12 .cvsignore, 1.9, 1.10 import.log, 1.1, 1.2 pdfedit.desktop, 1.1, 1.2 pdfedit.spec, 1.17, 1.18 sources, 1.9, 1.10 pdfedit-0.4.3-zlib.patch, 1.1, NONE pdfedit-destdir.patch, 1.4, NONE pdfedit-fix-includes.patch, 1.2, NONE xpdf-3.02pl4.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/pdfedit/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30093/F-12

Modified Files:
	.cvsignore import.log pdfedit.desktop pdfedit.spec sources 
Removed Files:
	pdfedit-0.4.3-zlib.patch pdfedit-destdir.patch 
	pdfedit-fix-includes.patch xpdf-3.02pl4.patch 
Log Message:
Update to 0.4.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	22 Jul 2009 02:17:20 -0000	1.9
+++ .cvsignore	14 Apr 2010 20:30:14 -0000	1.10
@@ -1 +1 @@
-pdfedit-0.4.3.tar.bz2
+pdfedit-0.4.4.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Feb 2010 17:54:06 -0000	1.1
+++ import.log	14 Apr 2010 20:30:15 -0000	1.2
@@ -1 +1,2 @@
 pdfedit-0_4_3-4_fc14:F-12:pdfedit-0.4.3-4.fc14.src.rpm:1266429235
+pdfedit-0_4_4_1-1_fc14:F-12:pdfedit-0.4.4.1-1.fc14.src.rpm:1271277000


Index: pdfedit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/F-12/pdfedit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pdfedit.desktop	19 Mar 2007 01:43:03 -0000	1.1
+++ pdfedit.desktop	14 Apr 2010 20:30:16 -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/F-12/pdfedit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pdfedit.spec	17 Feb 2010 17:54:07 -0000	1.17
+++ pdfedit.spec	14 Apr 2010 20:30:16 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           pdfedit
-Version:        0.4.3
-Release:        4%{?dist}
+Version:        0.4.4.1
+Release:        1%{?dist}
 Summary:        A complete pdf document editing solution
 
 Group:          Applications/Publishing
@@ -8,11 +8,6 @@ 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
-Patch1:         pdfedit-fix-includes.patch
-Patch2:         pdfedit-0.4.3-zlib.patch
-#Patch to fix several security issues
-Patch3:         xpdf-3.02pl4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel, lesstif-devel, libpaper-devel
@@ -34,20 +29,14 @@ everything is based on a script.
 
 %prep
 %setup -q
-
-%patch0 -p1 -b .destdir
-%patch1 -p1 -b .fix-includes
-%patch2 -p1 -b .zlib
-%patch3 -p1 -b .xpdf-3.02pl4
-# zlib patch requires autoconf run
-autoconf
-
 # 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++
+# Tools aren't actually installed, so not building them now
+# --enable-pdfedit-core-dev --enable-tools
 %configure
 make %{?_smp_mflags}
 
@@ -55,11 +44,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}
+# 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"             \
@@ -104,9 +93,20 @@ fi
 %{_datadir}/%{name}
 %{_datadir}/applications/*desktop
 %{_datadir}/icons/hicolor/*/apps/pdfedit.png
-%{_docdir}
+%{_docdir}/%{name}-%{version}
+
 
 %changelog
+* 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, 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfedit/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Jul 2009 02:17:20 -0000	1.9
+++ sources	14 Apr 2010 20:30:16 -0000	1.10
@@ -1 +1 @@
-98eb8d8d42027241c10a5c9bedacc20e  pdfedit-0.4.3.tar.bz2
+43973c41c9264829107218c4b4021bbb  pdfedit-0.4.4.1.tar.bz2


--- pdfedit-0.4.3-zlib.patch DELETED ---


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


--- pdfedit-fix-includes.patch DELETED ---


--- xpdf-3.02pl4.patch DELETED ---