Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE
acl.9427
0010-punt-debian-rpm-packaging-logic.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0010-punt-debian-rpm-packaging-logic.patch of Package acl.9427
From c93b43c22331c3000ce15452943daa9bec77436c Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Fri, 10 Jan 2014 10:07:38 -0500 Subject: [PATCH 10/34] punt debian/rpm packaging logic These files haven't been updated in years. The respective upstreams do their own thing now. Punt this code to make future cleanups easier. Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- .gitignore | 5 - Makefile | 2 +- Makepkgs | 27 +--- debian/Makefile | 51 ------- debian/changelog | 335 ------------------------------------------ debian/compat | 1 - debian/control | 39 ----- debian/copyright | 19 --- debian/rules | 74 ---------- debian/watch | 2 - include/builddefs.in | 4 - m4/package_utilies.m4 | 22 +-- package/Makefile | 5 +- package/rpm/Makefile | 76 ---------- package/rpm/acl.spec.in | 79 ---------- package/rpm/macros.template | 31 ---- package/rpm/rpm-2.rc.template | 25 ---- 17 files changed, 5 insertions(+), 792 deletions(-) delete mode 100644 debian/Makefile delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100755 debian/rules delete mode 100644 debian/watch delete mode 100644 package/rpm/Makefile delete mode 100644 package/rpm/acl.spec.in delete mode 100644 package/rpm/macros.template delete mode 100644 package/rpm/rpm-2.rc.template diff --git a/.gitignore b/.gitignore index 0f018b9..71009b9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,11 +9,6 @@ /acl-* /aclocal.m4 /autom4te.cache/ -/build/rpm/*.rpm -/build/rpm/acl.spec -/build/rpm/rpm-*.rc -/build/rpm/rpmfiles* -/build/rpm/rpmmacros /chacl/chacl /config.guess /config.log diff --git a/Makefile b/Makefile index d1188f2..235736e 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \ Logs/* built .census install.* install-dev.* install-lib.* *.gz LIB_SUBDIRS = include libmisc libacl -TOOL_SUBDIRS = getfacl setfacl chacl m4 man doc po test examples package debian +TOOL_SUBDIRS = getfacl setfacl chacl m4 man doc po test examples package SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) diff --git a/Makepkgs b/Makepkgs index 8d20be9..52368f4 100755 --- a/Makepkgs +++ b/Makepkgs @@ -15,12 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -# Make whichever packages have been requested. -# Defaults to RPMs. -# LOGDIR=Logs -type=rpm verbose=false MAKE=${MAKE:-make} @@ -31,41 +27,22 @@ do case "$opt" in clean) ;; # ignored, kept for backward compatibility - rpm) - type=rpm ;; - debian) - type=debian ;; verbose) verbose=true ;; *) - echo "Usage: Makepkgs [verbose] [debian|rpm]"; exit 1 ;; + echo "Usage: Makepkgs [verbose]"; exit 1 ;; esac done # start with a clean manifest -test -f files.rpm && rm -f files.rpm -test -f filesdevel.rpm && rm -f filesdevel.rpm -test -f fileslib.rpm && rm -f fileslib.rpm - test ! -d $LOGDIR && mkdir $LOGDIR rm -rf $LOGDIR/* > /dev/null 2>&1 # build Debian packages, cleans itself before starting SUDO=${SUDO:-sudo} test ! -z "$SUDO" && sudo=$SUDO -if [ $type = debian ] ; then - LOGDEB=`pwd` - LOGDEB=../`basename $LOGDEB`.log - echo "== Debian build, log is $LOGDEB"; echo - if $verbose ; then - dpkg-buildpackage -r$SUDO | tee $LOGDEB - else - dpkg-buildpackage -r$SUDO > $LOGDEB || exit 1 - fi - exit 0 -fi -# build RPM packages - manual clean before starting +# build packages - manual clean before starting echo "== clean, log is $LOGDIR/clean" if $verbose ; then $MAKE clean 2>&1 | tee $LOGDIR/clean diff --git a/debian/Makefile b/debian/Makefile deleted file mode 100644 index 0a0fc2d..0000000 --- a/debian/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -TOPDIR = .. -include $(TOPDIR)/include/builddefs - -LIBPKG = lib$(PKG_NAME)1 -LSRCFILES = changelog compat control copyright rules watch -DEV_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG)-dev -LIB_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG) - -default: - -include $(BUILDRULES) - -install: default -ifeq ($(PKG_DISTRIBUTION), debian) - $(INSTALL) -m 755 -d $(PKG_DOC_DIR) - $(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian -endif - -install-dev: default -ifeq ($(PKG_DISTRIBUTION), debian) - $(INSTALL) -m 755 -d $(PKG_DOC_DIR) - $(INSTALL) -m 755 -d $(DEV_DOC_DIR) - $(INSTALL) -m 644 copyright $(DEV_DOC_DIR) - $(INSTALL) -m 644 changelog $(DEV_DOC_DIR)/changelog.Debian -endif - -install-lib: default -ifeq ($(PKG_DISTRIBUTION), debian) - $(INSTALL) -m 755 -d $(PKG_DOC_DIR) - $(INSTALL) -m 755 -d $(LIB_DOC_DIR) - $(INSTALL) -m 644 copyright $(LIB_DOC_DIR) - $(INSTALL) -m 644 changelog $(LIB_DOC_DIR)/changelog.Debian -endif diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index cb01da5..0000000 --- a/debian/changelog +++ /dev/null @@ -1,335 +0,0 @@ -acl (2.2.47-2) unstable; urgency=low - - * Acknowledge NMU. Closes: Closes: #477515 - - -- Anibal Monsalve Salazar <anibal@debian.org> Thu, 24 Apr 2008 06:47:12 +1000 - -acl (2.2.47-1.1) unstable; urgency=low - - * Non-maintainer upload. - * Don't call configure with --enable-lib64=yes. (Closes: #477515) - This fixes the lib64 rpaths, so no need to call chrpath anymore. - - -- Kurt Roeckx <kurt@roeckx.be> Wed, 23 Apr 2008 18:58:41 +0200 - -acl (2.2.47-1) unstable; urgency=low - - * New upstream release - * Update debian/watch - * Remove empty directories. Closes: #445902, #222534 - * Fix the following lintian issues: - W: acl source: package-uses-deprecated-debhelper-compat-version 1 - W: acl source: out-of-date-standards-version 3.7.2 (current is 3.7.3) - W: libacl1-dev: package-contains-empty-directory usr/share/doc/acl/ - W: libacl1-dev: description-contains-homepage - W: libacl1: package-contains-empty-directory usr/share/doc/acl/ - W: libacl1: description-contains-homepage - W: acl: description-contains-homepage - W: acl: binary-or-shlib-defines-rpath ./usr/bin/chacl /lib64 - W: acl: binary-or-shlib-defines-rpath ./usr/bin/getfacl /lib64 - W: acl: binary-or-shlib-defines-rpath ./usr/bin/setfacl /lib64 - - -- Anibal Monsalve Salazar <anibal@debian.org> Wed, 23 Apr 2008 21:48:29 +1000 - -acl (2.2.45-1) unstable; urgency=low - - * New upstream release - * debian/control: - - Added homepage - - Added myself as comaintainer - - Set Standards-Version to 3.7.2 - - libacl1-dev depends on libacl1 (= ${binary:Version}) - - acl and libacl1 depend on ${misc:Depends} - * debian/rules: Regenerate acl.pot - * debian/watch: Added - - -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 15 Sep 2007 14:28:33 +1000 - -acl (2.2.42-1) unstable; urgency=low - - * New upstream release - * Incorporate Petr Salinger's GNU/kFreeBSD patch (closes: #401511) - - -- Nathan Scott <nathans@debian.org> Fri, 08 Dec 2006 14:21:40 +1100 - -acl (2.2.41-1) unstable; urgency=low - - * New upstream release - * Rework translation Makefile slightly (closes: #375796) - - -- Nathan Scott <nathans@debian.org> Fri, 21 Jul 2006 09:37:35 +1000 - -acl (2.2.39-1) unstable; urgency=low - - * New upstream release - * Add Swedish translation from Daniel Nylander (closes: #368656) - * Fix get/setfacl segfault on non-existant files (closes: #370826) - - -- Nathan Scott <nathans@debian.org> Wed, 07 Jun 2006 09:30:45 +1000 - -acl (2.2.37-1) unstable; urgency=low - - * New upstream release - * Fix tree walking with symbolic links (closes: #333160) - - -- Nathan Scott <nathans@debian.org> Tue, 02 May 2006 09:41:15 +1000 - -acl (2.2.36-1) unstable; urgency=low - - * New upstream release - * Fixed build dependency on libc-dev (closes: #358788) - - -- Nathan Scott <nathans@debian.org> Tue, 28 Mar 2006 09:14:25 +1100 - -acl (2.2.35-1) unstable; urgency=low - - * New upstream release - * Switch from debmake to debhelper - - -- Nathan Scott <nathans@debian.org> Wed, 15 Feb 2006 20:43:49 +1100 - -acl (2.2.34-1) unstable; urgency=low - - * New upstream release - * Add libacl1-dev dependency on libattr1-dev (closes: #339786, #341711) - - -- Nathan Scott <nathans@debian.org> Mon, 05 Dec 2005 11:15:41 +1100 - -acl (2.2.33-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Thu, 10 Nov 2005 07:59:12 +1100 - -acl (2.2.32-1) unstable; urgency=low - - * New upstream release - * Added French translation (closes: #330596) - - -- Nathan Scott <nathans@debian.org> Thu, 29 Sep 2005 09:47:28 +1000 - -acl (2.2.29-1) unstable; urgency=low - - * New upstream release - * Replace use of _POSIX_PATH_MAX with PATH_MAX (closes: #292819) - - -- Nathan Scott <nathans@debian.org> Mon, 31 Jan 2005 20:13:02 +1100 - -acl (2.2.28-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Tue, 30 Nov 2004 15:29:29 +1100 - -acl (2.2.26-1) unstable; urgency=low - - * New upstream release - * acl.5 man page user/group typo fixed (closes: #272186) - - -- Nathan Scott <nathans@debian.org> Fri, 10 Sep 2004 10:51:19 +1000 - -acl (2.2.23-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Mon, 02 Feb 2004 12:35:56 +1100 - -acl (2.2.21-1) unstable; urgency=low - - * New upstream release - * Make libacl1-dev conflict on kerberos4kth versioned (closes: #219715) - - -- Nathan Scott <nathans@debian.org> Mon, 10 Nov 2003 09:23:21 +1100 - -acl (2.2.20-1) unstable; urgency=low - - * New upstream release - * Fix incorrect man page entry (closes: #213244) - * Fix GNU/Hurd build issues, thanks to Robert Millan (closes: #215153) - - -- Nathan Scott <nathans@debian.org> Mon, 13 Oct 2003 13:07:43 +1000 - -acl (2.2.15-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Fri, 08 Aug 2003 16:39:10 +1000 - -acl (2.2.14-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Mon, 04 Aug 2003 09:18:00 +1000 - -acl (2.2.13-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Tue, 29 Jul 2003 11:27:53 +1000 - -acl (2.2.12-1) unstable; urgency=low - - * Don't always call msgmerge, fix from Steve Langasek (closes: #199277) - - -- Nathan Scott <nathans@debian.org> Thu, 3 Jul 2003 10:55:01 +1000 - -acl (2.2.11-1) unstable; urgency=low - - * New upstream release - * Fix lib package dependencies, thanks to Steve Langasek (closes: #193149) - - -- Nathan Scott <nathans@debian.org> Wed, 04 Jun 2003 15:50:50 +1000 - -acl (2.2.10-1) unstable; urgency=low - - * New upstream release - * Added runtime conflict with libacl1-kerberos4kth, as the - presence of this package breaks Samba's use of libacl1. - - -- Nathan Scott <nathans@debian.org> Mon, 26 May 2003 11:38:53 +1000 - -acl (2.2.9-1) unstable; urgency=low - - * New upstream release - * Updated policy version to which this package conforms - * Fine-tuned the libacl1-dev dependencies a bit (closes: #188068) - - -- Nathan Scott <nathans@debian.org> Sat, 26 Apr 2003 04:36:01 +1000 - -acl (2.2.4-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Mon, 10 Feb 2003 16:15:18 +1100 - -acl (2.2.1-1) unstable; urgency=low - - * Clarify acl(5) with respect to fileutils support (closes: #172642) - * Fix a bash-ism in debian/rules (closes: #173025) - - -- Nathan Scott <nathans@debian.org> Mon, 16 Dec 2002 09:40:50 +1100 - -acl (2.2.0-1) unstable; urgency=low - - * New upstream release - * Added runtime conflict with kerberos4kth-dev (closes: #172169) - - -- Nathan Scott <nathans@debian.org> Mon, 9 Dec 2002 08:09:15 +1100 - -acl (2.1.1-1) unstable; urgency=low - - * Fix Debian package dependency rules for acl (closes: #166709) - * Fix the group for libacl1, was "utils" now "libs" (closes: #166835) - - -- Nathan Scott <nathans@debian.org> Tue, 29 Oct 2002 09:29:52 +1100 - -acl (2.1.0-1) unstable; urgency=low - - * New upstream release, changing dev package name (closes: #141756) - - -- Nathan Scott <nathans@debian.org> Sat, 19 Oct 2002 08:40:38 +1000 - -acl (2.0.19-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Thu, 5 Sep 2002 09:12:02 +1000 - -acl (2.0.17-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Tue, 13 Aug 2002 07:52:54 +1000 - -acl (2.0.15-1) unstable; urgency=low - - * New upstream release (build-related and docs changes only) - * Follow Steve Langasek's advice to fix libattr issue (closes: #150854) - - -- Nathan Scott <nathans@debian.org> Thu, 4 Jul 2002 12:10:38 +1000 - -acl (2.0.14-1) unstable; urgency=low - - * New upstream release (build-related changes only) - - -- Nathan Scott <nathans@debian.org> Thu, 4 Jul 2002 12:10:38 +1000 - -acl (2.0.13-1) unstable; urgency=low - - * New upstream release for (even) closer standard compliance - * Increment the libacl version from 1.0.1 to 1.0.2 - - -- Nathan Scott <nathans@debian.org> Tue, 25 Jun 2002 17:08:03 +1000 - -acl (2.0.12-1) unstable; urgency=low - - * Increment the libacl version from 1.0.0 to 1.0.1 (closes: #150854) - - -- Nathan Scott <nathans@debian.org> Tue, 25 Jun 2002 08:27:20 +1000 - -acl (2.0.11-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Wed, 1 May 2002 09:30:54 +1000 - -acl (2.0.10-1) unstable; urgency=low - - * New upstream bugfix release - * Add accidentally removed dependency of libacl on libattr - - -- Nathan Scott <nathans@debian.org> Mon, 22 Apr 2002 15:12:21 +1000 - -acl (2.0.9-1) unstable; urgency=low - - * New upstream bugfix release (affects 64 bit platforms only) - - -- Nathan Scott <nathans@debian.org> Tue, 16 Apr 2002 08:31:48 +1000 - -acl (2.0.8-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Sat, 13 Apr 2002 09:45:06 +1000 - -acl (2.0.7-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Wed, 10 Apr 2002 09:50:24 +1100 - -acl (2.0.6-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Mon, 8 Apr 2002 08:56:34 +1100 - -acl (2.0.5-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Wed, 27 Mar 2002 08:47:58 +1100 - -acl (2.0.4-2) unstable; urgency=low - - * Fix attr-dev build dependency issue (closes: #138280) - - -- Nathan Scott <nathans@debian.org> Fri, 15 Mar 2002 07:08:50 +1100 - -acl (2.0.4-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Tue, 12 Mar 2002 09:47:50 +1100 - -acl (2.0.2-1) unstable; urgency=low - - * Initial release (closes: #97686) - * Uses the official Linux extended attributes interfaces (currently - supported by ext2, ext3, and XFS) - - -- Nathan Scott <nathans@debian.org> Tue, 26 Feb 2002 13:25:26 +1100 - -Local variables: -mode: debian-changelog -End: diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index 1681b0b..0000000 --- a/debian/control +++ /dev/null @@ -1,39 +0,0 @@ -Source: acl -Section: utils -Priority: optional -Maintainer: Nathan Scott <nathans@debian.org> -Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Niv Sardi <xaiki@debian.org> -Build-Depends: autoconf, debhelper (>= 5), gettext, libtool, libattr1-dev (>= 2.4.4) -Standards-Version: 3.7.3 -Homepage: http://oss.sgi.com/projects/xfs/ - -Package: acl -Depends: ${shlibs:Depends}, ${misc:Depends} -Architecture: any -Description: Access control list utilities - This package contains the getfacl and setfacl utilities needed for - manipulating access control lists. - -Package: libacl1-dev -Section: libdevel -Priority: extra -Depends: libc6-dev | libc-dev, libacl1 (= ${binary:Version}), libattr1-dev (>= 2.4.4) -Provides: acl-dev -Replaces: acl-dev -Conflicts: acl-dev, acl (<< 2.0.0), kerberos4kth-dev (<< 1.2.2-4) -Architecture: any -Description: Access control list static libraries and headers - This package contains the static libraries and header files needed - for developing programs which make use of the access control list - programming interface defined in POSIX 1003.1e draft standard 17. - -Package: libacl1 -Depends: ${shlibs:Depends}, ${misc:Depends} -Section: libs -Priority: required -Conflicts: acl (<< 2.0.0), libacl1-kerberos4kth -Architecture: any -Description: Access control list shared library - This package contains the libacl.so dynamic library containing - the POSIX 1003.1e draft standard 17 functions for manipulating - access control lists. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index a7dd472..0000000 --- a/debian/copyright +++ /dev/null @@ -1,19 +0,0 @@ -This package was debianized by Nathan Scott nathans@debian.org on -Tue, 26 Feb 2002 13:25:26 +1100 - -It can be downloaded from ftp://acl.bestbits.at/ - -Copyright: - -Copyright (C) 2001 Andreas Gruenbacher. -Copyright (C) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. - -You are free to distribute this software under Version 2.1 -of the GNU Lesser General Public License. -On Debian systems, refer to /usr/share/common-licenses/LGPL-2.1 -for the complete text of the GNU Lesser General Public License. - -Certain components (as annotated in the source) are licensed -under the terms of the GNU General Public License. -On Debian systems, the complete text of the GNU General Public -License can be found in /usr/share/common-licenses/GPL file. diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 41293b3..0000000 --- a/debian/rules +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/make -f - -export DH_VERBOSE=1 - -package = acl -develop = lib$(package)1-dev -library = lib$(package)1 - -dirme = debian/$(package) -dirdev = debian/$(develop) -dirlib = debian/$(library) -pkgme = DIST_ROOT=`pwd`/$(dirme); export DIST_ROOT; -pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT; -pkglib = DIST_ROOT=`pwd`/$(dirlib); export DIST_ROOT; -stdenv = @GZIP=-q; export GZIP; - -options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \ - INSTALL_USER=root INSTALL_GROUP=root ; -checkdir = test -f debian/rules - -build: built -built: config - @echo "== dpkg-buildpackage: build" 1>&2 - $(MAKE) default - cd po; rm -rf acl.pot; make acl.pot - touch built - -config: .census -.census: - @echo "== dpkg-buildpackage: configure" 1>&2 - $(checkdir) - $(options) $(MAKE) configure - touch .census - -clean: - @echo "== dpkg-buildpackage: clean" 1>&2 - $(checkdir) - -rm -f built .census - $(MAKE) distclean - -rm -rf $(dirme) $(dirdev) $(dirlib) - -rm -f debian/*substvars debian/files* debian/*.debhelper - -binary-indep: - -binary-arch: checkroot built - @echo "== dpkg-buildpackage: binary-arch" 1>&2 - $(checkdir) - -rm -rf $(dirme) $(dirdev) $(dirlib) - $(pkgme) $(MAKE) -C . install - $(pkgdev) $(MAKE) -C . install-dev - $(pkglib) $(MAKE) -C . install-lib - $(pkgme) $(MAKE) -C build src-manifest - rmdir debian/libacl1-dev/usr/share/doc/acl - rmdir debian/libacl1/usr/share/doc/acl - dh_installdocs - dh_installchangelogs - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs -N $(library) - dh_makeshlibs -p $(library) -V 'libacl1 (>= 2.2.11-1)' - dh_installdeb - dh_shlibdeps - dh_gencontrol - - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch - -checkroot: - test 0 -eq `id -u` - -.PHONY: binary binary-arch binary-indep clean checkroot diff --git a/debian/watch b/debian/watch deleted file mode 100644 index c14272b..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://oss.sgi.com/projects/xfs/cmd_tars/ acl_([\d]+[\d\.]*)-[\d].tar.gz diff --git a/include/builddefs.in b/include/builddefs.in index 5c3e0d6..9ed15b4 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -54,10 +54,6 @@ MSGFMT = @msgfmt@ MSGMERGE = @msgmerge@ XGETTEXT = @xgettext@ -RPM = @rpm@ -RPMBUILD = @rpmbuild@ -RPM_VERSION = @rpm_version@ - ENABLE_SHARED = @enable_shared@ ENABLE_GETTEXT = @enable_gettext@ diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4 index 4de3d3b..e372a6b 100644 --- a/m4/package_utilies.m4 +++ b/m4/package_utilies.m4 @@ -28,7 +28,7 @@ AC_DEFUN([AC_PACKAGE_NEED_UTILITY], # Generic macro, sets up all of the global build variables. # The following environment variables may be set to override defaults: # CC MAKE LIBTOOL TAR ZIP MAKEDEPEND AWK SED ECHO SORT -# MSGFMT MSGMERGE XGETTEXT RPM +# MSGFMT MSGMERGE XGETTEXT # AC_DEFUN([AC_PACKAGE_UTILITIES], [ AC_PROG_CC @@ -92,24 +92,4 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], AC_DEFINE([ENABLE_GETTEXT], 1, [enable gettext]) fi - - AC_PATH_PROG(RPM, rpm,, $search_path) - rpm=$RPM - AC_SUBST(rpm) - - dnl .. and what version is rpm - rpm_version=0 - test -n "$RPM" && test -x "$RPM" && rpm_version=`$RPM --version \ - | awk '{print $NF}' | awk -F. '{V=1; print $V}'` - AC_SUBST(rpm_version) - dnl At some point in rpm 4.0, rpm can no longer build rpms, and - dnl rpmbuild is needed (rpmbuild may go way back; not sure) - dnl So, if rpm version >= 4.0, look for rpmbuild. Otherwise build w/ rpm - if test $rpm_version -ge 4; then - AC_PATH_PROG(RPMBUILD, rpmbuild) - rpmbuild=$RPMBUILD - else - rpmbuild=$RPM - fi - AC_SUBST(rpmbuild) ]) diff --git a/package/Makefile b/package/Makefile index 0e87a20..6f5aa69 100644 --- a/package/Makefile +++ b/package/Makefile @@ -25,7 +25,7 @@ SRCTAR=$(PKG_NAME)-$(PKG_VERSION).src.tar.gz LDIRT = *-manifest *.gz $(TOPDIR)/$(PKG_NAME)-* # for clean and clobber -SUBDIRS = tar rpm +SUBDIRS = tar # nothing to build here (it's all packaging) default install install-dev install-lib: @@ -57,7 +57,4 @@ dist : default $(MANIFEST) if [ -x $(TAR) ]; then \ ( echo "=== tar ===" && $(MAKEF) -C tar $@ || exit $$? ); \ fi; \ - if [ -x $(RPMBUILD) ]; then \ - ( echo "=== rpm ===" && $(MAKEF) -C rpm $@ || exit $$? ); \ - fi; \ test -z "$$KEEP_DIST_ROOT" || rm -rf $$DIST_ROOT; echo Done diff --git a/package/rpm/Makefile b/package/rpm/Makefile deleted file mode 100644 index 041b84c..0000000 --- a/package/rpm/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -TOPDIR = ../.. -TREEROOT = $(shell cd ${TOPDIR}; pwd) -include $(TOPDIR)/include/builddefs - -SPECF = $(PKG_NAME).spec -LDIRT = *.rpm $(SPECF) rpmmacros rpmfiles* rpm-*.rc - -LSRCFILES = macros.template $(SPECF).in rpm-2.rc.template - -default install install-dev install-lib: - -include $(BUILDRULES) - -# Generate a binary rpm file -dist : default $(SPECF) rpm-$(RPM_VERSION).rc - $(RPMBUILD) -ba --rcfile ./rpm-$(RPM_VERSION).rc $(SPECF) - -# Because rpm prior to v.2.90 does not support macros and old style config -# is not supported by rpm v.3, we have to resort to such ugly hacks -ifneq ($(RPM_VERSION),2) -rpm-$(RPM_VERSION).rc : rpmmacros - @$(SED) -e '/^macrofiles:/s|~/.rpmmacros|rpmmacros|' </usr/lib/rpm/rpmrc >$@ - -rpmmacros : macros.template - @$(SED) -e 's|%topdir%|$(TREEROOT)|g' < $< > $@ -else -rpm-2.rc: rpm-2.rc.template - @$(SED) -e 's|%topdir%|$(TOPDIR)|g' < $< > $@ -endif - -# Generate the rpm specfile format file list from the install-sh manifest -rpmfiles rpmfiles-dev rpmfiles-lib: - $(SORT) -u $$DIST_MANIFEST | $(AWK) > $@ '\ -$$1 == "d" { printf ("%%%%dir %%%%attr(%s,%s,%s) %s\n", $$2, $$3, $$4, $$5); } \ -$$1 == "f" { if (match ($$6, "$(PKG_MAN_DIR)") || \ - match ($$6, "$(PKG_DOC_DIR)")) \ - printf ("%%%%doc "); \ - if (match ($$6, "$(PKG_MAN_DIR)")) \ - printf ("%%%%attr(%s,%s,%s) %s*\n", $$2, $$3, $$4, $$6); \ - else \ - printf ("%%%%attr(%s,%s,%s) %s\n", $$2, $$3, $$4, $$6); } \ -$$1 == "l" { if (match ($$3, "$(PKG_MAN_DIR)") || \ - match ($$3, "$(PKG_DOC_DIR)")) \ - printf ("%%%%doc "); \ - if (match ($$3, "$(PKG_MAN_DIR)")) \ - printf ("%%%%attr(0777,root,root) %s*\n", $$3); \ - else \ - printf ("%%%%attr(0777,root,root) %s\n", $$3); }' - -.PHONY: $(SPECF) -${SPECF} : ${SPECF}.in - $(SED) -e's|@pkg_name@|$(PKG_NAME)|g' \ - -e's|@pkg_version@|$(PKG_VERSION)|g' \ - -e's|@pkg_release@|$(PKG_RELEASE)|g' \ - -e's|@pkg_distribution@|$(PKG_DISTRIBUTION)|g' \ - -e's|@build_root@|$(DIST_ROOT)|g' \ - -e'/^BuildRoot: *$$/d' \ - -e's|@make@|$(MAKE)|g' < $< > $@ diff --git a/package/rpm/acl.spec.in b/package/rpm/acl.spec.in deleted file mode 100644 index 7946462..0000000 --- a/package/rpm/acl.spec.in +++ /dev/null @@ -1,79 +0,0 @@ -Summary: Access control list utilities. -Name: @pkg_name@ -Version: @pkg_version@ -Release: @pkg_release@ -Packager: Silicon Graphics, Inc. <http://www.sgi.com/> -BuildRoot: @build_root@ -Source: @pkg_name@-@pkg_version@.src.tar.gz -License: GPL -Vendor: Silicon Graphics, Inc. -Group: System Environment/Base -URL: http://acl.bestbits.at/ - -%description -This package contains the getfacl and setfacl utilities needed for -manipulating access control lists. - -%package -n libacl -Summary: Dynamic library for access control list support. -Group: Development/Libraries -Prereq: /sbin/ldconfig - -%description -n libacl -This package contains the libacl.so dynamic library which contains -the POSIX 1003.1e draft standard 17 functions for manipulating access -control lists. - -%package -n libacl-devel -Summary: Access control list static libraries and headers. -Group: Development/Libraries -Requires: libacl -Provides: acl-devel -Obsoletes: acl-devel - -%description -n libacl-devel -This package contains static libraries and header files needed to develop -programs which make use of the access control list programming interface -defined in POSIX 1003.1e draft standard 17. - -%prep -if [ -f .census ] ; then - if [ ! -d ${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION} ] ; then - ln -s . ${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION} - fi -else -%setup -INSTALL_USER=root -INSTALL_GROUP=root -export INSTALL_USER INSTALL_GROUP -@make@ configure -fi - -%build -@make@ - -%install -DIST_ROOT="$RPM_BUILD_ROOT" -DIST_INSTALL=`pwd`/install.manifest -DIST_INSTALL_DEV=`pwd`/install-dev.manifest -DIST_INSTALL_LIB=`pwd`/install-lib.manifest -export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV DIST_INSTALL_LIB -@make@ install DIST_MANIFEST="$DIST_INSTALL" -@make@ -C build/rpm rpmfiles DIST_MANIFEST="$DIST_INSTALL" -@make@ install-dev DIST_MANIFEST="$DIST_INSTALL_DEV" -@make@ -C build/rpm rpmfiles-dev DIST_MANIFEST="$DIST_INSTALL_DEV" -@make@ install-lib DIST_MANIFEST="$DIST_INSTALL_LIB" -@make@ -C build/rpm rpmfiles-lib DIST_MANIFEST="$DIST_INSTALL_LIB" - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -n libacl -p /sbin/ldconfig - -%postun -n libacl -p /sbin/ldconfig - -%files -f build/rpm/rpmfiles - -%files -n libacl-devel -f build/rpm/rpmfiles-dev - -%files -n libacl -f build/rpm/rpmfiles-lib diff --git a/package/rpm/macros.template b/package/rpm/macros.template deleted file mode 100644 index 4557242..0000000 --- a/package/rpm/macros.template +++ /dev/null @@ -1,31 +0,0 @@ -# -# rpmrc.template -# -# Template to fudge rpm directory structure inside IRIX-like build -# environment - -# Force 386 build on all platforms -# (why that?) -#%_target i386-pc-linux -#%_target_cpu i386 -#%_target_os linux - -# topdir == $(WORKAREA) -%_topdir %topdir% - -# Following directories are specific to the topdir -# This is where build is done. In our case it's the same as $WORKAREA -%_builddir %topdir% - -# This is where foo.1.99.tar.gz is living in the real world. -# Be careful not to run full rpm build as it will override the sources -%_sourcedir %topdir%/build - -# This is where binary RPM and source RPM would end up -%_rpmdir %topdir%/build/rpm -%_srcrpmdir %topdir%/build/rpm -%_specdir %topdir%/build/rpm - -# Leave RPM files in the same directory - we're not building for -# multiple architectures -%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm diff --git a/package/rpm/rpm-2.rc.template b/package/rpm/rpm-2.rc.template deleted file mode 100644 index f3b3eba..0000000 --- a/package/rpm/rpm-2.rc.template +++ /dev/null @@ -1,25 +0,0 @@ -# -# rpmrc.template -# -# Template to fudge rpm directory structure inside IRIX-like build -# environment - -# topdir == $(WORKAREA) -topdir: %topdir% - -# Following directories are specific to the topdir -# This is where build is done. In out case it's the same as $WORKAREA -# Be careful not to run full rpm build as it will override the sources -builddir: %topdir% - -# This is where foo.1.99.tar.gz is living in the real world. -sourcedir: %topdir%/build - -# This is where binary RPM and source RPM would end up -rpmdir: %topdir%/build/rpm -srcrpmdir: %topdir%/build/rpm -specdir: %topdir%/build/rpm - -# Leave RPM files in the same directory - we're not building for -# multiple architectures -rpmfilename: %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm -- 2.5.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
