rpms/paps/devel paps-makefile.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 paps.spec, 1.8, 1.9 sources, 1.6, 1.7 paps-0.6.1-makefile.patch, 1.1, NONE paps-0.6.3-fix-pagesize.patch, 1.1, NONE paps-0.6.3-goption.patch, 1.1, NONE paps-0.6.3-header.patch, 1.2, NONE

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/paps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25576

Modified Files:
	.cvsignore paps.spec sources 
Added Files:
	paps-makefile.patch 
Removed Files:
	paps-0.6.1-makefile.patch paps-0.6.3-fix-pagesize.patch 
	paps-0.6.3-goption.patch paps-0.6.3-header.patch 
Log Message:
* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.5-1
- New upstream release.
  - paps-0.6.3-fix-pagesize.patch: removed. it has been merged in upstream.
  - paps-0.6.3-goption.patch: removed. it has been merged in upstream.
  - paps-0.6.3-header.patch: removed. it has been merged in upstream.
- paps-makefile.patch: rework to be applied.

paps-makefile.patch:

--- NEW FILE paps-makefile.patch ---
diff -ruN paps-0.6.5.orig/doc/Makefile.am paps-0.6.5/doc/Makefile.am
--- paps-0.6.5.orig/doc/Makefile.am	2005-12-21 04:35:35.000000000 +0900
+++ paps-0.6.5/doc/Makefile.am	2006-04-17 17:28:52.000000000 +0900
@@ -10,7 +10,7 @@
 
 EXTRA_DIST = Doxyfile example-output.png mainpage.h
 
-htmldir = share/doc/libpaps/html
-install-data-hook:
-	mkdir -p $(prefix)/$(htmldir)
-	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
+htmldir = $(datadir)/doc/paps-$(VERSION)/html
+#install-data-hook:
+#	mkdir -p $(prefix)/$(htmldir)
+#	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
diff -ruN paps-0.6.5.orig/src/Makefile.am paps-0.6.5/src/Makefile.am
--- paps-0.6.5.orig/src/Makefile.am	2006-04-17 15:04:13.000000000 +0900
+++ paps-0.6.5/src/Makefile.am	2006-04-17 17:30:01.000000000 +0900
@@ -1,5 +1,5 @@
 man_MANS = paps.1
-lib_LIBRARIES = libpaps.a
+noinst_LIBRARIES = libpaps.a
 libpaps_a_SOURCES = libpaps.c
 libpaps_a_inc_HEADERS = libpaps.h
 libpaps_a_incdir = $(includedir)
@@ -7,9 +7,9 @@
 bin_PROGRAMS = paps
 paps_CFLAGS  = -Wall 
 paps_SOURCES = paps.c
-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+paps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 paps_LDFLAGS = `pkg-config --libs pangoft2`
-paps_DEPENDENCIES = $(lib_LIBRARIES)
+paps_DEPENDENCIES = $(noinst_LIBRARIES)
 
 EXTRA_DIST = test_libpaps.c paps.1
 
@@ -21,7 +21,7 @@
 
 
 test_libpaps_SOURCES = test_libpaps.c
-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+test_libpaps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 test_libpaps_LDFLAGS = `pkg-config --libs pangoft2`
-test_libpaps_DEPENDENCIES = $(lib_LIBRARIES) 
+test_libpaps_DEPENDENCIES = $(noinst_LIBRARIES) 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jan 2006 06:13:52 -0000	1.6
+++ .cvsignore	17 Apr 2006 08:38:31 -0000	1.7
@@ -6,3 +6,4 @@
 paps-0.6.1.tar.gz
 paps-0.6.2.tar.gz
 paps-0.6.3.tar.gz
+paps-0.6.5.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- paps.spec	31 Mar 2006 05:21:07 -0000	1.8
+++ paps.spec	17 Apr 2006 08:38:31 -0000	1.9
@@ -1,17 +1,14 @@
 Name:		paps
-Version:	0.6.3
-Release:	4%{?dist}
+Version:	0.6.5
+Release:	1%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
-Patch0:		paps-0.6.1-makefile.patch
-Patch1:		paps-0.6.3-fix-pagesize.patch
+Patch0:		paps-makefile.patch
 Patch2:		paps-0.6.3-formfeed.patch
-Patch3:		paps-0.6.3-goption.patch
-Patch4:		paps-0.6.3-header.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -22,10 +19,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .makefile
-%patch1 -p1 -b .pagesize
 %patch2 -p1 -b .formfeed
-%patch3 -p1 -b .goption
-%patch4 -p1 -b .header
 aclocal
 automake
 autoconf
@@ -49,9 +43,17 @@
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING.LIB README NEWS TODO
 %{_bindir}/paps
+%{_mandir}/man1/paps.1*
 
 
 %changelog
+* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.5-1
+- New upstream release.
+  - paps-0.6.3-fix-pagesize.patch: removed. it has been merged in upstream.
+  - paps-0.6.3-goption.patch: removed. it has been merged in upstream.
+  - paps-0.6.3-header.patch: removed. it has been merged in upstream.
+- paps-makefile.patch: rework to be applied.
+
 * Fri Mar 31 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.3-4
 - paps-0.6.3-formfeed.patch: applied to deal with the formfeed mark properly.
 - paps-0.6.3-goption.patch: rewritten option parser using GOption. and segfault


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2006 06:13:52 -0000	1.6
+++ sources	17 Apr 2006 08:38:31 -0000	1.7
@@ -1 +1 @@
-6f36fd52b6254c99ac2710527ef413d6  paps-0.6.3.tar.gz
+5bb91f6358218f5cbba520376f3e3c1e  paps-0.6.5.tar.gz


--- paps-0.6.1-makefile.patch DELETED ---


--- paps-0.6.3-fix-pagesize.patch DELETED ---


--- paps-0.6.3-goption.patch DELETED ---


--- paps-0.6.3-header.patch DELETED ---