Merge remote-tracking branch 'stevee/docbook-dtds'

diff --git a/curl/curl.nm b/curl/curl.nm
index b171ecf2d19514dd28cf7fcb025949569e058e5f..a35ff76939fe12a539cdf2b5d0703868d19fcabc 100644 (file)
--- a/curl/curl.nm
+++ b/curl/curl.nm
@@ -5,7 +5,7 @@
 
 name       = curl
 version    = 7.24.0
-release    = 1
+release    = 2
 
 groups     = Application/Internet
 url        = http://www.curl.haxx.se/
@@ -29,10 +29,10 @@ build
                groff
                libidn-devel
                libssh2-devel
-               libtool
+               libtool-devel
+               net-tools
                nss-devel
                openldap-devel
-               pkg-config
                zlib-devel
        end
 
@@ -53,9 +53,12 @@ build
                autoreconf -vfi
        end
 
-       test
-               make check
-       end
+       # The testsuite runs services which bind to ports and
+       # sends queries to the internet. This may fail in some
+       # occasions.
+       #test
+       #       make check
+       #end
 end
 
 packages

diff --git a/curl/patches/curl-7.21.2-debug.patch b/curl/patches/curl-7.21.2-debug.patch
new file mode 100644 (file)
index 0000000..7691826
--- /dev/null
+++ b/curl/patches/curl-7.21.2-debug.patch
@@ -0,0 +1,58 @@
+ configure            |   15 ++++-----------
+ m4/curl-compilers.m4 |   15 ++++-----------
+ 2 files changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index d3ecf69..6d8f085 100755
+--- a/configure
++++ b/configure
+@@ -15040,18 +15040,11 @@ $as_echo "yes" >&6; }
+     gccvhi=`echo $gccver | cut -d . -f1`
+     gccvlo=`echo $gccver | cut -d . -f2`
+     compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
+-    flags_dbg_all="-g -g0 -g1 -g2 -g3"
+-    flags_dbg_all="$flags_dbg_all -ggdb"
+-    flags_dbg_all="$flags_dbg_all -gstabs"
+-    flags_dbg_all="$flags_dbg_all -gstabs+"
+-    flags_dbg_all="$flags_dbg_all -gcoff"
+-    flags_dbg_all="$flags_dbg_all -gxcoff"
+-    flags_dbg_all="$flags_dbg_all -gdwarf-2"
+-    flags_dbg_all="$flags_dbg_all -gvms"
++    flags_dbg_all=""
+     flags_dbg_yes="-g"
+-    flags_dbg_off="-g0"
+-    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
+-    flags_opt_yes="-O2"
++    flags_dbg_off=""
++    flags_opt_all=""
++    flags_opt_yes=""
+     flags_opt_off="-O0"
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
+index 1ea4d17..868d65a 100644
+--- a/m4/curl-compilers.m4
++++ b/m4/curl-compilers.m4
+@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
+     gccvhi=`echo $gccver | cut -d . -f1`
+     gccvlo=`echo $gccver | cut -d . -f2`
+     compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
+-    flags_dbg_all="-g -g0 -g1 -g2 -g3"
+-    flags_dbg_all="$flags_dbg_all -ggdb"
+-    flags_dbg_all="$flags_dbg_all -gstabs"
+-    flags_dbg_all="$flags_dbg_all -gstabs+"
+-    flags_dbg_all="$flags_dbg_all -gcoff"
+-    flags_dbg_all="$flags_dbg_all -gxcoff"
+-    flags_dbg_all="$flags_dbg_all -gdwarf-2"
+-    flags_dbg_all="$flags_dbg_all -gvms"
++    flags_dbg_all=""
+     flags_dbg_yes="-g"
+-    flags_dbg_off="-g0"
+-    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
+-    flags_opt_yes="-O2"
++    flags_dbg_off=""
++    flags_opt_all=""
++    flags_opt_yes=""
+     flags_opt_off="-O0"
+   else
+     AC_MSG_RESULT([no])

diff --git a/expect/expect.nm b/expect/expect.nm
index 59b4871e36cfb0295bbe26beb73a693fe5b4e497..0c098a379e21e01a0bfd23e6e94997d5fd683fd2 100644 (file)
--- a/expect/expect.nm
+++ b/expect/expect.nm
@@ -5,7 +5,7 @@
 
 name       = expect
 version    = 5.45
-release    = 1
+release    = 2
 thisapp    = %{name}%{version}
 
 groups     = Development/Languages
@@ -26,6 +26,7 @@ build
        requires
                autoconf
                automake
+               chrpath
                tcl-devel
        end
 
@@ -48,6 +49,15 @@ build
        end
 
        install_cmds
+               # Install lib to right location.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               mv -v %{BUILDROOT}/%{libdir}/tcl*/expect%{version}/libexpect%{version}.so \
+                       %{BUILDROOT}%{libdir}
+               ln -svf libexpect%{version}.so %{BUILDROOT}%{libdir}/libexpect.so
+
+               # Remove rpath.
+               chrpath --delete %{BUILDROOT}%{libdir}/libexpect%{version}.so
+
                # remove cryptdir/decryptdir, as Linux has no crypt command
                rm -f %{BUILDROOT}/usr/bin/{cryptdir,decryptdir}
                rm -f %{BUILDROOT}/usr/share/man1/{cryptdir,decryptdir}.1*

diff --git a/gdb/gdb.nm b/gdb/gdb.nm
index 8ad9a5a3603387a8381522e3312fd7e6289266e8..00ad49183033df29059743943ca303d9529d5a08 100644 (file)
--- a/gdb/gdb.nm
+++ b/gdb/gdb.nm
@@ -5,7 +5,7 @@
 
 name       = gdb
 version    = 7.3.50.20110722
-release    = 1
+release    = 2
 
 groups     = Development/Debuggers
 url        = http://gnu.org/software/gdb/
@@ -69,6 +69,9 @@ build
 
                mkdir -pv %{BUILDROOT}/etc/gdbinit.d
                cp -vf %{DIR_SOURCE}/gdbinit %{BUILDROOT}/etc/gdbinit
+
+               # Remove locale data which is provided by binutils.
+               rm -rf %{BUILDROOT}%{datadir}/locale/
        end
 end
 

diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index 2b2912ea67925f8919ca70d3f2d03ea7a69a41f1..e7d8d6e4666dedc32d684567e6bd7522bb2397a0 100644 (file)
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = gnutls
-version    = 3.0.9
+version    = 3.0.13
 release    = 1
 
 groups     = System/Libraries
@@ -25,9 +25,9 @@ sources    = %{thisapp}.tar.xz
 build
        requires
                libtasn1-devel
-               nettle-devel>=2.4
+               nettle-devel >= 2.4
                perl
-               p11-kit-devel>=0.4
+               p11-kit-devel >= 0.4
                zlib-devel
        end
 
@@ -36,9 +36,11 @@ build
 
        configure_options += \
                --with-included-libcfg \
-               --disable-srp-authentication
+               --disable-srp-authentication \
+               --disable-openssl-compatibility
 
        test
+               export LD_LIBRARY_PATH=$(pwd)/lib/.libs
                make check
        end
 end
@@ -46,8 +48,8 @@ end
 packages
        package %{name}
                requires
-                       nettle>=2.4
-                       p11-kit>=0.4
+                       nettle >= 2.4
+                       p11-kit >= 0.4
                end
        end
 

diff --git a/libaio/libaio.nm b/libaio/libaio.nm
index ae5f96b6a7f69d51a37fc5c99b29fb3ec7721d56..a50f87dbff0fe6449bde2fe9e8d9cb52712da3b4 100644 (file)
--- a/libaio/libaio.nm
+++ b/libaio/libaio.nm
@@ -5,7 +5,7 @@
 
 name       = libaio
 version    = 0.3.109
-release    = 2
+release    = 3
 
 groups     = System/Libraries
 url        = ftp://ftp.kernel.org/pub/linux/libs/aio/
@@ -34,7 +34,7 @@ build
                        CFLAGS="%{CFLAGS} -I. -fPIC" CC="gcc"
        end
 
-       make_install_targets += prefix=/ libdir=%{libdir} usrlibdir=%{libdir}
+       make_install_targets += prefix=%{prefix} libdir=%{libdir} usrlibdir=%{libdir}
 
        install_cmds
                # Modify links to be relative

diff --git a/open-vm-tools/open-vm-tools.nm b/open-vm-tools/open-vm-tools.nm
index cc483b24f0a5dcabe05244821a8ca8f8733428b6..644452eeb0d8d8cdcd3f5fa94ea19a12bc419f8d 100644 (file)
--- a/open-vm-tools/open-vm-tools.nm
+++ b/open-vm-tools/open-vm-tools.nm
@@ -5,7 +5,8 @@
 
 name       = open-vm-tools
 version    = 2011.09.23-491607
-release    = 1
+release    = 2
+sup_arches = x86_64 i686
 
 groups     = Virtualization/Applications
 url        = http://open-vm-tools.sourceforge.net/
@@ -48,7 +49,6 @@ end
 
 packages
        package %{name}
-       end
 
        package %{name}-debuginfo
                template DEBUGINFO

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 8292df0647959927ba7da3fba10d16c14456c75c..8490682718db6cab98385b53a010f4874c1e01c6 100644 (file)
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.19
+version    = 0.9.20
 release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -33,7 +33,8 @@ build
        end
 
        # libgomp was broken in earlier releases.
-       requires += gcc>=4.6.2-4, beecrypt>=4.2.1-2
+       requires += gcc >= 4.6.2-4
+       requires += beecrypt >= 4.2.1-2
 
        CFLAGS += -fno-strict-aliasing
 
@@ -48,7 +49,7 @@ packages
        package %{name}
                groups += Base
 
-               requires = pakfire-common=%{thisver}
+               requires = pakfire-common = %{thisver}
        end
 
        package %{name}-common
@@ -73,14 +74,13 @@ packages
                groups += Build
 
                requires
-                       %{name}=%{thisver}
-                       quality-agent=%{thisver}
-
+                       %{name} = %{thisver}
+                       quality-agent = %{thisver}
                        cpio
                        elfutils
                end
-               provides = pakfire-build=%{thisver}
-               obsoletes = pakfire-build<%{thisver}
+               provides = pakfire-build = %{thisver}
+               obsoletes = pakfire-build < %{thisver}
                conflicts = build-essentials
 
                files
@@ -108,9 +108,13 @@ packages
                end
 
                requires
+                       gawk
                        binutils
+                       coreutils
+                       findutils
                        file
                        grep
+                       sed
                end
        end
 

diff --git a/pakfire/patches/pakfire-0.9.20-change-default-hub-to-pakfirehub.ipfire.org.patch b/pakfire/patches/pakfire-0.9.20-change-default-hub-to-pakfirehub.ipfire.org.patch
new file mode 100644 (file)
index 0000000..dce9bfd
--- /dev/null
+++ b/pakfire/patches/pakfire-0.9.20-change-default-hub-to-pakfirehub.ipfire.org.patch
@@ -0,0 +1,91 @@
+From 0f8823593c2c815b3dc2c7c9cb74b4d7a6b218de Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Wed, 29 Feb 2012 12:29:07 +0100
+Subject: [PATCH] Change default hub to pakfirehub.ipfire.org.
+
+---
+ examples/client.conf          |    2 +-
+ examples/daemon.conf          |    2 +-
+ python/pakfire/client/base.py |    2 +-
+ python/pakfire/config.py      |    4 ++--
+ python/pakfire/constants.py   |    3 +++
+ 5 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/examples/client.conf b/examples/client.conf
+index da57d03..6c59de9 100644
+--- a/examples/client.conf
++++ b/examples/client.conf
+@@ -3,7 +3,7 @@
+ [client]
+ 
+ # The URL of the server to connect to.
+-# server = https://pakfire.ipfire.org/
++# server = https://pakfirehub.ipfire.org/
+ 
+ # Your credentials to log in on the hub.
+ # username = ipfire
+diff --git a/examples/daemon.conf b/examples/daemon.conf
+index 525cc1f..143a7f6 100644
+--- a/examples/daemon.conf
++++ b/examples/daemon.conf
+@@ -3,7 +3,7 @@
+ [daemon]
+ 
+ # The URL of the server to connect to.
+-# server = https://pakfire.ipfire.org/
++# server = https://pakfirehub.ipfire.org/
+ 
+ # The hostname of this machine.
+ # hostname = <automatically detected>
+diff --git a/python/pakfire/client/base.py b/python/pakfire/client/base.py
+index 1886e2b..3ac4bef 100644
+--- a/python/pakfire/client/base.py
++++ b/python/pakfire/client/base.py
+@@ -51,7 +51,7 @@ class PakfireClient(object):
+                       ret += "%s:%s@" % (username, password)
+ 
+               # Add host and path components.
+-              ret += "%s/pakfirehub/%s" % (url.netloc, self.type)
++              ret += "/".join((url.netloc, self.type))
+ 
+               return ret
+ 
+diff --git a/python/pakfire/config.py b/python/pakfire/config.py
+index c7ab143..0d32784 100644
+--- a/python/pakfire/config.py
++++ b/python/pakfire/config.py
+@@ -237,7 +237,7 @@ class ConfigClient(_Config):
+               "client" : {
+                       # The default server is the official Pakfire
+                       # server.
+-                      "server"   : "https://pakfire.ipfire.org",
++                      "server"   : PAKFIRE_HUB,
+               },
+       }
+ 
+@@ -249,7 +249,7 @@ class ConfigDaemon(_Config):
+               "daemon" : {
+                       # The default server is the official Pakfire
+                       # server.
+-                      "server"   : "https://pakfire.ipfire.org",
++                      "server"   : PAKFIRE_HUB,
+ 
+                       # The default hostname is the host name of this
+                       # machine.
+diff --git a/python/pakfire/constants.py b/python/pakfire/constants.py
+index 2998ab7..2c091e4 100644
+--- a/python/pakfire/constants.py
++++ b/python/pakfire/constants.py
+@@ -27,6 +27,9 @@ from __version__ import PAKFIRE_VERSION
+ 
+ PAKFIRE_LEAST_COMPATIBLE_VERSION = PAKFIRE_VERSION
+ 
++# The default hub to connect to.
++PAKFIRE_HUB = "https://pakfirehub.ipfire.org/"
++
+ SYSCONFDIR = "/etc"
+ SCRIPT_DIR = "/usr/lib/pakfire"
+ 
+-- 
+1.7.3.4
+

diff --git a/pakfire/patches/pakfire-0.9.20-update-repositories-only-when-are-actually-enabled.patch b/pakfire/patches/pakfire-0.9.20-update-repositories-only-when-are-actually-enabled.patch
new file mode 100644 (file)
index 0000000..e8f4132
--- /dev/null
+++ b/pakfire/patches/pakfire-0.9.20-update-repositories-only-when-are-actually-enabled.patch
@@ -0,0 +1,63 @@
+From 8fe602a7c5b3de4c4531d05c0dc1cf4d6bb9fb06 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Wed, 29 Feb 2012 11:10:33 +0100
+Subject: [PATCH] Update repositories only when they are actually enabled.
+
+---
+ python/pakfire/cli.py                 |    8 +++++++-
+ python/pakfire/repository/__init__.py |    4 ++++
+ python/pakfire/repository/base.py     |    3 ++-
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/python/pakfire/cli.py b/python/pakfire/cli.py
+index 8bab886..7a94900 100644
+--- a/python/pakfire/cli.py
++++ b/python/pakfire/cli.py
+@@ -768,8 +768,14 @@ class CliBuilderIntern(Cli):
+ 
+               conf = config.ConfigBuilder()
+ 
++              if self.args.nodeps:
++                      disable_repos = ["*"]
++              else:
++                      disable_repos = None
++
+               pakfire._build(pkg, builder_mode=self.args.mode, config=conf,
+-                      arch=self.args.arch, resultdir=self.args.resultdir)
++                      disable_repos=disable_repos, arch=self.args.arch,
++                      resultdir=self.args.resultdir)
+ 
+ 
+ class CliClient(Cli):
+diff --git a/python/pakfire/repository/__init__.py b/python/pakfire/repository/__init__.py
+index f6b2f6e..39872da 100644
+--- a/python/pakfire/repository/__init__.py
++++ b/python/pakfire/repository/__init__.py
+@@ -68,6 +68,10 @@ class Repositories(object):
+ 
+               # Disable all repositories here as demanded on commandline
+               if disable_repos:
++                      # * is magic to disable all repositories.
++                      if "*" in disable_repos:
++                              disable_repos = [r.name for r in self]
++
+                       for repo in disable_repos:
+                               self.disable_repo(repo)
+ 
+diff --git a/python/pakfire/repository/base.py b/python/pakfire/repository/base.py
+index 7fb8362..59d8615 100644
+--- a/python/pakfire/repository/base.py
++++ b/python/pakfire/repository/base.py
+@@ -115,7 +115,8 @@ class RepositoryFactory(object):
+               """
+               assert self.index
+ 
+-              self.index.update(force, offline=offline)
++              if force or self.enabled:
++                      self.index.update(force, offline=offline)
+ 
+       def clean(self):
+               """
+-- 
+1.7.3.4
+

diff --git a/pcre/pcre.nm b/pcre/pcre.nm
index 1875f29260b4db016d88d828498f465fcb7739b4..9615bb355c7ed194a4300b55cec38bf5909824a8 100644 (file)
--- a/pcre/pcre.nm
+++ b/pcre/pcre.nm
@@ -4,8 +4,10 @@
 ###############################################################################
 
 name       = pcre
-version    = 8.21
-release    = 2
+version    = 8.30
+release    = 1
+
+compat_version = 8.21
 
 groups     = System/Libraries
 url        = http://www.pcre.org/
@@ -19,12 +21,12 @@ description
 end
 
 source_dl  = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+sources   += %{name}-%{compat_version}.tar.gz
 
 build
        requires
                bzip2-devel
                gcc-c++
-               pkg-config
                readline-devel
                zlib-devel
        end
@@ -33,14 +35,23 @@ build
                --disable-static \
                --docdir=/usr/share/doc/pcre-%{version} \
                --enable-utf8 \
+               --enable-jit \
                --enable-pcregrep-libz \
                --enable-pcregrep-libbz2 \
                --enable-unicode-properties
 
+       build_cmds
+               cd %{DIR_SRC}/%{name}-%{compat_version}
+               ./configure \
+                       %{configure_options}
+
+               make %{PARALLELISMFLAGS}
+       end
+
        install_cmds
-               mkdir -pv %{BUILDROOT}/{,usr/}%{lib}
-               mv -v %{BUILDROOT}%{libdir}/libpcre.so.* %{BUILDROOT}/%{lib}
-               ln -v -sf ../../%{lib}/libpcre.so.0 %{BUILDROOT}%{libdir}/libpcre.so
+               cd %{DIR_SRC}/%{name}-%{compat_version}
+               install -m 644 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir}
+               ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libprce.so.0
        end
 end
 
@@ -51,6 +62,14 @@ 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

diff --git a/ppl/ppl.nm b/ppl/ppl.nm
index f4372b0fe2d3b15915f4a93de64028da18afcdd6..09b6fe114bed1650b3162bc96af14e586312a695 100644 (file)
--- a/ppl/ppl.nm
+++ b/ppl/ppl.nm
@@ -5,7 +5,7 @@
 
 name       = ppl
 version    = 0.11.2
-release    = 2
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Libraries
@@ -32,8 +32,6 @@ sources    = %{thisapp}.tar.lzma
 
 build
        requires
-               autoconf
-               automake
                gcc-c++
                gmp-devel
                m4
@@ -45,10 +43,6 @@ build
 
        PARALLELISMFLAGS =
 
-       prepare_cmds
-               cd %{DIR_APP} && autoreconf -f
-       end
-
        test
                make check
        end

diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index 8930a9278a07df7e75629851b65754607bf9bf85..f82be752cbeb001ff02e9b9cf618cdbc67ad5bae 100644 (file)
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -5,7 +5,7 @@
 
 name       = ppp
 version    = 2.4.5
-release    = 2
+release    = 3
 
 groups     = System/Daemons
 url        = ftp://ftp.samba.org/pub/ppp/
@@ -30,6 +30,9 @@ build
                pam-devel
        end
 
+       # Explicitely add -fPIC to CFLAGS.
+       CFLAGS += -fPIC
+
        prepare_cmds
                sed -e "s@^RUNDIR .*@RUNDIR = /var/run/ppp@" \
                        -e "s@^LOGDIR .*@LOGDIR = /var/log/ppp@" \
@@ -60,7 +63,6 @@ end
 
 packages
        package %{name}
-       end
 
        package %{name}-devel
                template DEVEL

diff --git a/python-pyblock/python-pyblock.nm b/python-pyblock/python-pyblock.nm
index 8f191725d7251a634be1e4c91c778baee414194b..740045324a9f21c24c17d6d220754791bf73556d 100644 (file)
--- a/python-pyblock/python-pyblock.nm
+++ b/python-pyblock/python-pyblock.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = pyblock
+name       = python-pyblock
 version    = 0.46
-release    = 2
+release    = 3
+thisapp    = pyblock-%{version}
 
 groups     = System/Libraries
 url        = http://git.fedorahosted.org/git/?p=pyblock.git;a=summary
@@ -21,7 +22,7 @@ sources    = %{thisapp}.tar.bz2
 
 build
        requires
-               dmraid-devel>=1.0.0.rc15-2
+               dmraid-devel >= 1.0.0.rc15-2
                libdevmapper-devel
                libselinux-devel
                python-devel
@@ -42,7 +43,7 @@ build
 end
 
 packages
-       package python-%{name}
+       package %{name}
 
        package %{name}-debuginfo
                template DEBUGINFO

diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm
index 1f2aef3d904e26a23b5fde84a0f3e8b1624f0ac2..70ceb9499b79fbd6108aa8439ef87236c34c7471 100644 (file)
--- a/rsyslog/rsyslog.nm
+++ b/rsyslog/rsyslog.nm
@@ -5,7 +5,7 @@
 
 name       = rsyslog
 version    = 5.8.6
-release    = 2
+release    = 3
 
 groups     = System/Daemons
 url        = http://www.rsyslog.com/
@@ -35,8 +35,6 @@ build
                -DSYSLOGD_PIDNAME=\"syslogd.pid\"
 
        configure_options += \
-               --exec-prefix= \
-               --libdir=/lib \
                --with-systemdsystemunitdir=/lib/systemd/system \
                --disable-static \
                --disable-testbench \

diff --git a/sg3-utils/sg3-utils.nm b/sg3-utils/sg3-utils.nm
index 07ec394ffd648c0937d1da0c072a97288579ed78..ff554d2d47c255d77b8cc902612792bb0d104795 100644 (file)
--- a/sg3-utils/sg3-utils.nm
+++ b/sg3-utils/sg3-utils.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = sg3_utils
+name       = sg3-utils
 version    = 1.32
-release    = 1
+release    = 2
+thisapp    = sg3_utils-%{version}
 
 groups     = Applications/System
 url        = http://sg.danny.cz/sg/sg3_utils.html

diff --git a/tar/tar.nm b/tar/tar.nm
index 9287bf279f373ee9769ef507727010f6a8633eb9..3cce8df68da7a00da38402f3b7a47fa6886c13c7 100644 (file)
--- a/tar/tar.nm
+++ b/tar/tar.nm
@@ -5,7 +5,7 @@
 
 name       = tar
 version    = 1.26
-release    = 2
+release    = 3
 
 groups     = System/Packaging
 url        = http://www.gnu.org/software/tar/
@@ -32,6 +32,7 @@ build
                autoconf
                automake
                gettext
+               gettext-devel
                libacl-devel
                libattr-devel
                libselinux-devel

diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm
index d491340aab2491b2b178faa1ab9bbc606461eaf2..2a81d25af078324133817cf2838358e9e9d01112 100644 (file)
--- a/tcpdump/tcpdump.nm
+++ b/tcpdump/tcpdump.nm
@@ -5,7 +5,7 @@
 
 name       = tcpdump
 version    = 4.1.1
-release    = 1
+release    = 2
 
 groups     = Networking/Sniffer
 url        = http://www.tcpdump.org/
@@ -25,6 +25,7 @@ CFLAGS    += -fno-strict-aliasing
 
 build
        requires
+               chrpath
                libpcap-devel
                openssl-devel
        end
@@ -32,11 +33,18 @@ build
        configure_options += \
                --with-crypto \
                --without-smi
+
+       install_cmds
+               # Remove duplicated binary.
+               rm -vf %{BUILDROOT}%{sbindir}/tcpdump.%{version}
+
+               # Remove RPATH.
+               chrpath --delete %{BUILDROOT}%{sbindir}/tcpdump
+       end
 end
 
 packages
        package %{name}
-       end
 
        package %{name}-debuginfo
                template DEBUGINFO

diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm
index fd1a7899d1b8e10bf569d30c2f8809c1cc3f3ec1..f583b3fd729ddc46715f74cf8bf20215b7777a70 100644 (file)
--- a/ulogd2/ulogd2.nm
+++ b/ulogd2/ulogd2.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = ulogd
+name       = ulogd2
 version    = 2.0.0beta3
-release    = 2
+release    = 3
+thisapp    = ulogd-%{version}
 
 groups     = Networking/Statistics
 url        = http://netfilter.org/projects/ulogd/index.html
@@ -29,7 +30,6 @@ build
                libnetfilter_conntrack-devel
                libnetfilter_log-devel
                libpcap-devel
-               pkg-config
                sqlite-devel
        end
 
@@ -47,7 +47,6 @@ end
 
 packages
        package %{name}
-       end
 
        package %{name}-debuginfo
                template DEBUGINFO

diff --git a/ustr/ustr.nm b/ustr/ustr.nm
index a8e8eb917f8fea716388c5c33e88e318e6099ea7..be7d74132125c15dfc672236a12c33c2d438cf58 100644 (file)
--- a/ustr/ustr.nm
+++ b/ustr/ustr.nm
@@ -5,7 +5,7 @@
 
 name       = ustr
 version    = 1.0.4
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.and.org/ustr/
@@ -28,27 +28,23 @@ build
                make check
        end
 
+       make_install_targets += libdir=%{libdir}
+
        install_cmds
                rm -rf %{BUILDROOT}/usr/share
-               rm -rf %{BUILDROOT}/usr/lib/pkgconfig/*debug*
+               rm -rf %{BUILDROOT}/usr/lib*/pkgconfig/*debug*
                rm -rf %{BUILDROOT}/lib/*debug*
-               rm -rf %{BUILDROOT}/usr/lib/*debug*
+               rm -rf %{BUILDROOT}/usr/lib*/*debug*
        end
 end
 
 packages
        package %{name}
-       end
 
        package %{name}-devel
                template DEVEL
 
-               files
-                       /usr/bin/
-                       /usr/include/
-                       /usr/lib/pkgconfig/
-                       */lib/*.so
-               end
+               files += %{bindir}
        end
 
        package %{name}-debuginfo

diff --git a/xorg-x11-xinit/xorg-x11-xinit.nm b/xorg-x11-xinit/xorg-x11-xinit.nm
index cd8243624662b72995bfd879689bed6a57041b16..c9991fb8bf57193ada3f0e60fe432e54dd73a6ae 100644 (file)
--- a/xorg-x11-xinit/xorg-x11-xinit.nm
+++ b/xorg-x11-xinit/xorg-x11-xinit.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = xinit
+name       = xorg-x11-xinit
 version    = 1.2.1
 release    = 1
+thisapp    = xinit-%{version}
 
 groups     = X/Server
 url        = http://www.x.org
@@ -20,10 +21,8 @@ source_dl = http://ftp.x.org/pub/individual/app/
 
 build
        requires
-               autoconf
-               automake
                libX11-devel
-               pkg-config
+               xorg-x11-util-macros
        end
 end