rpms/html2ps/devel .cvsignore, 1.3, 1.4 html2ps.spec, 1.4, 1.5 sources, 1.3, 1.4 html2ps-1.0b6-preserve_prefix_suffix.patch, 1.1, NONE

[Petr Pisar]

Author: ppisar

Update of /cvs/pkgs/rpms/html2ps/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2852

Modified Files:
	.cvsignore html2ps.spec sources 
Removed Files:
	html2ps-1.0b6-preserve_prefix_suffix.patch 
Log Message:
1.0b7 bump


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/html2ps/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 May 2010 08:13:52 -0000	1.3
+++ .cvsignore	7 May 2010 13:12:06 -0000	1.4
@@ -1,2 +1,2 @@
+html2ps-1.0b7.tar.gz
 html2ps_1.0b5-5.diff.gz
-html2ps-1.0b6.tar.gz


Index: html2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/html2ps/devel/html2ps.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- html2ps.spec	3 May 2010 08:13:52 -0000	1.4
+++ html2ps.spec	7 May 2010 13:12:06 -0000	1.5
@@ -1,12 +1,13 @@
+%define my_subversion b7
 Name:           html2ps
 Version:        1.0
-Release:        0.1.b6%{?dist}
+Release:        0.6.%{my_subversion}%{?dist}
 Summary:        HTML to PostScript converter
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://user.it.uu.se/~jan/%{name}.html
-Source0:        http://user.it.uu.se/~jan/%{name}-1.0b6.tar.gz
+Source0:        http://user.it.uu.se/~jan/%{name}-1.0%{my_subversion}.tar.gz
 Source1:        xhtml2ps.desktop
 Patch0:         http://ftp.de.debian.org/debian/pool/main/h/%{name}/%{name}_1.0b5-5.diff.gz
 # use xdg-open in xhtml2ps
@@ -14,8 +15,6 @@ Patch1:         %{name}-1.0b5-xdg-open.p
 # patch config file from debian to use dvips, avoid using weblint 
 # don't set letter as default page type, paperconf will set the default
 Patch2:         %{name}-1.0b5-config.patch
-# Regression from upstream 1.0b5..1.0b6
-Patch3:         %{name}-1.0b6-preserve_prefix_suffix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -47,11 +46,10 @@ converter.
 
 
 %prep
-%setup -q -n %{name}-1.0b6
+%setup -q -n %{name}-1.0%{my_subversion}
 %patch0 -p1
 %patch1 -p1 -b .xdg-open
 %patch2 -p1 -b .config
-%patch3 -p1 -b .preserve_prefix_suffix
 
 # convert README to utf8
 iconv -f latin1 -t utf8 < README > README.utf8
@@ -107,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*xhtml2ps.desktop
 
 %changelog
+* Fri May  7 2010 Petr Pisar <ppisar at redhat.com> - 1.0-0.6.b7
+- 1.0b7 bump
+- Increase revision to 0.6 to have NVR upper then F-13 package
+
 * Thu Apr 29 2010 Petr Pisar <ppisar at redhat.com> - 1.0-0.1.b6
 - 1.0b6 bump (#530403)
 - Fix regression from upstream 1.0b5..1.0b6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/html2ps/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 May 2010 08:13:52 -0000	1.3
+++ sources	7 May 2010 13:12:06 -0000	1.4
@@ -1,2 +1,2 @@
+073ab8a239c8d0e3547192ee9016db15  html2ps-1.0b7.tar.gz
 ec9c01db20d025d97cc592e8319125e0  html2ps_1.0b5-5.diff.gz
-fc313982655061d63108396c0dd4c137  html2ps-1.0b6.tar.gz


--- html2ps-1.0b6-preserve_prefix_suffix.patch DELETED ---