packages: gl2ps/gl2ps.spec, gl2ps/gl2ps-link.patch (NEW) - updated to 1.3.6...

[qboosh]

Author: qboosh                       Date: Thu Aug 18 16:03:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.3.6
- added link patch

---- Files affected:
packages/gl2ps:
   gl2ps.spec (1.10 -> 1.11) , gl2ps-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gl2ps/gl2ps.spec
diff -u packages/gl2ps/gl2ps.spec:1.10 packages/gl2ps/gl2ps.spec:1.11
--- packages/gl2ps/gl2ps.spec:1.10	Sat May 29 18:03:14 2010
+++ packages/gl2ps/gl2ps.spec	Thu Aug 18 18:03:08 2011
@@ -2,16 +2,18 @@
 Summary:	GL2PS - an OpenGL to PostScript printing library
 Summary(pl.UTF-8):	GL2PS - biblioteka drukowania z OpenGL-a do PostScriptu
 Name:		gl2ps
-Version:	1.3.5
-Release:	4
+Version:	1.3.6
+Release:	1
 License:	LGPL v2+ or GP2PS License v2+ (see COPYING.GL2PS)
 Group:		Libraries
 Source0:	http://www.geuz.org/gl2ps/src/%{name}-%{version}.tgz
-# Source0-md5:	22e51ff57ecd35cb1cc22497a178a017
+# Source0-md5:	41eb8f4a143ef83de2fd8cd3423acf7a
+Patch0:		%{name}-link.patch
 URL:		http://www.geuz.org/gl2ps/
 BuildRequires:	OpenGL-devel
-BuildRequires:	cmake
+BuildRequires:	cmake >= 2.4
 BuildRequires:	libpng-devel
+BuildRequires:	rpmbuild(macros) >= 1.603
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,12 +78,11 @@
 
 %prep
 %setup -q -n %{name}-%{version}-source
+%patch0 -p1
 
 %build
-export CFLAGS="%{rpmcflags}"
-export CXXFLAGS="%{rpmcflags}"
-%{__cmake} . \
-	-DCMAKE_INSTALL_PREFIX="%{_prefix}"
+%cmake .
+
 %{__make}
 
 %install
@@ -91,10 +92,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT{%{_prefix}/lib/libgl2ps.so,%{_libdir}/libgl2ps.so.0.0.0}
-ln -s libgl2ps.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/libgl2ps.so
-[ -f $RPM_BUILD_ROOT%{_libdir}/libgl2ps.a ] || mv $RPM_BUILD_ROOT{%{_prefix}/lib,%{_libdir}}/libgl2ps.a
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -105,6 +102,7 @@
 %defattr(644,root,root,755)
 %doc COPYING.GL2PS README.txt TODO.txt
 %attr(755,root,root) %{_libdir}/libgl2ps.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgl2ps.so.1
 
 %files devel
 %defattr(644,root,root,755)
@@ -122,6 +120,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2011/08/18 16:03:08  qboosh
+- updated to 1.3.6
+- added link patch
+
 Revision 1.10  2010/05/29 16:03:14  gotar
 - rel. 4 as builders deny to do partial builds
 

================================================================
Index: packages/gl2ps/gl2ps-link.patch
diff -u /dev/null packages/gl2ps/gl2ps-link.patch:1.1
--- /dev/null	Thu Aug 18 18:03:13 2011
+++ packages/gl2ps/gl2ps-link.patch	Thu Aug 18 18:03:08 2011
@@ -0,0 +1,32 @@
+--- gl2ps-1.3.6-source/CMakeLists.txt.orig	2011-08-14 19:15:31.000000000 +0200
++++ gl2ps-1.3.6-source/CMakeLists.txt	2011-08-18 17:20:11.409530657 +0200
+@@ -107,7 +107,7 @@
+   set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
+ 
+   add_library(shared SHARED gl2ps.c gl2ps.h)
+-  target_link_libraries(shared ${EXTERNAL_LIBRARIES})
++  target_link_libraries(shared ${EXTERNAL_LIBRARIES} m)
+   set_target_properties(shared PROPERTIES OUTPUT_NAME gl2ps)
+   set_target_properties(shared PROPERTIES
+                         VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION}
+@@ -116,7 +116,7 @@
+     set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
+   endif(MSVC)
+ 
+-  install(TARGETS lib shared DESTINATION lib)
++  install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
+ endif(OPENGL_FOUND)
+ 
+ if(WIN32)
+@@ -134,9 +134,9 @@
+ 
+ if(GLUT_FOUND)
+   add_executable(gl2psTest WIN32 gl2psTest.c)
+-  target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
++  target_link_libraries(gl2psTest shared ${EXTERNAL_LIBRARIES})
+   add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
+-  target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
++  target_link_libraries(gl2psTestSimple shared ${EXTERNAL_LIBRARIES})
+ endif(GLUT_FOUND)
+ 
+ find_package(LATEX)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gl2ps/gl2ps.spec?r1=1.10&r2=1.11&f=u