[polyclipping] New upstream release 6.1.3a

Volker Fröhlich volter at fedoraproject.org
Fri Mar 7 16:51:44 UTC 2014


commit d58fde56ce353de93db38d504b83612195420531
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Fri Mar 7 08:34:49 2014 +0100

    New upstream release 6.1.3a

 .gitignore                  |    1 +
 polyclipping-bug47.patch    |   20 --------------------
 polyclipping-rounding.patch |   16 ----------------
 polyclipping.spec           |   23 ++++++++++++-----------
 sources                     |    2 +-
 5 files changed, 14 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 36c72a1..cb50c13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /clipper_ver5.0.3.zip
 /clipper_ver5.1.2.zip
 /clipper_ver5.1.6.zip
+/clipper_ver6.1.3a.zip
diff --git a/polyclipping.spec b/polyclipping.spec
index 1adc1b1..a930ad3 100644
--- a/polyclipping.spec
+++ b/polyclipping.spec
@@ -5,8 +5,8 @@
 # http://upstream-tracker.org/versions/clipper.html
 
 Name:           polyclipping
-Version:        5.1.6
-Release:        4%{?dist}
+Version:        6.1.3a
+Release:        2%{?dist}
 Summary:        Polygon clipping library
 
 Group:          System Environment/Libraries
@@ -14,12 +14,6 @@ License:        Boost
 URL:            http://sourceforge.net/projects/polyclipping
 Source0:        http://downloads.sourceforge.net/%{name}/clipper_ver%{version}.zip
 
-# http://sourceforge.net/p/polyclipping/bugs/47/
-Patch0:         %{name}-bug47.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1047914
-Patch1:         %{name}-rounding.patch
-
 BuildRequires:  cmake
 BuildRequires:  dos2unix
 
@@ -44,13 +38,10 @@ developing applications that use %{name}.
 
 %prep
 %setup -qc
-%patch0 -p1
-%patch1 -p1
 
 # Delete binaries
 find . \( -name "*.exe" -o -name "*.dll" \) -delete
 
-#TODO
 # Correct line ends and encodings
 find . -type f -exec dos2unix -k {} \;
 
@@ -60,6 +51,9 @@ for filename in perl/perl_readme.txt README; do
     mv "${filename}".conv "${filename}"
 done
 
+# Enable use_lines
+sed -i 's|^//#define use_lines$|#define use_lines|' cpp/clipper.hpp
+
 
 %build
 pushd cpp
@@ -88,10 +82,17 @@ popd
 %{_libdir}/lib%{name}.so.*
 
 %files devel
+%{_datadir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Fri Feb  7 2014 Volker Fröhlich <volker27 at gmx.at> - 6.1.3a-2
+- Enable use_lines
+
+* Fri Feb  7 2014 Volker Fröhlich <volker27 at gmx.at> - 6.1.3a-1
+- New upstream release
+
 * Fri Jan 03 2014 Miro Hrončok <mhroncok at redhat.com> - 5.1.6-4
 - Added patch to solve rounding error (#1047914)
 
diff --git a/sources b/sources
index babb10a..5697b51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b44159d15d75731e374f0ddda61a49a  clipper_ver5.1.6.zip
+4dcd043ce48de59714f07bd3ec7ac62b  clipper_ver6.1.3a.zip


More information about the scm-commits mailing list