From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 22 Apr 2014 19:14:21 +0000 (+0200)
Subject: pcre: Move pcre-compat package into own build file.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2979fbcc735da1f72d19bc00b5279a03e1bfb043;p=ipfire-3.x.git

pcre: Move pcre-compat package into own build file.

Fixes #10523.
---

diff --git a/compat-pcre/compat-pcre.nm b/compat-pcre/compat-pcre.nm
new file mode 100644
index 000000000..5251971cc
--- /dev/null
+++ b/compat-pcre/compat-pcre.nm
@@ -0,0 +1,74 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-pcre
+version    = 8.21
+release    = 1
+
+thisapp    = pcre-%{version}
+
+groups     = System/Libraries
+url        = http://www.pcre.org/
+license    = BSD
+summary    = Perl-compatible regular expression library.
+
+description
+	Perl-compatible regular expression library. PCRE has its own native
+	API, but a set of "wrapper" functions that are based on the POSIX
+	API are also supplied in the library libpcreposix.
+end
+
+source_dl  = http://sourceforge.net/projects/pcre/files/pcre/%{version}/
+
+build
+	requires
+		bzip2-devel
+		gcc-c++
+		readline-devel
+		zlib-devel
+	end
+
+	configure_options += \
+		--disable-static \
+		--docdir=/usr/share/doc/pcre-%{version} \
+		--disable-jit \
+		--enable-pcre8 \
+		--enable-pcre16 \
+		--enable-pcre32 \
+		--enable-utf \
+		--enable-unicode-properties \
+		--enable-pcretest-libreadline
+
+	test
+		make check
+	end
+
+	install
+		# Only install libraries.
+		mkdir -pv %{BUILDROOT}%{libdir}
+		install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir}
+		ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libpcre.so.0
+	end
+end
+
+packages
+	package %{name}
+		provides
+			pcre = %{thisver}
+		end
+
+		obsoletes
+			pcre-compat
+		end
+
+		conflicts
+			pcre <= %{thisver}
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/pcre/pcre.nm b/pcre/pcre.nm
index a9cc86c38..112df6aea 100644
--- a/pcre/pcre.nm
+++ b/pcre/pcre.nm
@@ -5,9 +5,7 @@
 
 name       = pcre
 version    = 8.35
-release    = 2
-
-compat_version = 8.21
+release    = 3
 
 groups     = System/Libraries
 url        = http://www.pcre.org/
@@ -21,7 +19,6 @@ description
 end
 
 source_dl  = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-sources   += %{name}-%{compat_version}.tar.gz
 
 build
 	requires
@@ -42,25 +39,8 @@ build
 		--enable-unicode-properties \
 		--enable-pcretest-libreadline
 
-	build_cmds
-		cd %{DIR_SRC}/%{name}-%{compat_version}
-		./configure \
-			%{configure_options}
-
-		make %{PARALLELISMFLAGS}
-	end
-
 	test
 		make check
-
-		cd %{DIR_SRC}/%{name}-%{compat_version}
-		make check
-	end
-
-	install_cmds
-		cd %{DIR_SRC}/%{name}-%{compat_version}
-		install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir}
-		ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libpcre.so.0
 	end
 end
 
@@ -71,14 +51,6 @@ packages
 		template DEVEL
 	end
 
-	package %{name}-compat
-		summary = Compat libraries of %{thisapp}.
-
-		files
-			%{libdir}/libpcre.so.0*
-		end
-	end
-
 	package %{name}-debuginfo
 		template DEBUGINFO
 	end