rpms/gl2ps/F-12 gl2ps-soversion.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gl2ps.spec, 1.5, 1.6 sources, 1.3, 1.4 gl2ps-buildsys.patch, 1.1, NONE gl2ps-noexit.patch, 1.1, NONE

[Dominik Mierzejewski]

Author: rathann

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

Modified Files:
	.cvsignore gl2ps.spec sources 
Added Files:
	gl2ps-soversion.patch 
Removed Files:
	gl2ps-buildsys.patch gl2ps-noexit.patch 
Log Message:
* Wed Jun 30 2010 Dominik Mierzejewski <rpm at greysector.net> 1.3.5-1
- updated to 1.3.5
- dropped upstreamed patches
- fixed install in libdir
- fixed missing SO version


gl2ps-soversion.patch:
 CMakeLists.txt |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE gl2ps-soversion.patch ---
diff -up gl2ps-1.3.5-source/CMakeLists.txt.r gl2ps-1.3.5-source/CMakeLists.txt
--- gl2ps-1.3.5-source/CMakeLists.txt.r	2009-10-16 21:14:07.000000000 +0200
+++ gl2ps-1.3.5-source/CMakeLists.txt	2009-12-26 17:23:38.000000000 +0100
@@ -116,6 +116,10 @@ if(OPENGL_FOUND)
   install(TARGETS lib shared DESTINATION lib)
 endif(OPENGL_FOUND)
 
+set_target_properties(shared PROPERTIES
+                      VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION}
+                      SOVERSION ${GL2PS_MAJOR_VERSION}) 
+
 if(WIN32)
   set(GL2PS_DOC .)
 else(WIN32)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gl2ps/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Aug 2009 18:09:53 -0000	1.3
+++ .cvsignore	29 Jun 2010 22:34:13 -0000	1.4
@@ -1 +1 @@
-gl2ps-1.3.3.tgz
+gl2ps-1.3.5.tgz


Index: gl2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gl2ps/F-12/gl2ps.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gl2ps.spec	23 Aug 2009 18:09:53 -0000	1.5
+++ gl2ps.spec	29 Jun 2010 22:34:14 -0000	1.6
@@ -1,15 +1,17 @@
 Summary:	An OpenGL to PostScript printing library
 Summary(pl):	Biblioteka drukowania z OpenGL-a do PostScriptu
 Name:		gl2ps
-Version:	1.3.3
+Version:	1.3.5
 Release:	1%{?dist}
 License:	LGPLv2+ or GL2PS
 Group:		System Environment/Libraries
 Source0:	http://www.geuz.org/gl2ps/src/%{name}-%{version}.tgz
-Patch0:		%{name}-noexit.patch
-Patch1:		%{name}-buildsys.patch
+Patch0:         %{name}-soversion.patch
 URL:		http://www.geuz.org/gl2ps/
+BuildRequires:  cmake
 BuildRequires:	libGL-devel
+BuildRequires:  libpng-devel
+BuildRequires:  zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 
 %description
@@ -60,16 +62,23 @@ Header files for GL2PS library.
 Pliki nagłówkowe biblioteki GL2PS.
 
 %prep
-%setup -q
-%patch0 -p1 -b .noexit
-%patch1 -p1 -b .b
+%setup -q -n %{name}-%{version}-source
+%patch0 -p1 -b .soversion
 
 %build
-make OPTFLAGS="%{optflags}" %{?_smp_mflags}
+%{cmake} .
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make SLIBDIR=%{_libdir} DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install
+
+if [ "x%{_lib}" != "xlib" ]; then
+    mv %{buildroot}%{_prefix}/lib %{buildroot}%{_libdir}
+fi
+
+rm -r %{buildroot}%{_docdir}/gl2ps
+rm %{buildroot}%{_libdir}/libgl2ps.a
 
 %clean
 rm -rf %{buildroot}
@@ -79,16 +88,22 @@ rm -rf %{buildroot}
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING.GL2PS COPYING.LGPL
+%doc COPYING.GL2PS COPYING.LGPL README.txt
 %attr(755,root,root) %{_libdir}/libgl2ps.so.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc gl2ps.pdf TODO gl2psTest*.c
+%doc gl2ps.pdf TODO.txt gl2psTest*.c
 %{_libdir}/libgl2ps.so
 %{_includedir}/gl2ps.h
 
 %changelog
+* Wed Jun 30 2010 Dominik Mierzejewski <rpm at greysector.net> 1.3.5-1
+- updated to 1.3.5
+- dropped upstreamed patches
+- fixed install in libdir
+- fixed missing SO version
+
 * Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 1.3.3-1
 - updated to 1.3.3
 - removed calls to exit(3)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gl2ps/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Aug 2009 18:09:53 -0000	1.3
+++ sources	29 Jun 2010 22:34:14 -0000	1.4
@@ -1 +1 @@
-f2f513f0cd2b5e49902c503edc291487  gl2ps-1.3.3.tgz
+22e51ff57ecd35cb1cc22497a178a017  gl2ps-1.3.5.tgz


--- gl2ps-buildsys.patch DELETED ---


--- gl2ps-noexit.patch DELETED ---