[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 72da3f6fe3508b862ed736df06b8e8744aa3e21c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 72da3f6fe3508b862ed736df06b8e8744aa3e21c (commit) via f4606291270def8427ef4234d838e09522ba9c7a (commit) via 2a0484c1780cc275b5aa8a8dfe5f627d4384f6b1 (commit) via e17ce45dfe8e902ad5ee227d481bc4724d15872a (commit) via 5e37e90afea4232ea5608ecc0f74575c8bda6301 (commit) via 2d32bcaede2de997264bdb6fef4eebae8a3d9ef3 (commit) via 2a0a80a7c3c8b4166851fd5aca8475809df6084f (commit) via 62647d977f0cf24a8f1dd8568ca4c0d8ac70a0ad (commit) via bd7445e215764710992fbd56dea9548782613fd6 (commit) via 7d18176c6e5e3fd9f32064cc84cd75d515cd7c19 (commit) via c8784213d22e7ae9c727791e1cb521548e5f82d5 (commit) via b12a6a5ee2bbbe57075dd3a6c36a182f24192a2f (commit) via 73f2d0bad7543599f5352a05b9966791494d4c3d (commit) via d00c75b1e0227f4f0bfe53f698a00ba262c34fea (commit) via 65c369eddda9126d3ec6d74c1ea1d9ec4fdd52dc (commit) via 848ea2774e78455be611d2dffa384c03b39d5c0b (commit) via c1646d961330acce97cda88ecc9986a21534ba02 (commit) via b90bd413dbcf896f269975ef74d68561e402bb11 (commit) via 98583dbefe1b0ceb4cb1ec348fa71d0af769a0f4 (commit) via bdaf02e849c3b617fd82c15dfc599e38585e7358 (commit) via bd08ec1d43a94da488384d47cbe951d054cc327f (commit) via b2a21beb1b3d5fbba9b71968441b5ed4a9ec65d1 (commit) via 3b8d10224c43648b3eee4aa09837040cab47bead (commit) via 7c1b882b95c5cec710bc5d9bfb054dfa5390c34c (commit) via edab1dd3084bf711127a6952f1c1dd08d82662af (commit) via 78ba4fe172ca5397ea40164b64a68b47f6facf6f (commit) via 8561837296389840394306f263435095a017ad2e (commit) via 4cc6d616d29491bdab935b8843684843d22f88a6 (commit) via 89e703f2053ddefebcc7ef050044740082f41978 (commit) via d9a3f5c74f962308a99edbeb31be1f729bc6e6df (commit) via 85271ff7a70ca8104d97110c8a7fad0a6aa702cb (commit) via 2947c340450715296907500552d4b328337e700b (commit) via 173c1afd61761e87eea00c12b1bd5113f388ef2e (commit) via 1120d04beec2d002a0d47919a7191350dc895fe9 (commit) via cb01e61b8e314603dfb9f6e18f07d7d31562e9a6 (commit) via dc3a4d27ccecd1ad442e840b4c7d9c8de15d5562 (commit) via 1438baade5a838fc826e0eba8978d264006b48da (commit) via a69a869544ba8f38859876d6c2dfb6fe47089eef (commit) via 1589b4373b8179e65fdaf1c78ef62c40ac5df84d (commit) via 8e31124c1bc9a6b25dd680b09fffbf672d9464f5 (commit) via 3176ff320918aaa9df2fcebb5426205c71c3d046 (commit) via ecb2f3fa58458b6928fa5ac81bab1d43cfccdf74 (commit) via b6a81e1b1e30e16aaa705f287485e54a40515ab8 (commit) via 9c88cf42d02128c31bd89a2abff24ccfd61d092d (commit) via 8ed466cd9b18441c3dd4d0e0708dab19975778e1 (commit) via 71e6a8efcef33b5b77310e1d02c7ea2fffb987a6 (commit) from 145ccddb6082cc5ff9e37a911e37b6b4706f0af0 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 72da3f6fe3508b862ed736df06b8e8744aa3e21c Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:02:14 2012 +0100
Revert "ghostscript: Make package work on x86_64."
This reverts commit 78ba4fe172ca5397ea40164b64a68b47f6facf6f.
commit f4606291270def8427ef4234d838e09522ba9c7a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:49 2012 +0100
xfsprogs: Make package work on x86_64.
commit 2a0484c1780cc275b5aa8a8dfe5f627d4384f6b1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:49 2012 +0100
util-linux: Make package work on x86_64.
commit e17ce45dfe8e902ad5ee227d481bc4724d15872a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:49 2012 +0100
usbutils: Make package work on x86_64.
commit 5e37e90afea4232ea5608ecc0f74575c8bda6301 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:48 2012 +0100
udev: Make package work on x86_64.
commit 2d32bcaede2de997264bdb6fef4eebae8a3d9ef3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:48 2012 +0100
systemd: Make package work on x86_64.
commit 2a0a80a7c3c8b4166851fd5aca8475809df6084f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:44 2012 +0100
pciutils: Make package work on x86_64.
commit 62647d977f0cf24a8f1dd8568ca4c0d8ac70a0ad Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:44 2012 +0100
pam_ldap: Make package work on x86_64.
commit bd7445e215764710992fbd56dea9548782613fd6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:44 2012 +0100
pam: Make package work on x86_64.
commit 7d18176c6e5e3fd9f32064cc84cd75d515cd7c19 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:44 2012 +0100
opensp: Make package work on x86_64.
commit c8784213d22e7ae9c727791e1cb521548e5f82d5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:43 2012 +0100
openldap: Make package work on x86_64.
commit b12a6a5ee2bbbe57075dd3a6c36a182f24192a2f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:43 2012 +0100
openjade: Make package work on x86_64.
commit 73f2d0bad7543599f5352a05b9966791494d4c3d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:43 2012 +0100
nss-util: Make package work on x86_64.
commit d00c75b1e0227f4f0bfe53f698a00ba262c34fea Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:43 2012 +0100
nss-softokn: Make package work on x86_64.
commit 65c369eddda9126d3ec6d74c1ea1d9ec4fdd52dc Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:43 2012 +0100
nss-myhostname: Make package work on x86_64.
commit 848ea2774e78455be611d2dffa384c03b39d5c0b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:43 2012 +0100
nss_ldap: Make package work on x86_64.
commit c1646d961330acce97cda88ecc9986a21534ba02 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:43 2012 +0100
nss: Make package work on x86_64.
commit b90bd413dbcf896f269975ef74d68561e402bb11 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:43 2012 +0100
nspr: Make package work on x86_64.
commit 98583dbefe1b0ceb4cb1ec348fa71d0af769a0f4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:42 2012 +0100
lvm2: Make package work on x86_64.
commit bdaf02e849c3b617fd82c15dfc599e38585e7358 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:40 2012 +0100
libusb-compat: Make package work on x86_64.
commit bd08ec1d43a94da488384d47cbe951d054cc327f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:40 2012 +0100
libnl: Make package work on x86_64.
commit b2a21beb1b3d5fbba9b71968441b5ed4a9ec65d1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:39 2012 +0100
libgpg-error: Make package work on x86_64.
commit 3b8d10224c43648b3eee4aa09837040cab47bead Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:39 2012 +0100
libgcrypt: Make package work on x86_64.
commit 7c1b882b95c5cec710bc5d9bfb054dfa5390c34c Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:38 2012 +0100
libaio: Make package work on x86_64.
commit edab1dd3084bf711127a6952f1c1dd08d82662af Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:36 2012 +0100
git: Make package work on x86_64.
commit 78ba4fe172ca5397ea40164b64a68b47f6facf6f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:36 2012 +0100
ghostscript: Make package work on x86_64.
commit 8561837296389840394306f263435095a017ad2e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:35 2012 +0100
e2fsprogs: Make package work on x86_64.
commit 4cc6d616d29491bdab935b8843684843d22f88a6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:35 2012 +0100
docbook-xsl: Make package work on x86_64.
commit 89e703f2053ddefebcc7ef050044740082f41978 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:35 2012 +0100
docbook-utils: Make package work on x86_64.
commit d9a3f5c74f962308a99edbeb31be1f729bc6e6df Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:35 2012 +0100
docbook-dtds: Make package work on x86_64.
commit 85271ff7a70ca8104d97110c8a7fad0a6aa702cb Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:35 2012 +0100
docbook-dsssl: Make package work on x86_64.
commit 2947c340450715296907500552d4b328337e700b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:35 2012 +0100
dmraid: Make package work on x86_64.
commit 173c1afd61761e87eea00c12b1bd5113f388ef2e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:35 2012 +0100
dbus-glib: Make package work on x86_64.
commit 1120d04beec2d002a0d47919a7191350dc895fe9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:34 2012 +0100
dbus: Make package work on x86_64.
commit cb01e61b8e314603dfb9f6e18f07d7d31562e9a6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:34 2012 +0100
cyrus-sasl: Make package work on x86_64.
commit dc3a4d27ccecd1ad442e840b4c7d9c8de15d5562 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:34 2012 +0100
cryptsetup-luks: Make package work on x86_64.
commit 1438baade5a838fc826e0eba8978d264006b48da Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:33 2012 +0100
bind: Make package work on x86_64.
commit a69a869544ba8f38859876d6c2dfb6fe47089eef Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:01:33 2012 +0100
audit: Make package work on x86_64.
commit 1589b4373b8179e65fdaf1c78ef62c40ac5df84d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 16:00:11 2012 +0100
xorg-x11-xtrans-devel: Fix naming of the package.
commit 8e31124c1bc9a6b25dd680b09fffbf672d9464f5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 15:59:17 2012 +0100
python-dbus: Fix naming of the package.
commit 3176ff320918aaa9df2fcebb5426205c71c3d046 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 15:57:43 2012 +0100
perl: Filter all dependencies to perl-Tk.
commit ecb2f3fa58458b6928fa5ac81bab1d43cfccdf74 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 15:56:37 2012 +0100
perl-Tk: Remove invalid interpreters in scripts.
Contained /usr/local/bin/perl. Weird.
commit b6a81e1b1e30e16aaa705f287485e54a40515ab8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 15:54:52 2012 +0100
libxml2: Update to 2.7.8.
commit 9c88cf42d02128c31bd89a2abff24ccfd61d092d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 15:53:18 2012 +0100
libtiff: Fix various build issues.
commit 8ed466cd9b18441c3dd4d0e0708dab19975778e1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 15:46:19 2012 +0100
libjpeg: Update to 1.1.1.
Fix package naming and installation of missing libs.
commit 71e6a8efcef33b5b77310e1d02c7ea2fffb987a6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 7 15:40:45 2012 +0100
cracklib: Update to 2.8.18.
Rework the whole installation process as the cracklib-format/-packer commands tended to hang forever.
-----------------------------------------------------------------------
Summary of changes: audit/audit.nm | 20 +++-- bind/bind.nm | 18 ++-- cracklib/cracklib.nm | 77 ++++++++++++----- cracklib/patches/cracklib-2.8.12-gettext.patch | 13 +++ cracklib/patches/cracklib-2.8.15-inttypes.patch | 68 ++++++++++++++ cryptsetup-luks/cryptsetup-luks.nm | 13 ++-- cyrus-sasl/cyrus-sasl.nm | 14 ++- dbus-glib/dbus-glib.nm | 12 ++-- dbus/dbus.nm | 22 +++--- dmraid/dmraid.nm | 14 ++-- docbook-dsssl/docbook-dsssl.nm | 7 +- docbook-dtds/docbook-dtds.nm | 8 +- docbook-utils/docbook-utils.nm | 5 +- docbook-xsl/docbook-xsl.nm | 9 +- e2fsprogs/e2fsprogs.nm | 7 +-- ghostscript/ghostscript.nm | 2 +- git/git.nm | 5 +- libaio/libaio.nm | 11 ++- libgcrypt/libgcrypt.nm | 11 +-- libgpg-error/libgpg-error.nm | 11 +-- libjpeg/libjpeg.nm | 17 ++--- libnl/libnl.nm | 13 ++-- libtiff/libtiff.nm | 5 +- libusb-compat/libusb-compat.nm | 28 +++--- libxml2/libxml2.nm | 4 +- lvm2/lvm2.nm | 18 ++-- nspr/nspr.nm | 42 ++++++--- nss-myhostname/nss-myhostname.nm | 10 +- nss-softokn/nss-softokn.nm | 57 +++++++------ nss-util/nss-util.nm | 30 ++++--- nss/nss.nm | 109 +++++++++++------------ nss_ldap/nss_ldap.nm | 15 ++-- openjade/openjade.nm | 11 ++- openldap/openldap.nm | 8 +- opensp/opensp.nm | 3 +- pam/pam.nm | 32 +++---- pam_ldap/pam_ldap.nm | 6 +- pciutils/multilibconfig.h | 9 ++ pciutils/pciutils.nm | 41 +++++++-- perl-Tk/perl-Tk.nm | 6 +- perl/perl.nm | 3 +- python-dbus/python-dbus.nm | 5 +- systemd/systemd.nm | 6 +- udev/udev.nm | 21 ++--- usbutils/usbutils.nm | 5 +- util-linux/util-linux.nm | 20 ++-- xfsprogs/xfsprogs.nm | 22 ++--- xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm | 5 +- 48 files changed, 529 insertions(+), 369 deletions(-) create mode 100644 cracklib/patches/cracklib-2.8.12-gettext.patch create mode 100644 cracklib/patches/cracklib-2.8.15-inttypes.patch create mode 100644 pciutils/multilibconfig.h
Difference in files: diff --git a/audit/audit.nm b/audit/audit.nm index 66017be..239c63f 100644 --- a/audit/audit.nm +++ b/audit/audit.nm @@ -5,7 +5,7 @@
name = audit version = 2.1.3 -release = 7 +release = 8
groups = System/Daemons url = http://people.redhat.com/sgrubb/audit/ @@ -34,7 +34,7 @@ build configure_options += \ --sysconfdir=/etc \ --sbindir=/sbin \ - --libdir=/lib \ + --libdir=/%{lib} \ --without-prelude \ --without-libwrap \ --enable-gssapi-krb5=no \ @@ -44,14 +44,10 @@ build autoreconf -fvi end
- test - make check - end - install_cmds - rm -vf %{BUILDROOT}/lib/libau{dit,parse}.so - ln -svf ../../lib/libaudit.so.1 %{BUILDROOT}/usr/lib/libaudit.so - ln -svf ../../lib/libauparse.so.0 %{BUILDROOT}/usr/lib/libauparse.so + rm -vf %{BUILDROOT}/%{lib}/libau{dit,parse}.so + ln -svf ../../%{lib}/libaudit.so.1 %{BUILDROOT}%{libdir}/libaudit.so + ln -svf ../../%{lib}/libauparse.so.0 %{BUILDROOT}%{libdir}/libauparse.so
mkdir -pv %{BUILDROOT}/usr/sbin/ mv -v %{BUILDROOT}/sbin/audisp*remote %{BUILDROOT}/usr/sbin/ @@ -91,6 +87,12 @@ packages
package %{name}-devel template DEVEL + + # Just require the libs to link + # against them. + requires + %{name}-libs = %{thisver} + end end
package python-%{name} diff --git a/bind/bind.nm b/bind/bind.nm index 8563b7c..484c5e0 100644 --- a/bind/bind.nm +++ b/bind/bind.nm @@ -67,18 +67,16 @@ build
configure_options += \ --with-libtool \ - --sysconfdir=/etc \ - --localstatedir=/var \ --enable-threads \ --enable-ipv6 \ --with-pic \ --disable-static \ --disable-openssl-version-check \ --enable-exportlib \ - --with-export-libdir=/lib/ \ + --with-export-libdir=/%{lib}/ \ --with-export-includedir=/usr/include/ \ --includedir=/usr/include/bind9/ \ - --with-pkcs11=/usr/lib/pkcs11/PKCS11_API.so \ + --with-pkcs11=%{libdir}/pkcs11/PKCS11_API.so \ --with-gssapi=yes \ --disable-isc-spnego
@@ -108,7 +106,7 @@ build gzip -9 doc/rfc/*
# Create directory layout. - mkdir -pv %{BUILDROOT}/usr/lib/bind + mkdir -pv %{BUILDROOT}%{libdir}/bind mkdir -pv %{BUILDROOT}/var/named/{slaves,data,dynamic} mkdir -pv %{BUILDROOT}/usr/share/man/{man1,man5,man8} mkdir -pv %{BUILDROOT}/run/named @@ -148,12 +146,12 @@ build install -m 644 %{DIR_SOURCE}/trusted-key.key %{BUILDROOT}/etc/trusted-key.key
# Recreate symlinks for export libraries - rm -rf %{BUILDROOT}/lib/lib*-export.so + rm -rf %{BUILDROOT}/%{lib}/lib*-export.so
- ln -svf ../../lib/libdns-export.so.81 %{BUILDROOT}/usr/lib/libdns-export.so - ln -svf ../../lib/libirs-export.so.80 %{BUILDROOT}/usr/lib/libirs-export.so - ln -svf ../../lib/libisccfg-export.so.82 %{BUILDROOT}/usr/lib/libisccfg-export.so - ln -svf ../../lib/libisc-export.so.83 %{BUILDROOT}/usr/lib/libisc-export.so + ln -svf ../../%{lib}/libdns-export.so.81 %{BUILDROOT}%{libdir}/libdns-export.so + ln -svf ../../%{lib}/libirs-export.so.80 %{BUILDROOT}%{libdir}/libirs-export.so + ln -svf ../../%{lib}/libisccfg-export.so.82 %{BUILDROOT}%{libdir}/libisccfg-export.so + ln -svf ../../%{lib}/libisc-export.so.83 %{BUILDROOT}%{libdir}/libisc-export.so
# Create /run/named. mkdir -pv %{BUILDROOT}/run/named diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm index 12790b6..dcb9003 100644 --- a/cracklib/cracklib.nm +++ b/cracklib/cracklib.nm @@ -4,8 +4,8 @@ ###############################################################################
name = cracklib -version = 2.8.12 -release = 2 +version = 2.8.18 +release = 1
groups = Security/Password url = http://sourceforge.net/projects/cracklib/ @@ -22,14 +22,20 @@ description in a dictionary. end
-source_dl = +source_dl = http://prdownloads.sourceforge.net/cracklib/ sources += cracklib-words-20080507.gz
build requires + autoconf + automake + gettext-devel python-devel end
+ dictdir = %{datadir}/cracklib + dictpath = %{dictdir}/pw_dict + configure_options += \ --with-default-dict=/lib/cracklib/pw_dict \ --with-python \ @@ -38,31 +44,58 @@ build # Only extract the source tarball. prepare cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/%{thisapp}.tar.gz + cd %{DIR_APP} + + cp lib/packer.h lib/packer.h.in + chmod +x util/cracklib-format
# Apply all patches. %{MACRO_PATCHES} + + #autoreconf -fi + + mkdir cracklib-dicts + cp -vf %{DIR_DL}/cracklib-words-20080507.gz cracklib-dicts + + # Create distribution dict. + echo -ne "%{DISTRO_NAME}\n%{DISTRO_SNAME}\n" >> \ + cracklib-dicts/cracklib-distro-words + gzip -9 cracklib-dicts/cracklib-distro-words end
install_cmds + # Install python bindings + make install DESTDIR=%{BUILDROOT} INSTALL="install -c -p" -C python + mkdir -pv %{BUILDROOT}/{,usr/}%{lib} mv -v %{BUILDROOT}%{libdir}/libcrack.so.2* %{BUILDROOT}/%{lib} - ln -vsf ../../%{lib}/libcrack.so.2.8.0 %{BUILDROOT}%{libdir}/libcrack.so - - mkdir -pv %{BUILDROOT}/usr/share/dict - install -v -m644 -D %{DIR_DL}/cracklib-words-20080507.gz \ - %{BUILDROOT}/usr/share/dict/cracklib-words.gz - gunzip -v %{BUILDROOT}/usr/share/dict/cracklib-words.gz - ln -v -s cracklib-words %{BUILDROOT}/usr/share/dict/words - echo -ne "%{DISTRO_NAME}\n%{DISTRO_SNAME}\n" >> \ - %{BUILDROOT}/usr/share/dict/cracklib-extra-words - - mkdir -pv %{BUILDROOT}/lib/cracklib - chmod a+x util/cracklib-{format,packer} - util/cracklib-format \ - %{BUILDROOT}/usr/share/dict/cracklib-words \ - %{BUILDROOT}/usr/share/dict/cracklib-extra-words | \ - util/cracklib-packer \ - %{BUILDROOT}/lib/cracklib/pw_dict + ln -vsf ../../%{lib}/libcrack.so.2.8.1 %{BUILDROOT}%{libdir}/libcrack.so + + mkdir -pv %{BUILDROOT}{%{dictdir},%{dictpath}} + util/cracklib-format cracklib-dicts/* | \ + util/cracklib-packer %{BUILDROOT}%{dictpath} + util/cracklib-format %{BUILDROOT}%{dictdir}/cracklib-small | \ + util/cracklib-packer %{BUILDROOT}%{dictdir}/cracklib-small + rm -f %{BUILDROOT}%{dictdir}/cracklib-small + + sed -e "s@/usr/lib/cracklib_dict@%{dictpath}@g" lib/crack.h \ + > %{BUILDROOT}%{includedir}/crack.h + + ln -svf cracklib-format %{BUILDROOT}%{sbindir}/mkdict + ln -svf cracklib-packer %{BUILDROOT}%{sbindir}/packer + + toprelpath=.. + touch %{BUILDROOT}/top + while ! test -f %{BUILDROOT}%{libdir}/${toprelpath}/top; do + toprelpath=../${toprelpath} + done + rm -f %{BUILDROOT}/top + + if [ "%{dictpath}" != "%{libdir}/cracklib_dict" ]; then + ln -svf ${toprelpath}%{dictpath}.hwm %{BUILDROOT}%{libdir}/cracklib_dict.hwm + ln -svf ${toprelpath}%{dictpath}.pwd %{BUILDROOT}%{libdir}/cracklib_dict.pwd + ln -svf ${toprelpath}%{dictpath}.pwi %{BUILDROOT}%{libdir}/cracklib_dict.pwi + fi end end
@@ -81,8 +114,8 @@ packages description = %{summary}
files - /lib/cracklib - /usr/share/dict* + %{dictdir} + %{dictpath} end end
diff --git a/cracklib/patches/cracklib-2.8.12-gettext.patch b/cracklib/patches/cracklib-2.8.12-gettext.patch new file mode 100644 index 0000000..8608187 --- /dev/null +++ b/cracklib/patches/cracklib-2.8.12-gettext.patch @@ -0,0 +1,13 @@ +Newer autopoint chokes if we don't explicitly list a version here. +diff -up cracklib-2.8.12/configure.in cracklib-2.8.12/configure.in +--- cracklib-2.8.12/configure.in 2008-10-28 13:27:06.000000000 -0400 ++++ cracklib-2.8.12/configure.in 2008-10-28 13:27:07.000000000 -0400 +@@ -58,7 +58,7 @@ AC_CHECK_FUNCS(strdup) + AC_CHECK_FUNCS(getpwuid_r) + + dnl internationalization macros +-AM_GNU_GETTEXT_VERSION ++AM_GNU_GETTEXT_VERSION(0.14) + AM_GNU_GETTEXT([external]) + + dnl Control default dictname diff --git a/cracklib/patches/cracklib-2.8.15-inttypes.patch b/cracklib/patches/cracklib-2.8.15-inttypes.patch new file mode 100644 index 0000000..d1d6a23 --- /dev/null +++ b/cracklib/patches/cracklib-2.8.15-inttypes.patch @@ -0,0 +1,68 @@ +Don't depend on a consumer of <packer.h> to be using autoconf, and to be +checking for for the presence of <inttypes.h> and <stdint.h>, and including +its own "config.h" before including <packer.h>, in order for this to be +correct on 64-bit machines. + +diff -up cracklib-2.8.15/configure.in cracklib-2.8.15/configure.in +--- cracklib-2.8.15/configure.in 2009-11-18 18:58:21.000000000 -0500 ++++ cracklib-2.8.15/configure.in 2009-12-01 15:16:35.000000000 -0500 +@@ -26,6 +26,19 @@ AC_CHECK_HEADERS(zlib.h, AC_DEFINE(HAVE_ + + AC_SEARCH_LIBS(gzopen, z) + ++if test x$ac_cv_header_inttypes_h = xyes ; then ++ CRACKLIB_INTEGER_TYPES1="#include <inttypes.h>" ++ CRACKLIB_INTEGER_TYPES2= ++elif test x$ac_cv_header_stdint_h = xyes ; then ++ CRACKLIB_INTEGER_TYPES1="#include <stdint.h>" ++ CRACKLIB_INTEGER_TYPES2= ++else ++ CRACKLIB_INTEGER_TYPES1="typedef unsigned int uint32_t;" ++ CRACKLIB_INTEGER_TYPES2="typedef unsigned short uint16_t;" ++fi ++AC_SUBST(CRACKLIB_INTEGER_TYPES1) ++AC_SUBST(CRACKLIB_INTEGER_TYPES2) ++ + dnl Cygwin workaround + AC_MSG_CHECKING(if LINE_MAX is defined) + AC_EGREP_CPP(yes, +@@ -92,5 +105,6 @@ AC_SUBST(CROSS_COMPILING, $cross_compili + + AC_OUTPUT(util/Makefile lib/Makefile doc/Makefile python/Makefile Makefile \ + python/setup.py \ ++ lib/packer.h \ + po/Makefile.in m4/Makefile dicts/Makefile cracklib.spec) + +diff -up cracklib-2.8.15/lib/packer.h.in cracklib-2.8.15/lib/packer.h.in +--- cracklib-2.8.15/lib/packer.h.in 2009-12-01 15:15:38.000000000 -0500 ++++ cracklib-2.8.15/lib/packer.h.in 2009-12-01 15:15:38.000000000 -0500 +@@ -30,17 +30,8 @@ + #define _(String) (String) + #endif + +-#if defined(HAVE_INTTYPES_H) +-#include <inttypes.h> +-#else +-#if defined(HAVE_STDINT_H) +-#include <stdint.h> +-#else +-typedef unsigned int uint32_t; +-typedef unsigned short uint16_t; +-#endif +-#endif +- ++@CRACKLIB_INTEGER_TYPES1@ ++@CRACKLIB_INTEGER_TYPES2@ + + struct pi_header + { +@@ -83,6 +74,9 @@ typedef struct { + int dummy; + } PWDICT; + ++@CRACKLIB_INTEGER_TYPES1@ ++@CRACKLIB_INTEGER_TYPES2@ ++ + #endif + + extern PWDICT *PWOpen(const char *prefix, char *mode); diff --git a/cryptsetup-luks/cryptsetup-luks.nm b/cryptsetup-luks/cryptsetup-luks.nm index 8ac4302..0fbad75 100644 --- a/cryptsetup-luks/cryptsetup-luks.nm +++ b/cryptsetup-luks/cryptsetup-luks.nm @@ -5,7 +5,7 @@
name = cryptsetup-luks version = 1.1.0 -release = 1 +release = 2
groups = System/Filesystems url = http://cryptsetup.googlecode.com/ @@ -33,20 +33,19 @@ build
configure_options += \ --sbindir=/sbin \ - --libdir=/lib \ + --libdir=/%{lib} \ --disable-static
install_cmds - rm -rvf %{BUILDROOT}/lib/cryptsetup{,.la,.so} - mkdir -pv %{BUILDROOT}/usr/lib - mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/ - ln -svf ../../lib/libcryptsetup.so.1 %{BUILDROOT}/usr/lib/libcryptsetup.so + rm -rvf %{BUILDROOT}/%{lib}/cryptsetup{,.la,.so} + mkdir -pv %{BUILDROOT}%{libdir} + mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir} + ln -svf ../../%{lib}/libcryptsetup.so.1 %{BUILDROOT}%{libdir}/libcryptsetup.so end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm index 4609f37..9021c82 100644 --- a/cyrus-sasl/cyrus-sasl.nm +++ b/cyrus-sasl/cyrus-sasl.nm @@ -5,7 +5,7 @@
name = cyrus-sasl version = 2.1.25 -release = 1 +release = 2
groups = System/Libraries url = http://asg.web.cmu.edu/sasl/sasl-library.html @@ -29,15 +29,22 @@ build
configure_options += \ --sysconfdir=/etc \ + --with-configdir=%{libdir}/sasl2:/etc/sasl2 \ + --with-plugindir=%{libdir}/sasl2 \ --with-dbpath=/var/lib/sasl/sasldb2 \ --with-saslauthd=/var/run/saslauthd \ --mandir=/usr/share/man
PARALLELISMFLAGS = # Disabled
+ make_install_targets += sasldir=%{libdir}/sasl2 + install_cmds - mkdir -pv %{BUILDROOT}/usr/lib/sasl2 - cp -vf %{DIR_SOURCE}/smtpd.conf %{BUILDROOT}/usr/lib/sasl2/ + # Install plugins. + make install DESTDIR=%{BUILDROOT} sasldir=%{libdir}/sasl2 -C plugins + + mkdir -pv %{BUILDROOT}%{libdir}/sasl2 + cp -vf %{DIR_SOURCE}/smtpd.conf %{BUILDROOT}%{libdir}/sasl2/
install -v -m700 -d %{BUILDROOT}/var/lib/sasl %{BUILDROOT}/var/run/saslauthd end @@ -45,7 +52,6 @@ end
packages package %{name} - end
package %{name}-libs template LIBS diff --git a/dbus-glib/dbus-glib.nm b/dbus-glib/dbus-glib.nm index 8054c6d..59d6680 100644 --- a/dbus-glib/dbus-glib.nm +++ b/dbus-glib/dbus-glib.nm @@ -5,7 +5,7 @@
name = dbus-glib version = 0.94 -release = 1 +release = 2
groups = System/Libraries url = http://www.freedesktop.org/software/dbus/ @@ -30,8 +30,8 @@ build
configure_options += \ --sysconfdir=/etc \ - --libdir=/lib \ - --libexecdir=/usr/lib \ + --libdir=/%{lib} \ + --libexecdir=%{libdir} \ --mandir=/usr/share/man
test @@ -39,10 +39,10 @@ build end
install_cmds - mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/ + mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
- rm -vf %{BUILDROOT}/lib/libdbus-glib-1.so - ln -svf ../../lib/libdbus-glib-1.so.2 %{BUILDROOT}/usr/lib/libdbus-glib-1.so + rm -vf %{BUILDROOT}/%{lib}/libdbus-glib-1.so + ln -svf ../../%{lib}/libdbus-glib-1.so.2 %{BUILDROOT}%{libdir}/libdbus-glib-1.so end end
diff --git a/dbus/dbus.nm b/dbus/dbus.nm index 7286d06..c751bf1 100644 --- a/dbus/dbus.nm +++ b/dbus/dbus.nm @@ -5,7 +5,7 @@
name = dbus version = 1.4.14 -release = 2 +release = 3
groups = System/Daemons url = http://www.freedesktop.org/software/dbus/ @@ -30,26 +30,26 @@ build configure_options += \ --sysconfdir=/etc \ --localstatedir=/var \ - --libdir=/lib \ - --libexecdir=/lib \ + --libdir=/%{lib} \ + --libexecdir=/%{lib} \ --enable-libaudit \ --enable-selinux=yes \ --with-systemdsystemunitdir=/lib/systemd/system/ \ --with-dbus-user=dbus
install_cmds - mkdir -pv %{BUILDROOT}/usr/lib - mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/ + mkdir -pv %{BUILDROOT}%{libdir} + mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
#change the arch-deps.h include directory to /usr/lib instead of /lib - sed -e 's@-I${libdir}@-I${prefix}/lib@' -i %{BUILDROOT}/usr/lib/pkgconfig/dbus-1.pc + sed -e 's@-I${libdir}@-I${prefix}/%{lib}@' -i %{BUILDROOT}%{libdir}/pkgconfig/dbus-1.pc
- mkdir -pv %{BUILDROOT}/usr/lib/dbus-1.0/include - mv -v %{BUILDROOT}/lib/dbus-1.0/include/* %{BUILDROOT}/usr/lib/dbus-1.0/include - rm -rvf %{BUILDROOT}/lib/dbus-1.0 + mkdir -pv %{BUILDROOT}%{libdir}/dbus-1.0/include + mv -v %{BUILDROOT}/%{lib}/dbus-1.0/include/* %{BUILDROOT}%{libdir}/dbus-1.0/include + rm -rvf %{BUILDROOT}/%{lib}/dbus-1.0
- rm -vf %{BUILDROOT}/lib/libdbus-1.so - ln -svf ../../lib/libdbus-1.so.3 %{BUILDROOT}/usr/lib/libdbus-1.so + rm -vf %{BUILDROOT}/%{lib}/libdbus-1.so + ln -svf ../../%{lib}/libdbus-1.so.3 %{BUILDROOT}%{libdir}/libdbus-1.so end end
diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm index 9a43c0b..a8d2a04 100644 --- a/dmraid/dmraid.nm +++ b/dmraid/dmraid.nm @@ -5,7 +5,7 @@
name = dmraid version = 1.0.0.rc15 -release = 2 +release = 3
groups = System/Filesystems url = http://people.redhat.com/heinzm/sw/dmraid @@ -34,7 +34,7 @@ build
configure_options += \ --sbindir=/sbin \ - --libdir=/lib \ + --libdir=/%{lib} \ --disable-static \ --disable-static_link \ --enable-libselinux @@ -44,19 +44,19 @@ build end
install_cmds - mkdir -pv %{BUILDROOT}/{,usr}/lib + mkdir -pv %{BUILDROOT}/{,usr}/%{lib} install -v -m 755 lib/libdmraid.so \ - %{BUILDROOT}/lib/libdmraid.so.%{version} - ln -svf ../../lib/libdmraid.so.%{version} %{BUILDROOT}/usr/lib/libdmraid.so + %{BUILDROOT}/%{lib}/libdmraid.so.%{version} + ln -svf ../../%{lib}/libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so
# Install development headers. - install -m 644 include/dmraid/*.h %{BUILDROOT}/usr/include/dmraid/ + mkdir -pv %{BUILDROOT}%{includedir}/dmraid + install -m 644 include/dmraid/*.h %{BUILDROOT}%{includedir}/dmraid/ end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/docbook-dsssl/docbook-dsssl.nm b/docbook-dsssl/docbook-dsssl.nm index db78d0d..b835a96 100644 --- a/docbook-dsssl/docbook-dsssl.nm +++ b/docbook-dsssl/docbook-dsssl.nm @@ -47,10 +47,11 @@ packages sgml-common end
- prerequires +=\ - docbook-dtds \ - libxml2 \ + prerequires + docbook-dtds + libxml2 sgml-common + end
script postin # Install catalog files. diff --git a/docbook-dtds/docbook-dtds.nm b/docbook-dtds/docbook-dtds.nm index 5841054..37b15ba 100644 --- a/docbook-dtds/docbook-dtds.nm +++ b/docbook-dtds/docbook-dtds.nm @@ -5,7 +5,7 @@
name = docbook-dtds version = 1.0 -release = 3 +release = 4 arch = noarch
groups = Applications/Text @@ -118,10 +118,10 @@ end
packages package %{name} - - prerequires += \ - libxml2 \ + prerequires + libxml2 sgml-common + end
script postin # Install catalog files. diff --git a/docbook-utils/docbook-utils.nm b/docbook-utils/docbook-utils.nm index a0bc3f4..9790d5a 100644 --- a/docbook-utils/docbook-utils.nm +++ b/docbook-utils/docbook-utils.nm @@ -5,7 +5,7 @@
name = docbook-utils version = 0.6.14 -release = 1 +release = 2
groups = Applications/Text url = http://sources.redhat.com/docbook-tools/ @@ -38,7 +38,7 @@ build end
configure_options += \ - --libdir=/usr/lib \ + --libdir=%{libdir} \ --mandir=/usr/share/man end
@@ -48,6 +48,7 @@ packages docbook-dtds docbook-dsssl openjade + perl-SGMLSpm end end
diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm index 797789f..028fdc8 100644 --- a/docbook-xsl/docbook-xsl.nm +++ b/docbook-xsl/docbook-xsl.nm @@ -5,7 +5,7 @@
name = docbook-xsl version = 1.76.1 -release = 2 +release = 3 arch = noarch
groups = Applications/Text @@ -52,10 +52,11 @@ packages sgml-common end
- prerequires +=\ - docbook-dtds \ - libxml2 \ + prerequires + docbook-dtds + libxml2 sgml-common + end
script postin # Install catalog files. diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm index e55ee5d..ce65673 100644 --- a/e2fsprogs/e2fsprogs.nm +++ b/e2fsprogs/e2fsprogs.nm @@ -5,7 +5,7 @@
name = e2fsprogs version = 1.41.11 -release = 1 +release = 2
groups = System/Filesystems url = http://e2fsprogs.sourceforge.net/ @@ -68,11 +68,6 @@ build install cd build make install install-libs DESTDIR=%{BUILDROOT} - - ln -svf ../../lib/libcom_err.so.2 %{BUILDROOT}/usr/lib/libcom_err.so - ln -svf ../../lib/libe2p.so.2 %{BUILDROOT}/usr/lib/libe2p.so - ln -svf ../../lib/libext2fs.so.2 %{BUILDROOT}/usr/lib/libext2fs.so - ln -svf ../../lib/libss.so.2 %{BUILDROOT}/usr/lib/libss.so end end
diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm index f58df70..f144f01 100644 --- a/ghostscript/ghostscript.nm +++ b/ghostscript/ghostscript.nm @@ -5,7 +5,7 @@
name = ghostscript version = 9.04 -release = 1 +release = 3
groups = Applications/Printing url = http://ghostscript.com diff --git a/git/git.nm b/git/git.nm index 7501f7d..df2f449 100644 --- a/git/git.nm +++ b/git/git.nm @@ -4,7 +4,7 @@ ###############################################################################
name = git -version = 1.7.3.2 +version = 1.7.8.2 release = 1
groups = Development/Tools @@ -18,8 +18,7 @@ description and full access to internals. end
-source_dl = -sources = %{thisapp}.tar.bz2 +source_dl = http://git-core.googlecode.com/files/
build requires diff --git a/libaio/libaio.nm b/libaio/libaio.nm index 30208d8..ae5f96b 100644 --- a/libaio/libaio.nm +++ b/libaio/libaio.nm @@ -5,7 +5,7 @@
name = libaio version = 0.3.109 -release = 1 +release = 2
groups = System/Libraries url = ftp://ftp.kernel.org/pub/linux/libs/aio/ @@ -31,19 +31,20 @@ build
build make %{PARALLELISMFLAGS} \ - CFLAGS="%{CFLAGS} -I." CC="gcc" + CFLAGS="%{CFLAGS} -I. -fPIC" CC="gcc" end
+ make_install_targets += prefix=/ libdir=%{libdir} usrlibdir=%{libdir} + install_cmds # Modify links to be relative - ln -svf libaio.so.1 %{BUILDROOT}/usr/lib/libaio.so - ln -svf libaio.so.1.0.1 %{BUILDROOT}/usr/lib/libaio.so.1 + ln -svf libaio.so.1 %{BUILDROOT}%{libdir}/libaio.so + ln -svf libaio.so.1.0.1 %{BUILDROOT}%{libdir}/libaio.so.1 end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/libgcrypt/libgcrypt.nm b/libgcrypt/libgcrypt.nm index 9fd1159..ab21d03 100644 --- a/libgcrypt/libgcrypt.nm +++ b/libgcrypt/libgcrypt.nm @@ -5,7 +5,7 @@
name = libgcrypt version = 1.5.0 -release = 1 +release = 2
groups = System/Libraries url = http://www.gnupg.org/ @@ -28,19 +28,18 @@ build end
configure_options += \ - --libdir=/lib \ + --libdir=/%{lib} \ --enable-noexecstack \
install_cmds - mkdir -pv %{BUILDROOT}/usr/lib - rm -vf %{BUILDROOT}/lib/libgcrypt.so - ln -sfv ../../lib/libgcrypt.so.11 %{BUILDROOT}/usr/lib/libgcrypt.so + mkdir -pv %{BUILDROOT}%{libdir} + rm -vf %{BUILDROOT}/%{lib}/libgcrypt.so + ln -sfv ../../%{lib}/libgcrypt.so.11 %{BUILDROOT}%{libdir}/libgcrypt.so end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/libgpg-error/libgpg-error.nm b/libgpg-error/libgpg-error.nm index 9e59252..5147094 100644 --- a/libgpg-error/libgpg-error.nm +++ b/libgpg-error/libgpg-error.nm @@ -5,7 +5,7 @@
name = libgpg-error version = 1.9 -release = 1 +release = 2
groups = System/Libraries url = http://www.gnupg.org/ @@ -27,18 +27,17 @@ build end
configure_options += \ - --libdir=/lib + --libdir=/%{lib}
install_cmds - mkdir -pv %{BUILDROOT}/usr/lib - rm -vf %{BUILDROOT}/lib/libgpg-error.so - ln -sfv ../../lib/libgpg-error.so.0 %{BUILDROOT}/usr/lib/libgpg-error.so + mkdir -pv %{BUILDROOT}%{libdir} + rm -vf %{BUILDROOT}/%{lib}/libgpg-error.so + ln -sfv ../../%{lib}/libgpg-error.so.0 %{BUILDROOT}%{libdir}/libgpg-error.so end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm index b9d9903..242e1a8 100644 --- a/libjpeg/libjpeg.nm +++ b/libjpeg/libjpeg.nm @@ -3,9 +3,10 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-name = libjpeg-turbo -version = 1.0.0 +name = libjpeg +version = 1.1.1 release = 1 +thisapp = libjpeg-turbo-%{version}
groups = System/Libraries url = http://sourceforge.net/projects/libjpeg-turbo @@ -22,8 +23,7 @@ description text comments into a JPEG file. end
-source_dl = -sources = %{name}-%{version}.tar.gz +source_dl = http://sourceforge.net/projects/libjpeg-turbo/files/%%7Bversion%7D/
build requires @@ -40,20 +40,15 @@ build prepare_cmds autoreconf -vfi end - - install_cmds - # Remove non-versioned libjpegturbo. - rm -vf %{BUILDROOT}/usr/include/turbojpeg.h - rm -vf %{BUILDROOT}/usr/lib/libturbojpeg.so - end end
packages package %{name} - end
package %{name}-devel template DEVEL + + files += !/usr/lib/libturbojpeg.so end
package %{name}-debuginfo diff --git a/libnl/libnl.nm b/libnl/libnl.nm index 6e642e4..504f351 100644 --- a/libnl/libnl.nm +++ b/libnl/libnl.nm @@ -5,7 +5,7 @@
name = libnl version = 1.1 -release = 1 +release = 2
groups = Development/Libraries url = http://people.suug.ch/~tgr/libnl/ @@ -21,20 +21,19 @@ source_dl =
build configure_options += \ - --libdir=/lib + --libdir=/%{lib}
install_cmds - rm -vf %{BUILDROOT}/lib/libnl.so - mkdir -pv %{BUILDROOT}/usr/lib - ln -svf ../../lib/libnl.so.1 %{BUILDROOT}/usr/lib/libnl.so + rm -vf %{BUILDROOT}/%{lib}/libnl.so + mkdir -pv %{BUILDROOT}%{libdir} + ln -svf ../../%{lib}/libnl.so.1 %{BUILDROOT}%{libdir}/libnl.so
- mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/pkgconfig + mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}/pkgconfig end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/libtiff/libtiff.nm b/libtiff/libtiff.nm index 3aa9931..35bb822 100644 --- a/libtiff/libtiff.nm +++ b/libtiff/libtiff.nm @@ -5,7 +5,7 @@
name = libtiff version = 4.0.0beta7 -release = 1 +release = 2
groups = System/Libraries url = http://www.libtiff.org @@ -28,7 +28,7 @@ build libjpeg-devel end
- DIR_APP = /usr/src/tiff-%{version} + DIR_APP = %{DIR_SRC}/tiff-%{version}
configure_options += \ --enable-defer-strile-load \ @@ -37,7 +37,6 @@ end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/libusb-compat/libusb-compat.nm b/libusb-compat/libusb-compat.nm index bd36891..a2c5945 100644 --- a/libusb-compat/libusb-compat.nm +++ b/libusb-compat/libusb-compat.nm @@ -3,9 +3,10 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-name = libusb +name = libusb-compat version = 0.1.12 -release = 1 +release = 2 +thisapp = libusb-%{version}
groups = System/Libraries url = http://sourceforge.net/projects/libusb/ @@ -25,27 +26,26 @@ build end
configure_options += \ - --libdir=/lib \ + --libdir=/%{lib} \ --disable-build-docs \ --disable-static
install_cmds - mkdir -pv %{BUILDROOT}/usr/lib - mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/ - - rm -vf %{BUILDROOT}/usr/lib/libusb{,pp}-0.1.so - ln -svf ../../lib/libusb-0.1.so.4 %{BUILDROOT}/usr/lib/libusb.so - ln -svf ../../lib/libusb-0.1.so.4 %{BUILDROOT}/usr/lib/libusb-0.1.so - ln -svf ../../lib/libusbpp-0.1.so.4 %{BUILDROOT}/usr/lib/libusbpp.so - ln -svf ../../lib/libusbpp-0.1.so.4 %{BUILDROOT}/usr/lib/libusbpp-0.1.so + mkdir -pv %{BUILDROOT}%{libdir} + mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir} + + rm -vf %{BUILDROOT}%{libdir}/libusb{,pp}-0.1.so + ln -svf ../../%{lib}/libusb-0.1.so.4 %{BUILDROOT}%{libdir}/libusb.so + ln -svf ../../%{lib}/libusb-0.1.so.4 %{BUILDROOT}%{libdir}/libusb-0.1.so + ln -svf ../../%{lib}/libusbpp-0.1.so.4 %{BUILDROOT}%{libdir}/libusbpp.so + ln -svf ../../%{lib}/libusbpp-0.1.so.4 %{BUILDROOT}%{libdir}/libusbpp-0.1.so end end
packages - package %{name}-compat - end + package %{name}
- package %{name}-compat-devel + package %{name}-devel template DEVEL end
diff --git a/libxml2/libxml2.nm b/libxml2/libxml2.nm index 3d6bb8e..8eb4ebf 100644 --- a/libxml2/libxml2.nm +++ b/libxml2/libxml2.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libxml2 -version = 2.7.7 +version = 2.7.8 release = 1
groups = System/Libraries @@ -24,7 +24,7 @@ description library. end
-source_dl = +source_dl = ftp://xmlsoft.org/libxml2/
build requires diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm index 5c033c0..3022043 100644 --- a/lvm2/lvm2.nm +++ b/lvm2/lvm2.nm @@ -3,9 +3,10 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-name = LVM2 +name = lvm2 version = 2.02.54 -release = 1 +release = 2 +thisapp = LVM2.%{version}
groups = System/Base url = http://sources.redhat.com/lvm2/ @@ -21,8 +22,6 @@ description (kind of logical partitions) in volume groups. end
-thisapp = %{name}.%{version} - source_dl = sources = %{thisapp}.tgz
@@ -38,20 +37,19 @@ build --bindir=/bin \ --sbindir=/sbin \ --exec-prefix=/ \ - --libdir=/lib \ + --libdir=/%{lib} \ --enable-pkgconfig
install_cmds - mkdir -pv %{BUILDROOT}/usr/lib - rm -vf %{BUILDROOT}/lib/libdevmapper.so - ln -svf libdevmapper.so.1.02 %{BUILDROOT}/lib/libdevmapper.so.1 - ln -svf ../../lib/libdevmapper.so.1 %{BUILDROOT}/usr/lib/libdevmapper.so + mkdir -pv %{BUILDROOT}%{libdir} + rm -vf %{BUILDROOT}/%{lib}/libdevmapper.so + ln -svf libdevmapper.so.1.02 %{BUILDROOT}/%{lib}/libdevmapper.so.1 + ln -svf ../../%{lib}/libdevmapper.so.1 %{BUILDROOT}%{libdir}/libdevmapper.so end end
packages package %{name} - end
package libdevmapper template LIBS diff --git a/nspr/nspr.nm b/nspr/nspr.nm index 15a533a..c24848f 100644 --- a/nspr/nspr.nm +++ b/nspr/nspr.nm @@ -5,7 +5,7 @@
name = nspr version = 4.8.6 -release = 1 +release = 2
groups = System/Libraries url = http://www.mozilla.org/projects/nspr/ @@ -45,40 +45,52 @@ build %{MACRO_PATCHES} end
+ if "%{DISTRO_ARCH}" == "x86_64" + configure_options += \ + --enable-64bit + end + + if "%{DISTRO_ARCH}" == "armv7hl" + configure_options += \ + --enable-thumb2 + end + + configure_options += \ + --libdir=/%{lib} \ + --includedir=/usr/include/nspr4 \ + --enable-optimize="%{CFLAGS}" \ + --disable-debug + build %{DIR_APP}/mozilla/nsprpub/configure \ - %{configure_options} \ - --libdir=/lib \ - --includedir=/usr/include/nspr4 \ - --enable-optimize="%{CFLAGS}" \ - --disable-debug + %{configure_options}
make end
install_cmds - mkdir -pv %{BUILDROOT}/usr/{bin,lib} - mkdir -pv %{BUILDROOT}/lib - mkdir -pv %{BUILDROOT}/usr/lib/pkgconfig + mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}} + mkdir -pv %{BUILDROOT}/%{lib} + mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
cp -vf %{DIR_APP}/config/nspr-config-pc \ %{BUILDROOT}/usr/bin/nspr-config
sed \ - -e "s,%libdir%,/usr/lib,g" \ + -e "s,%libdir%,%{libdir},g" \ -e "s,%prefix%,/usr,g" \ -e "s,%exec_prefix%,/usr,g" \ -e "s,%includedir%,/usr/include/nspr4,g" \ -e "s,%NSPR_VERSION%,%{version},g" \ - -e "s,%FULL_NSPR_LIBS%,-L/usr/lib -lnspr4 -lplc4 -lplds4 -ldl -lpthread,g" \ + -e "s,%FULL_NSPR_LIBS%,-L%{libdir} -lnspr4 -lplc4 -lplds4 -ldl -lpthread,g" \ -e "s,%FULL_NSPR_CFLAGS%,-I/usr/include/nspr4,g" \ < %{DIR_SOURCE}/nspr.pc.in \ - > %{BUILDROOT}/usr/lib/pkgconfig/nspr.pc + > %{BUILDROOT}%{libdir}/pkgconfig/nspr.pc
#mv -v %{BUILDROOT}/usr/lib/lib{nspr,plc.plds}4.so %{BUILDROOT}/lib/ - ln -svf ../../lib/libnspr4.so %{BUILDROOT}/usr/lib/libnspr4.so - ln -svf ../../lib/libplc4.so %{BUILDROOT}/usr/lib/libplc4.so - ln -svf ../../lib/libplds4.so %{BUILDROOT}/usr/lib/libplds4.so + ln -svf ../../%{lib}/libnspr4.so %{BUILDROOT}%{libdir}/libnspr4.so + ln -svf ../../%{lib}/libplc4.so %{BUILDROOT}%{libdir}/libplc4.so + ln -svf ../../%{lib}/libplds4.so %{BUILDROOT}%{libdir}/libplds4.so
# Remove unneeded stuff rm -rfv \ diff --git a/nss-myhostname/nss-myhostname.nm b/nss-myhostname/nss-myhostname.nm index 52d64ce..e3fc8bf 100644 --- a/nss-myhostname/nss-myhostname.nm +++ b/nss-myhostname/nss-myhostname.nm @@ -5,7 +5,7 @@
name = nss-myhostname version = 0.3 -release = 1 +release = 2
groups = System/Libraries url = http://0pointer.de/lennart/projects/nss-myhostname/ @@ -32,12 +32,12 @@ source_dl =
build configure_options += \ - --libdir=/lib + --libdir=/%{lib}
install_cmds - mkdir -pv %{BUILDROOT}/usr/lib - ln -svf ../../lib/libnss_myhostname.so.2 \ - %{BUILDROOT}/usr/lib/libnss_myhostname.so + mkdir -pv %{BUILDROOT}%{libdir} + ln -svf ../../%{lib}/libnss_myhostname.so.2 \ + %{BUILDROOT}%{libdir}/libnss_myhostname.so
rm -rf %{BUILDROOT}/usr/share/doc/nss-myhostname end diff --git a/nss-softokn/nss-softokn.nm b/nss-softokn/nss-softokn.nm index fae15df..8cd0d90 100644 --- a/nss-softokn/nss-softokn.nm +++ b/nss-softokn/nss-softokn.nm @@ -5,7 +5,7 @@
name = nss-softokn version = 3.12.8 -release = 1 +release = 2
groups = System/Libraries url = http://www.mozilla.org/projects/security/pki/nss/ @@ -42,13 +42,17 @@ build export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export NSPR_INCLUDE_DIR=/usr/include/nspr4 - export NSPR_LIB_DIR=/usr/lib + export NSPR_LIB_DIR=%{libdir}
export NSS_INCLUDE_DIR=/usr/include/nss3 - export NSS_LIB_DIR=/usr/lib + export NSS_LIB_DIR=%{libdir}
export NSS_USE_SYSTEM_SQLITE=1
+ if "%{DISTRO_ARCH}" == "x86_64" + export USE_64=1 + end + build make -C ./mozilla/security/coreconf make -C ./mozilla/security/dbm @@ -56,37 +60,38 @@ build end
install - mkdir -pv %{BUILDROOT}/lib + mkdir -pv %{BUILDROOT}/%{lib} mkdir -pv %{BUILDROOT}/usr/include/nss3 - mkdir -pv %{BUILDROOT}/usr/{bin,lib} - mkdir -pv %{BUILDROOT}/usr/lib/pkgconfig - mkdir -pv %{BUILDROOT}/usr/lib/nss/unsupported-tools - - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libsoftokn3.so \ - %{BUILDROOT}/usr/lib - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnssdbm3.so \ - %{BUILDROOT}/usr/lib - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libfreebl3.so \ - %{BUILDROOT}/lib - ln -svf ../../lib/libfreebl3.so %{BUILDROOT}/usr/lib/libfreebl3.so + mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}} + mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig + mkdir -pv %{BUILDROOT}%{libdir}/nss/unsupported-tools + + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libsoftokn3.so \ + %{BUILDROOT}%{libdir} + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssdbm3.so \ + %{BUILDROOT}%{libdir} + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libfreebl3.so \ + %{BUILDROOT}/%{lib} + ln -svf ../../%{lib}/libfreebl3.so %{BUILDROOT}%{libdir}/libfreebl3.so
# Copy the binaries we ship as unsupported - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/shlibsign %{BUILDROOT}/usr/lib/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/shlibsign \ + %{BUILDROOT}%{libdir}/nss/unsupported-tools
- sed -e "s,@libdir@,/usr/lib,g" \ + sed -e "s,@libdir@,%{libdir},g" \ -e "s,@prefix@,/usr,g" \ -e "s,@exec_prefix@,/usr,g" \ -e "s,@includedir@,/usr/include/nss3,g" \ - -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMAJOR" %{DIR_APP}/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \ - -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMINOR" %{DIR_APP}/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \ - -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*SOFTOKEN_VPATCH" %{DIR_APP}/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \ + -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMAJOR" mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \ + -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMINOR" mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \ + -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*SOFTOKEN_VPATCH" mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \ < %{DIR_SOURCE}/nss-softokn-config.in \ > %{BUILDROOT}/usr/bin/nss-softokn-config chmod -v 755 %{BUILDROOT}/usr/bin/nss-softokn-config
# XXX need to fix this sed \ - -e "s,%libdir%,/usr/lib,g" \ + -e "s,%libdir%,%{libdir},g" \ -e "s,%prefix%,/usr,g" \ -e "s,%exec_prefix%,/usr,g" \ -e "s,%includedir%,/usr/include/nss3,g" \ @@ -95,11 +100,11 @@ build -e "s,%NSSUTIL_VERSION%,$$(nss-util-config --version),g" \ -e "s,%SOFTOKEN_VERSION%,%{version},g" \ < %{DIR_SOURCE}/nss-softokn.pc.in \ - > %{BUILDROOT}/usr/lib/pkgconfig/nss-softokn.pc + > %{BUILDROOT}%{libdir}/pkgconfig/nss-softokn.pc
# Copy the include files we want - cp -vf %{DIR_APP}/mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3 - cp -vf %{DIR_APP}/mozilla/dist/private/nss/blapi.h \ + cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3 + cp -vf mozilla/dist/private/nss/blapi.h \ %{BUILDROOT}/usr/include/nss3 chmod -v 644 %{BUILDROOT}/usr/include/nss3/*.h end @@ -119,8 +124,8 @@ packages files /usr/bin/*-config /usr/include - /usr/lib/libfreebl3.so - /usr/lib/pkgconfig + %{libdir}/libfreebl3.so + %{libdir}/pkgconfig end end
diff --git a/nss-util/nss-util.nm b/nss-util/nss-util.nm index 00eb9ce..6363e48 100644 --- a/nss-util/nss-util.nm +++ b/nss-util/nss-util.nm @@ -37,13 +37,17 @@ build export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export NSPR_INCLUDE_DIR=/usr/include/nspr4 - export NSPR_LIB_DIR=/usr/lib + export NSPR_LIB_DIR=%{libdir}
export NSS_INCLUDE_DIR=/usr/include/nss3 - export NSS_LIB_DIR=/usr/lib + export NSS_LIB_DIR=%{libdir}
export NSS_USE_SYSTEM_SQLITE=1
+ if "%{DISTRO_ARCH}" == "x86_64" + export USE_64=1 + end + build make -C ./mozilla/security/coreconf make -C ./mozilla/security/nss @@ -52,34 +56,34 @@ build install mkdir -pv %{BUILDROOT}/usr/bin mkdir -pv %{BUILDROOT}/usr/include/nss3 - mkdir -pv %{BUILDROOT}/usr/lib/pkgconfig + mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnssutil3.so \ - %{BUILDROOT}/usr/lib + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssutil3.so \ + %{BUILDROOT}%{libdir}
- sed -e "s,@libdir@,/usr/lib,g" \ + sed -e "s,@libdir@,%{libdir},g" \ -e "s,@prefix@,/usr,g" \ -e "s,@exec_prefix@,/usr,g" \ -e "s,@includedir@,/usr/include/nss3,g" \ - -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*NSSUTIL_VMAJOR" %{DIR_APP}/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \ - -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*NSSUTIL_VMINOR" %{DIR_APP}/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \ - -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*NSSUTIL_VPATCH" %{DIR_APP}/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \ + -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*NSSUTIL_VMAJOR" mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \ + -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*NSSUTIL_VMINOR" mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \ + -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*NSSUTIL_VPATCH" mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \ < %{DIR_SOURCE}/nss-util-config.in \ > %{BUILDROOT}/usr/bin/nss-util-config chmod -v 755 %{BUILDROOT}/usr/bin/nss-util-config
sed \ - -e "s,%libdir%,/usr/lib,g" \ + -e "s,%libdir%,%{libdir},g" \ -e "s,%prefix%,/usr,g" \ -e "s,%exec_prefix%,/usr,g" \ -e "s,%includedir%,/usr/include/nss3,g" \ -e "s,%NSPR_VERSION%,$$(nspr-config --version),g" \ -e "s,%NSSUTIL_VERSION%,%{name},g" \ < %{DIR_SOURCE}/nss-util.pc.in \ - > %{BUILDROOT}/usr/lib/pkgconfig/nss-util.pc + > %{BUILDROOT}%{libdir}/pkgconfig/nss-util.pc
# The util headers, the rest come from softokn and nss - cp -vf %{DIR_APP}/mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3 + cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3 chmod -v 644 %{BUILDROOT}/usr/include/nss3/*.h end end @@ -98,7 +102,7 @@ packages files /usr/bin/*-config /usr/include - /usr/lib/pkgconfig + %{libdir}/pkgconfig end end
diff --git a/nss/nss.nm b/nss/nss.nm index 584e28e..bdefb12 100644 --- a/nss/nss.nm +++ b/nss/nss.nm @@ -5,7 +5,7 @@
name = nss version = 3.12.8 -release = 3 +release = 4
groups = System/Libraries url = http://www.mozilla.org/projects/security/pki/nss/ @@ -28,6 +28,7 @@ end
build requires + chrpath nspr-devel nss-softokn-devel nss-util-devel @@ -50,13 +51,17 @@ build export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export NSPR_INCLUDE_DIR=/usr/include/nspr4 - export NSPR_LIB_DIR=/usr/lib + export NSPR_LIB_DIR=%{libdir}
export NSS_INCLUDE_DIR=/usr/include/nss3 - export NSS_LIB_DIR=/usr/lib + export NSS_LIB_DIR=%{libdir}
export NSS_USE_SYSTEM_SQLITE=1
+ if "%{DISTRO_ARCH}" == "x86_64" + export USE_64=1 + end + prepare # Extract tarball cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/%{thisapp}-stripped.tar.bz2 @@ -79,22 +84,22 @@ build
install mkdir -pv %{BUILDROOT}/usr/include/nss3 - mkdir -pv %{BUILDROOT}/usr/{bin,lib} - mkdir -pv %{BUILDROOT}/usr/lib/pkgconfig - mkdir -pv %{BUILDROOT}/usr/lib/nss/unsupported-tools - - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnss3.so \ - %{BUILDROOT}/usr/lib - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnssckbi.so \ - %{BUILDROOT}/usr/lib - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnsspem.so \ - %{BUILDROOT}/usr/lib - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnsssysinit.so \ - %{BUILDROOT}/usr/lib - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libsmime3.so \ - %{BUILDROOT}/usr/lib - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libssl3.so \ - %{BUILDROOT}/usr/lib + mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}} + mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig + mkdir -pv %{BUILDROOT}%{libdir}/nss/unsupported-tools + + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnss3.so \ + %{BUILDROOT}%{libdir} + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssckbi.so \ + %{BUILDROOT}%{libdir} + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnsspem.so \ + %{BUILDROOT}%{libdir} + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnsssysinit.so \ + %{BUILDROOT}%{libdir} + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libsmime3.so \ + %{BUILDROOT}%{libdir} + install -p -v -m 755 mozilla/dist/*.OBJ/lib/libssl3.so \ + %{BUILDROOT}%{libdir}
# Install the empty NSS db files mkdir -pv %{BUILDROOT}/etc/pki/nssdb @@ -103,35 +108,36 @@ build %{BUILDROOT}/etc/pki/nssdb/pkcs11.txt
# Copy the binaries we want - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/certutil %{BUILDROOT}/usr/bin - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/cmsutil %{BUILDROOT}/usr/bin - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/crlutil %{BUILDROOT}/usr/bin - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/modutil %{BUILDROOT}/usr/bin - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/pk12util %{BUILDROOT}/usr/bin - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/signtool %{BUILDROOT}/usr/bin - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/signver %{BUILDROOT}/usr/bin - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/ssltap %{BUILDROOT}/usr/bin + install -p -v -m 755 mozilla/dist/*.OBJ/bin/certutil %{BUILDROOT}/usr/bin + install -p -v -m 755 mozilla/dist/*.OBJ/bin/cmsutil %{BUILDROOT}/usr/bin + install -p -v -m 755 mozilla/dist/*.OBJ/bin/crlutil %{BUILDROOT}/usr/bin + install -p -v -m 755 mozilla/dist/*.OBJ/bin/modutil %{BUILDROOT}/usr/bin + install -p -v -m 755 mozilla/dist/*.OBJ/bin/pk12util %{BUILDROOT}/usr/bin + install -p -v -m 755 mozilla/dist/*.OBJ/bin/signtool %{BUILDROOT}/usr/bin + install -p -v -m 755 mozilla/dist/*.OBJ/bin/signver %{BUILDROOT}/usr/bin + install -p -v -m 755 mozilla/dist/*.OBJ/bin/ssltap %{BUILDROOT}/usr/bin + chrpath --delete %{BUILDROOT}/usr/bin/*
# Copy the binaries we ship as unsupported - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/atob %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/btoa %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/derdump %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/ocspclnt %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/pp %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/selfserv %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/strsclnt %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/symkeyutil %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/tstclnt %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/vfyserv %{BUILDROOT}/usr/lib/nss/unsupported-tools - install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/vfychain %{BUILDROOT}/usr/lib/nss/unsupported-tools - - sed -e "s,@libdir@,/usr/lib,g" \ + install -p -v -m 755 mozilla/dist/*.OBJ/bin/atob %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/btoa %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/derdump %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/ocspclnt %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/pp %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/selfserv %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/strsclnt %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/symkeyutil %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/tstclnt %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/vfyserv %{BUILDROOT}%{libdir}/nss/unsupported-tools + install -p -v -m 755 mozilla/dist/*.OBJ/bin/vfychain %{BUILDROOT}%{libdir}/nss/unsupported-tools + + sed -e "s,@libdir@,%{libdir},g" \ -e "s,@prefix@,/usr,g" \ -e "s,@exec_prefix@,/usr,g" \ -e "s,@includedir@,/usr/include/nss3,g" \ - -e "s,@MOD_MAJOR_VERSION@,$(grep "#define.*NSS_VMAJOR" %{DIR_APP}/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ - -e "s,@MOD_MINOR_VERSION@,$(grep "#define.*NSS_VMINOR" %{DIR_APP}/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ - -e "s,@MOD_PATCH_VERSION@,$(grep "#define.*NSS_VPATCH" %{DIR_APP}/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ + -e "s,@MOD_MAJOR_VERSION@,$(grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ + -e "s,@MOD_MINOR_VERSION@,$(grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ + -e "s,@MOD_PATCH_VERSION@,$(grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ < %{DIR_SOURCE}/nss-config.in \ > %{BUILDROOT}/usr/bin/nss-config chmod -v 755 %{BUILDROOT}/usr/bin/nss-config @@ -144,7 +150,7 @@ build
# XXX need to fix this sed \ - -e "s,%libdir%,/usr/lib,g" \ + -e "s,%libdir%,%{libdir},g" \ -e "s,%prefix%,/usr,g" \ -e "s,%exec_prefix%,/usr,g" \ -e "s,%includedir%,/usr/include/nss3,g" \ @@ -153,10 +159,10 @@ build -e "s,%NSSUTIL_VERSION%,$(nss-util-config --version),g" \ -e "s,%SOFTOKEN_VERSION%,$(nss-softokn-config --version),g" \ < %{DIR_SOURCE}/nss.pc.in \ - > %{BUILDROOT}/usr/lib/pkgconfig/nss.pc + > %{BUILDROOT}%{libdir}/pkgconfig/nss.pc
# Copy the include files we want - cp -vf %{DIR_APP}/mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3 + cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3 chmod -v 644 %{BUILDROOT}/usr/include/nss3/*.h
# remove the nss-util-devel headers @@ -199,13 +205,6 @@ build end end
-# XXX need to be removed -quality-agent - whitelist_rpath - $ORIGIN/../lib - end -end - packages package %{name}
@@ -213,7 +212,7 @@ packages template LIBS
files - /usr/lib/*.so + %{libdir}/*.so end end
@@ -231,7 +230,7 @@ packages files /usr/bin/*-config /usr/include - /usr/lib/pkgconfig + %{libdir}/pkgconfig end end
diff --git a/nss_ldap/nss_ldap.nm b/nss_ldap/nss_ldap.nm index d5358ca..fa87ed0 100644 --- a/nss_ldap/nss_ldap.nm +++ b/nss_ldap/nss_ldap.nm @@ -5,7 +5,7 @@
name = nss_ldap version = 265 -release = 2 +release = 3
groups = System/Base url = http://www.padl.com/ @@ -47,7 +47,7 @@ build
configure_options += \ --sysconfdir=/etc \ - --libdir=/lib \ + --libdir=/%{lib} \ --with-ldap-lib=openldap \ --enable-rfc2307bis \ --with-ldap-conf-file=/etc/nss_ldap.conf \ @@ -75,24 +75,23 @@ build # Remove awkward directory rm -rvf %{BUILDROOT}/usr/usr
- mv -v %{BUILDROOT}/lib/* %{BUILDROOT}/usr/lib - rm -rvf %{BUILDROOT}/lib - ln -svf libnss_ldap-%{version}.so %{BUILDROOT}/usr/lib/libnss_ldap.so + mv -v %{BUILDROOT}/%{lib}/* %{BUILDROOT}%{libdir} + rm -rvf %{BUILDROOT}/%{lib} + ln -svf libnss_ldap-%{version}.so %{BUILDROOT}%{libdir}/libnss_ldap.so + ln -svf libnss_ldap.so.2 %{BUILDROOT}%{libdir}/libnss_ldap.so
rm -vf %{BUILDROOT}/etc/nsswitch.ldap
cd %{DIR_APP} && sed 's|dc=padl|dc=example|g' ldap.conf > \ %{BUILDROOT}/etc/nss_ldap.conf touch %{BUILDROOT}/etc/nss_ldap.secret - - ln -svf libnss_ldap.so.2 %{BUILDROOT}/usr/lib/libnss_ldap.so end end
packages package %{name} requires - /lib/security/pam_ldap.so + /%{lib}/security/pam_ldap.so end end
diff --git a/openjade/openjade.nm b/openjade/openjade.nm index 7fe8c7f..1e4fb16 100644 --- a/openjade/openjade.nm +++ b/openjade/openjade.nm @@ -5,7 +5,7 @@
name = openjade version = 1.3.2 -release = 2 +release = 3
groups = Application/Text url = http://openjade.sourceforge.net/ @@ -30,7 +30,7 @@ build --disable-static \ --disable-rpath \ --datadir=/usr/share/sgml/openjade-%{version} \ - --enable-splibdir=/usr/lib + --enable-splibdir=%{libdir}
install_cmds # Create symlink for jade @@ -60,10 +60,11 @@ packages sgml-common end
- prerequires +=\ - docbook-dtds>=1.0-3 \ - libxml2 \ + prerequires + docbook-dtds >= 1.0-3 + libxml2 sgml-common + end
script postin # Install catalog files on system. diff --git a/openldap/openldap.nm b/openldap/openldap.nm index fa98c0f..699f023 100644 --- a/openldap/openldap.nm +++ b/openldap/openldap.nm @@ -5,7 +5,7 @@
name = openldap version = 2.4.25 -release = 2 +release = 3
groups = System/Daemons url = http://www.openldap.org/ @@ -36,7 +36,7 @@ build end
configure_options += \ - --libexecdir=/usr/lib \ + --libexecdir=%{libdir} \ --sysconfdir=/etc \ --localstatedir=/var \ --with-threads=posix \ @@ -57,7 +57,7 @@ build #endef
install_cmds - mv -v %{BUILDROOT}/usr/lib/slapd %{BUILDROOT}/usr/sbin/slapd + mv -v %{BUILDROOT}%{libdir}/slapd %{BUILDROOT}/usr/sbin/slapd ln -svf slapd %{BUILDROOT}/usr/sbin/slapacl ln -svf slapd %{BUILDROOT}/usr/sbin/slapadd ln -svf slapd %{BUILDROOT}/usr/sbin/slapauth @@ -71,7 +71,7 @@ build rm -rvf %{BUILDROOT}/var/openldap-data
for LINK in lber ldap ldap_r; do - chmod -v 0755 %{BUILDROOT}/usr/lib/$(readlink %{BUILDROOT}/usr/lib/lib${LINK}.so) + chmod -v 0755 %{BUILDROOT}%{libdir}/$(readlink %{BUILDROOT}%{libdir}/lib${LINK}.so) done
# Install configuration diff --git a/opensp/opensp.nm b/opensp/opensp.nm index 39b1592..e0ede10 100644 --- a/opensp/opensp.nm +++ b/opensp/opensp.nm @@ -5,7 +5,7 @@
name = opensp version = 1.5.2 -release = 2 +release = 3
groups = Application/Text url = http://openjade.sourceforge.net/ @@ -28,6 +28,7 @@ build docbook-xsl libxml2 libxslt + perl xmlto end
diff --git a/pam/pam.nm b/pam/pam.nm index 99f8207..62a5dd9 100644 --- a/pam/pam.nm +++ b/pam/pam.nm @@ -5,7 +5,7 @@
name = pam version = 1.1.0 -release = 4 +release = 5 thisapp = Linux-PAM-%{version}
groups = System/Base @@ -24,7 +24,7 @@ sources = %{thisapp}.tar.bz2
build requires - audit-devel + #audit-devel bison cracklib-devel flex @@ -32,28 +32,24 @@ build end
configure_options += \ - --libdir=/lib \ - --sbindir=/lib/security \ - --enable-securedir=/lib/security \ + --libdir=/%{lib} \ + --includedir=%{includedir}/security \ --docdir=/usr/share/doc/Linux-PAM-%{version} \ --enable-read-both-confs
install_cmds - mkdir -pv %{BUILDROOT}/sbin - chmod -v 4755 %{BUILDROOT}/lib/security/unix_chkpwd - mv -v %{BUILDROOT}/lib/security/pam_tally %{BUILDROOT}/sbin - - mkdir -pv %{BUILDROOT}/usr/lib - for LINK in libpam{,c,_misc}.so; do \ - ln -v -sf ../../lib/$(readlink %{BUILDROOT}/lib/${LINK}) \ - %{BUILDROOT}/usr/lib/${LINK} && \ - rm -v %{BUILDROOT}/lib/${LINK}; \ + mkdir -pv %{BUILDROOT}%{libdir} + for LINK in libpam{,c,_misc}.so; do + ln -v -sf ../../%{lib}/$(readlink %{BUILDROOT}/%{lib}/${LINK}) \ + %{BUILDROOT}%{libdir}/${LINK} + rm -v %{BUILDROOT}/%{lib}/${LINK} done
#useradd -D -b /home #sed -i 's/yes/no/' %{BUILDROOT}/etc/default/useradd mkdir -pv %{BUILDROOT}/etc/security - install -v -m644 %{DIR_SOURCE}/pam_env.conf %{BUILDROOT}/etc/security/pam_env.conf + install -v -m644 %{DIR_SOURCE}/pam_env.conf \ + %{BUILDROOT}/etc/security/pam_env.conf
# Included in setup package rm -f %{BUILDROOT}/etc/environment @@ -62,9 +58,9 @@ end
packages package %{name} - requires - pam_ldap - end + #requires + # pam_ldap + #end end
package %{name}-devel diff --git a/pam_ldap/pam_ldap.nm b/pam_ldap/pam_ldap.nm index fce2197..05a88ab 100644 --- a/pam_ldap/pam_ldap.nm +++ b/pam_ldap/pam_ldap.nm @@ -5,7 +5,7 @@
name = pam_ldap version = 186 -release = 1 +release = 2
groups = System/Base url = http://www.padl.com/OSS/pam_ldap.html @@ -34,7 +34,7 @@ build
configure_options += \ --sysconfdir=/etc \ - --libdir=/lib \ + --libdir=/%{lib} \ --mandir=/usr/share/man \ --with-ldap-conf-file=/etc/pam_ldap.conf \ --with-ldap-secret-file=/etc/pam_ldap.secret @@ -64,7 +64,7 @@ build
install # Create directory layout - mkdir -pv %{BUILDROOT}/{etc,/lib/security,/usr/lib} + mkdir -pv %{BUILDROOT}/{etc,%{lib}/security,%{libdir}}
# Prevent to install an ldap.conf touch %{BUILDROOT}/etc/ldap.conf diff --git a/pciutils/multilibconfig.h b/pciutils/multilibconfig.h new file mode 100644 index 0000000..8bce823 --- /dev/null +++ b/pciutils/multilibconfig.h @@ -0,0 +1,9 @@ +#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__s390x__) +#include "config.lib64.h" +#elif defined(__sparc__) && defined (__arch64__) +#include "config.lib64.h" +#elif defined(__i386__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__alpha__) || defined(__sparc__) || defined(__sh__) || defined(__arm__) +#include "config.lib.h" +#else +#error Unknown Arch +#endif diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm index d04677a..dbf6eff 100644 --- a/pciutils/pciutils.nm +++ b/pciutils/pciutils.nm @@ -5,7 +5,7 @@
name = pciutils version = 3.1.7 -release = 2 +release = 3
groups = System/Base url = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml @@ -22,19 +22,40 @@ sources = %{thisapp}.tar.bz2
build build - make SHARED=yes OPT="%{CFLAGS}" PREFIX=/usr \ + make SHARED=yes OPT="%{CFLAGS}" PREFIX=/usr STRIP="" \ IDSDIR=/usr/share/hwdata ZLIB=no %{PARALLELISMFLAGS} + + #fix lib vs. lib64 in libpci.pc (static Makefile is used) + sed -i "s|^libdir=.*$|libdir=/%{lib}|" lib/libpci.pc end
install - make SHARED=yes PREFIX=/usr install DESTDIR=%{BUILDROOT} \ - IDSDIR=/usr/share/hwdata MANDIR=/usr/share/man + # Install binaries. + mkdir -pv %{BUILDROOT}/sbin %{BUILDROOT}%{sbindir} + install -p lspci setpci %{BUILDROOT}/sbin + install -p update-pciids %{BUILDROOT}/%{sbindir} + + # Install man pages. + mkdir -pv %{BUILDROOT}%{mandir}/man8 + install -p -m 644 lspci.8 setpci.8 update-pciids.8 %{BUILDROOT}%{mandir}/man8
- mkdir -pv %{BUILDROOT}/usr/include/pci - install -v -m 644 %{DIR_APP}/lib/*.h %{BUILDROOT}/usr/include/pci + # Install libs. + mkdir -pv %{BUILDROOT}/%{lib} %{BUILDROOT}%{libdir} + install -p lib/libpci.so.* %{BUILDROOT}/%{lib}/ + ln -s ../../%{lib}/$(basename %{BUILDROOT}/%{lib}/*.so.*.*.*) \ + %{BUILDROOT}%{libdir}/libpci.so
- mkdir -pv %{BUILDROOT}/usr/lib - ln -svf libpci.so.3 %{BUILDROOT}/usr/lib/libpci.so + # Install headers. + mkdir -pv %{BUILDROOT}%{includedir}/pci + install -p lib/pci.h %{BUILDROOT}%{includedir}/pci + install -p lib/header.h %{BUILDROOT}%{includedir}/pci + install -p %{DIR_SOURCE}/multilibconfig.h %{BUILDROOT}%{includedir}/pci/config.h + install -p lib/config.h %{BUILDROOT}%{includedir}/pci/config.%{lib}.h + install -p lib/types.h %{BUILDROOT}%{includedir}/pci + + # Install pkg-config files. + mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig + install -p lib/libpci.pc %{BUILDROOT}%{libdir}/pkgconfig end end
@@ -45,6 +66,10 @@ packages
package %{name}-libs template LIBS + + requires + /usr/share/hwdata/pci.ids + end end
package %{name}-devel diff --git a/perl-Tk/perl-Tk.nm b/perl-Tk/perl-Tk.nm index f73502e..23edebd 100644 --- a/perl-Tk/perl-Tk.nm +++ b/perl-Tk/perl-Tk.nm @@ -5,7 +5,7 @@
name = perl-Tk version = 804.029 -release = 1 +release = 2 thisapp = Tk-%{version}
groups = Development/Libraries @@ -43,6 +43,10 @@ build
install make pure_install PERL_INSTALL_ROOT=%{BUILDROOT} + + # Remove interpreter in /usr/local... + sed -e "s@#!.*@#!/usr/bin/perl -w@g" \ + -i %{BUILDROOT}%{libdir}/perl5/vendor_perl/Tk/pTk/{Tcl-pTk,mkVFunc} end end
diff --git a/perl/perl.nm b/perl/perl.nm index 8201e4f..5809cb0 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -6,7 +6,7 @@ name = perl version = 5.14.2 # Never reset release in this package, just increase. -release = 10 +release = 11
perl_epoch = 2 thisver = %{perl_epoch}:%{version}-%{_release} @@ -210,6 +210,7 @@ packages InternetConfig Mac:: NDBM_File + Tk VMS:: end end diff --git a/python-dbus/python-dbus.nm b/python-dbus/python-dbus.nm index 0e2e8df..660870d 100644 --- a/python-dbus/python-dbus.nm +++ b/python-dbus/python-dbus.nm @@ -3,9 +3,10 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-name = dbus-python +name = python-dbus version = 0.82.4 -release = 1 +release = 2 +thisapp = dbus-python-%{version}
groups = System/Libraries url = http://www.freedesktop.org/software/dbus/ diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 50b38d9..94d350b 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@
name = systemd version = 37 -release = 1 +release = 2
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -43,11 +43,11 @@ build
configure_options += \ --sysconfdir=/etc \ - --libexecdir=/usr/lib \ + --libexecdir=%{libdir} \ --with-rootdir= \ --with-distro=ipfire \ --with-udevrulesdir=/lib/udev/rules.d/ \ - --with-pamlibdir=/lib/security + --with-pamlibdir=/%{lib}/security
prepare_cmds ./autogen.sh ac diff --git a/udev/udev.nm b/udev/udev.nm index 1629b1c..8d2eadb 100644 --- a/udev/udev.nm +++ b/udev/udev.nm @@ -5,7 +5,7 @@
name = udev version = 172 -release = 4 +release = 5
groups = System/Base url = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ @@ -38,25 +38,22 @@ build --exec-prefix="" \ --sbindir=/sbin \ --sysconfdir=/etc \ - --libexecdir=/lib/udev \ - --with-rootlibdir=/lib \ + --libexecdir=/%{lib}/udev \ + --with-rootlibdir=/%{lib} \ --with-selinux \ --disable-introspection \ --with-systemdsystemunitdir=/lib/systemd/system
install_cmds - # Install pkg-config files correctly - mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib + rm -vf %{BUILDROOT}/%{lib}/lib{udev,gudev-1.0}.so + ln -svf ../../%{lib}/libudev.so.0 %{BUILDROOT}%{libdir}/libudev.so + ln -svf ../../%{lib}/libgudev-1.0.so.0 %{BUILDROOT}%{libdir}/libgudev-1.0.so
- rm -vf %{BUILDROOT}/lib/lib{udev,gudev-1.0}.so - ln -svf ../../lib/libudev.so.0 %{BUILDROOT}/usr/lib/libudev.so - ln -svf ../../lib/libgudev-1.0.so.0 %{BUILDROOT}/usr/lib/libgudev-1.0.so - - ln -svf ../../../../lib/udev/udev-acl \ - %{BUILDROOT}/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck + # We do not use ConsoleKit + rm -rf %{BUILDROOT}/usr/lib*/ConsoleKit
# Remove network rules. We have our own in the network package. - rm -v %{BUILDROOT}/lib/udev/{write_net_rules,rules.d/75-persistent-net-generator.rules} + rm -v %{BUILDROOT}/%{lib}/udev/{write_net_rules,rules.d/75-persistent-net-generator.rules} end end
diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm index 6a24f09..e803744 100644 --- a/usbutils/usbutils.nm +++ b/usbutils/usbutils.nm @@ -6,7 +6,7 @@ name = usbutils epoch = 1 version = 003 -release = 1 +release = 2
groups = System/Tools url = http://www.linux-usb.org/ @@ -36,6 +36,9 @@ end
packages package %{name} + requires + /usr/share/hwdata/usb.ids + end end
package %{name}-debuginfo diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 351c794..707ead3 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -6,7 +6,7 @@ name = util-linux major_ver = 2.20 version = %{major_ver} -release = 1 +release = 2
groups = System/Base url = http://kernel.org/~kzak/util-linux/ @@ -126,7 +126,7 @@ packages end
files - /lib/libblkid.* + /%{lib}/libblkid.* end end
@@ -137,8 +137,8 @@ packages
files /usr/include/blkid/ - /usr/lib/libblkid.* - /usr/lib/pkgconfig/blkid.pc + %{libdir}/libblkid.* + %{libdir}/pkgconfig/blkid.pc /usr/share/man/man3/*blkid* end end @@ -152,7 +152,7 @@ packages end
files - /lib/libuuid.* + /%{lib}/libuuid.* end end
@@ -163,8 +163,8 @@ packages
files /usr/include/uuid/ - /usr/lib/libuuid.* - /usr/lib/pkgconfig/uuid.pc + %{libdir}/libuuid.* + %{libdir}/pkgconfig/uuid.pc /usr/share/man/man3/*uuid* end end @@ -178,7 +178,7 @@ packages end
files - /lib/libmount.* + /%{lib}/libmount.* end end
@@ -189,8 +189,8 @@ packages
files /usr/include/mount/ - /usr/lib/libmount.* - /usr/lib/pkgconfig/mount.pc + %{libdir}/libmount.* + %{libdir}/pkgconfig/mount.pc /usr/share/man/man3/*mount* end end diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm index 51e2d73..b8ee34e 100644 --- a/xfsprogs/xfsprogs.nm +++ b/xfsprogs/xfsprogs.nm @@ -4,7 +4,7 @@ ###############################################################################
name = xfsprogs -version = 3.1.2 +version = 3.1.7 release = 1
groups = System/Filesystems @@ -30,11 +30,10 @@ build end
configure_options += \ - --mandir=/usr/share/man \ --bindir=/sbin \ --sbindir=/sbin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ + --libdir=/%{lib} \ + --libexecdir=%{libdir} \ --enable-readline=yes \ --enable-blkid=yes \ --disable-static @@ -46,23 +45,20 @@ build -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' end
- make_build_targets +=\ - V=1 DEBUG=-DNDEBUG - + make_build_targets += V=1 DEBUG=-DNDEBUG
install - make install install-dev install-qa DIST_ROOT=%{BUILDROOT} + make install install-dev install-qa V=1 DIST_ROOT=%{BUILDROOT}
- chmod -v 755 %{BUILDROOT}/lib/libhandle.so* - rm -vf %{BUILDROOT}/lib/libhandle.so - mkdir -pv %{BUILDROOT}/usr/lib - ln -svf ../../lib/libhandle.so.1 %{BUILDROOT}/usr/lib/libhandle.so + chmod -v 755 %{BUILDROOT}/%{lib}/libhandle.so* + rm -vf %{BUILDROOT}/%{lib}/libhandle.so + mkdir -pv %{BUILDROOT}%{libdir} + ln -svf ../../%{lib}/libhandle.so.1 %{BUILDROOT}%{libdir}/libhandle.so end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm b/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm index 2d330c7..cf8f83f 100644 --- a/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm +++ b/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm @@ -3,9 +3,10 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-name = xorg-xtrans +name = xorg-x11-xtrans-devel version = 1.2.5 -release = 1 +release = 2 +thisapp = xorg-xtrans-%{version} arch = noarch
maintainer = Stefan Schantl stefan.schantl@ipfire.org
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org