rpms/paps/devel paps-0.6.1-makefile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 paps.spec, 1.2, 1.3 sources, 1.3, 1.4

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	.cvsignore paps.spec sources 
Added Files:
	paps-0.6.1-makefile.patch 
Log Message:
* Tue Dec 13 2005 Akira TAGOH <tagoh at redhat.com> - 0.6.1-1
- New upstream release.
- paps-0.6.1-makefile.patch: applied to install docs on the proper dir.

paps-0.6.1-makefile.patch:

--- NEW FILE paps-0.6.1-makefile.patch ---
diff -ruN paps-0.6.1.orig/doc/Makefile.am paps-0.6.1/doc/Makefile.am
--- paps-0.6.1.orig/doc/Makefile.am	2005-12-13 22:16:48.000000000 +0900
+++ paps-0.6.1/doc/Makefile.am	2005-12-13 22:19:38.000000000 +0900
@@ -10,7 +10,7 @@
 
 EXTRA_DIST = Doxyfile example-output.png mainpage.h
 
-htmldir = share/doc/libpaps/html
+htmldir = $(datadir)/doc/paps-$(VERSION)/html
-install-data-hook:
-	mkdir -p $(prefix)/$(htmldir)
-	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
+#install-data-hook:
+#	mkdir -p $(prefix)/$(htmldir)
+#	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
diff -ruN paps-0.6.1.orig/src/Makefile.am paps-0.6.1/src/Makefile.am
--- paps-0.6.1.orig/src/Makefile.am	2005-12-13 22:16:48.000000000 +0900
+++ paps-0.6.1/src/Makefile.am	2005-12-13 22:18:55.000000000 +0900
@@ -1,4 +1,4 @@
-lib_LIBRARIES = libpaps.a
+noinst_LIBRARIES = libpaps.a
 libpaps_a_SOURCES = libpaps.c
 libpaps_a_inc_HEADERS = libpaps.h
 libpaps_a_incdir = $(includedir)
@@ -6,7 +6,7 @@
 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)
 
@@ -20,7 +20,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) 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Nov 2005 06:28:10 -0000	1.3
+++ .cvsignore	13 Dec 2005 13:32:23 -0000	1.4
@@ -1,2 +1,6 @@
+*gz
+*bz2
+*rpm
 paps-0.3.tgz
 paps-0.5.tgz
+paps-0.6.1.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paps.spec	4 Nov 2005 06:28:10 -0000	1.2
+++ paps.spec	13 Dec 2005 13:32:24 -0000	1.3
@@ -1,12 +1,13 @@
 Name:		paps
-Version:	0.5
+Version:	0.6.1
 Release:	1%{?dist}
 
 License:	LGPL
-URL:		http://imagic.weizmann.ac.il/~dov/freesw/paps/
-Source0:	http://imagic.weizmann.ac.il/~dov/freesw/paps/paps-%{version}.tgz
+URL:		http://paps.sourceforge.net/
+Source0:	http://paps.sourceforge.net/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
+Patch0:		paps-0.6.1-makefile.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -15,29 +16,38 @@
 
 
 %prep
-%setup -q -n paps
+%setup -q
+%patch0 -p1 -b .makefile
+aclocal
+automake
+autoconf
 
 
 %build
-make %{?_smp_mflags} CC="gcc $RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 paps $RPM_BUILD_ROOT%{_bindir}
 
+%makeinstall
+rm -rf $RPM_BUILD_ROOT%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc COPYING
+%doc AUTHORS COPYING.LIB README NEWS TODO
 %{_bindir}/paps
 
 
 %changelog
+* Tue Dec 13 2005 Akira TAGOH <tagoh at redhat.com> - 0.6.1-1
+- New upstream release.
+- paps-0.6.1-makefile.patch: applied to install docs on the proper dir.
+
 * Fri Nov  4 2005 Akira TAGOH <tagoh at redhat.com> - 0.5-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Nov 2005 06:28:10 -0000	1.3
+++ sources	13 Dec 2005 13:32:24 -0000	1.4
@@ -1 +1 @@
-85466c651087c70341ddf46dd9281722  paps-0.5.tgz
+9de11306b1db7c87e754b66e3328b212  paps-0.6.1.tar.gz