]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
Merge remote-tracking branch 'stevee/updates'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Apr 2014 18:30:21 +0000 (20:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Apr 2014 18:30:21 +0000 (20:30 +0200)
compat-libpng/compat-libpng.nm [new file with mode: 0644]
compat-mpfr/compat-mpfr.nm [new file with mode: 0644]
compat-pcre/compat-pcre.nm [new file with mode: 0644]
libpng/libpng.nm
mpfr/mpfr.nm
pcre/pcre.nm
sudo/sudo.nm

diff --git a/compat-libpng/compat-libpng.nm b/compat-libpng/compat-libpng.nm
new file mode 100644 (file)
index 0000000..44b424b
--- /dev/null
@@ -0,0 +1,61 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-libpng
+version    = 1.5.18
+release    = 1
+thisapp    = libpng-%{version}
+
+groups     = System/Libraries
+url        = http://www.libpng.org/pub/png/
+license    = zlib
+summary    = A library of functions for manipulating PNG image format files.
+
+description
+       The libpng package contains a library of functions for creating and
+       manipulating PNG (Portable Network Graphics) image format files.
+       PNG is a bit-mapped graphics format similar to the GIF format. PNG
+       was created to replace the GIF format, since GIF uses a patented
+       data compression algorithm.
+end
+
+source_dl +=  http://downloads.sourceforge.net/project/libpng/libpng15/%{version}/
+source_dl +=  http://downloads.sourceforge.net/project/libpng/history/libpng15/%{version}/
+
+sources    = %{thisapp}.tar.xz
+
+build
+       requires
+               pkg-config
+               zlib-devel
+       end
+
+       install
+               # Install just the library and no headers.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               install -m 755 .libs/libpng15.so.15.18.0 %{BUILDROOT}%{libdir}
+               ln -svf libpng15.so.15.18.0 %{BUILDROOT}%{libdir}/libpng15.so.15
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       libpng = %{thisver}
+               end
+
+               obsoletes
+                       libpng-compat
+               end
+
+               conflicts
+                       libpng <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end
diff --git a/compat-mpfr/compat-mpfr.nm b/compat-mpfr/compat-mpfr.nm
new file mode 100644 (file)
index 0000000..d9cfbb6
--- /dev/null
@@ -0,0 +1,69 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-mpfr
+version    = 2.4.2
+release    = 1
+
+thisapp    = mpfr-%{version}
+
+groups     = System/Libraries
+url        = http://www.mpfr.org/
+license    = LGPLv2+ and GPLv2+ and GFDL
+summary    = A C library for multiple-precision floating-point computations.
+
+description
+       The MPFR library is a C library for multiple-precision floating-point
+       computations with correct rounding. The MPFR is efficient and
+       also has a well-defined semantics. It copies the good ideas from the
+       ANSI/IEEE-754 standard for double-precision floating-point arithmetic
+       (53-bit mantissa). MPFR is based on the GMP multiple-precision
+       library.
+end
+
+source_dl  = http://ftp.gnu.org/gnu/mpfr/
+
+build
+       requires
+               gmp-devel >= 4.3.2
+               gmp-devel < 6.0.0
+       end
+
+       configure_options += \
+               --enable-thread-safe \
+               --disable-assert
+
+       test
+               export LD_LIBRARY_PATH=$(pwd)/.libs
+               make check
+       end
+
+       install
+               # Only install libraries.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}
+               ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       mpfr = %{thisver}
+               end
+
+               obsoletes
+                       mpfr-compat
+               end
+
+               conflicts
+                       mpfr <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end
diff --git a/compat-pcre/compat-pcre.nm b/compat-pcre/compat-pcre.nm
new file mode 100644 (file)
index 0000000..5251971
--- /dev/null
@@ -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
index 688151fefa49d0236882804dd3ccfcf052c80b6a..50c44f26626f13a68e839689f920b83a24e1e849 100644 (file)
@@ -5,9 +5,7 @@
 
 name       = libpng
 version    = 1.6.10
-release    = 1
-
-compat_ver = 1.5.17
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.libpng.org/pub/png/
@@ -25,35 +23,11 @@ end
 source_dl  = http://downloads.sourceforge.net/project/libpng/libpng16/%{version}/
 source_dl += http://downloads.sourceforge.net/project/libpng/history/libpng16/%{version}/
 
-# Source URL for comat package.
-source_dl +=  http://downloads.sourceforge.net/project/libpng/libpng15/%{compat_ver}/
-source_dl +=  http://downloads.sourceforge.net/project/libpng/history/libpng15/%{compat_ver}/
-
-sources    = %{thisapp}.tar.xz
-
-# File for compat package.
-sources   += %{name}-%{compat_ver}.tar.xz
-
 build
        requires
                pkg-config
                zlib-devel
        end
-
-       # Build compat package.
-       build_cmds
-               cd %{DIR_SRC}/%{name}-%{compat_ver}
-               ./configure %{configure_options}
-
-               make %{PARALLELISMFLAGS}
-       end
-
-       # Install compat package.
-       install_cmds
-               cd %{DIR_SRC}/%{name}-%{compat_ver}
-               install -m 755 .libs/libpng15.so.15.17.0 %{BUILDROOT}%{libdir}
-               ln -svf libpng15.so.15.17.0 %{BUILDROOT}%{libdir}/libpng15.so.15
-       end
 end
 
 packages
@@ -65,14 +39,6 @@ packages
                requires = zlib-devel
        end
 
-       package %{name}-compat
-               summary = Compat libraries of %{thisapp}.
-
-               files
-                       %{libdir}/%{name}15.so*
-               end
-       end
-
        package %{name}-debuginfo
                template DEBUGINFO
        end
index 0615b74b04337e97856f1adc0a494884f953d826..981bd8f13908636698e44b8ac8d875e3048981e7 100644 (file)
@@ -4,10 +4,8 @@
 ###############################################################################
 
 name       = mpfr
-version    = 3.1.0
-release    = 2
-
-compat_version = 2.4.2
+version    = 3.1.2
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.mpfr.org/
@@ -24,41 +22,20 @@ description
 end
 
 source_dl  = http://mpfr.loria.fr/mpfr-%{version}/
-sources   += %{name}-%{compat_version}.tar.bz2
 
 build
        requires
-               gmp-devel>=4.3.2
+               gmp-devel >= 4.3.2
        end
 
        configure_options += \
                --enable-thread-safe \
                --disable-assert
 
-       build_cmds
-
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               ./configure \
-                       %{configure_options}
-
-               export LD_LIBRARY_PATH=$(pwd)/.libs
-               make %{PARALLELISMFLAGS}
-       end
-
        test
-               export LD_LIBRARY_PATH=$(pwd)/.libs
-               make check
-
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               export LD_LIBRARY_PATH=$(pwd)/.libs
+               export LD_LIBRARY_PATH=$(pwd)/src/.libs
                make check
        end
-
-       install_cmds
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}
-               ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1
-       end
 end
 
 packages
@@ -68,14 +45,6 @@ packages
                template DEVEL
        end
 
-       package %{name}-compat
-               summary = Compat libraries of %{thisapp}.
-
-               files
-                       %{libdir}/libmpfr.so.1*
-               end
-       end
-
        package %{name}-debuginfo
                template DEBUGINFO
        end
index a9cc86c3806f90910bc4575c2fac42e09fd379fb..112df6aeaeddf46793abf8b42138a591238693c5 100644 (file)
@@ -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
index e64071f710c94ebe7950047aac336a616d8e7504..cef02e58db6c391adbe47a8e2fa24a7d541b6e97 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = sudo
-version    = 1.8.5
+version    = 1.8.10
 release    = 1
 
 groups     = Applications/System