- updated to 1.4.2

- updated link patch

diff --git a/gl2ps-link.patch b/gl2ps-link.patch
index a3eb8093f53ded8bf194c1c30e76c34dfeb83235..3997d12faef6f79c5b366ed97ce0576466cbfa14 100644 (file)
--- a/gl2ps-link.patch
+++ b/gl2ps-link.patch
@@ -1,15 +1,15 @@
---- 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 @@
+--- gl2ps-1.4.2/CMakeLists.txt.orig    2022-09-11 15:02:34.057939204 +0200
++++ gl2ps-1.4.2/CMakeLists.txt 2022-09-11 15:04:19.237369398 +0200
+@@ -143,7 +143,7 @@ if(OPENGL_FOUND)

    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(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}
-@@ -134,9 +134,9 @@
+   set_target_properties(shared PROPERTIES OUTPUT_NAME gl2ps
+     VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION}
+     SOVERSION ${GL2PS_MAJOR_VERSION})
+@@ -171,9 +171,9 @@ install(FILES ${CMAKE_SOURCE_DIR}/gl2psT

  
  if(GLUT_FOUND)
    add_executable(gl2psTest WIN32 gl2psTest.c)
  
  if(GLUT_FOUND)
    add_executable(gl2psTest WIN32 gl2psTest.c)


@@ -18,6 +18,6 @@
    add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
 -  target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
 +  target_link_libraries(gl2psTestSimple 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)
+ endif()

  
  find_package(LATEX)
  
  find_package(LATEX)

diff --git a/gl2ps.spec b/gl2ps.spec
index 04ffa42d4713c79ec1efe976fcee40715b25b63b..4fe54d56467c15bc3415c801216e2c0e9dc644e2 100644 (file)
--- a/gl2ps.spec
+++ b/gl2ps.spec
@@ -1,18 +1,18 @@
 Summary:       GL2PS - an OpenGL to PostScript printing library
 Summary(pl.UTF-8):     GL2PS - biblioteka drukowania z OpenGL-a do PostScriptu
 Name:          gl2ps
 Summary:       GL2PS - an OpenGL to PostScript printing library
 Summary(pl.UTF-8):     GL2PS - biblioteka drukowania z OpenGL-a do PostScriptu
 Name:          gl2ps

-Version:       1.4.0
+Version:       1.4.2

 Release:       1
 License:       LGPL v2+ or GP2PS License v2+ (see COPYING.GL2PS)
 Group:         Libraries
 Source0:       http://www.geuz.org/gl2ps/src/%{name}-%{version}.tgz
 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: 3efb6e8fe4580fda23601b17161c189c
+# Source0-md5: 0606554d833f4fd9f09eab48a374c785

 Patch0:                %{name}-link.patch
 URL:           http://www.geuz.org/gl2ps/
 BuildRequires: OpenGL-devel
 Patch0:                %{name}-link.patch
 URL:           http://www.geuz.org/gl2ps/
 BuildRequires: OpenGL-devel

-BuildRequires: cmake >= 2.4
+BuildRequires: cmake >= 2.8

 BuildRequires: libpng-devel
 BuildRequires: libpng-devel

-BuildRequires: rpmbuild(macros) >= 1.603
+BuildRequires: rpmbuild(macros) >= 1.605

 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -76,11 +76,13 @@ Static GL2PS library.
 Statyczna biblioteka GL2PS.
 
 %prep
 Statyczna biblioteka GL2PS.
 
 %prep

-%setup -q -n %{name}-%{version}-source
+%setup -q

 %patch0 -p1
 
 %build
 %patch0 -p1
 
 %build

-%cmake .
+install -d build
+cd build
+%cmake ..

 
 %{__make}
 
 
 %{__make}
 


@@ -88,7 +90,7 @@ Statyczna biblioteka GL2PS.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}
 
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}
 

-%{__make} install \
+%{__make} -C build install \

        DESTDIR=$RPM_BUILD_ROOT
 
 # docs packaged as %doc, tests not useful at runtime
        DESTDIR=$RPM_BUILD_ROOT
 
 # docs packaged as %doc, tests not useful at runtime