diff options
-rw-r--r-- | .gitignore | 5 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | Makepkgs | 27 | ||||
-rw-r--r-- | debian/Makefile | 51 | ||||
-rw-r--r-- | debian/changelog | 306 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 46 | ||||
-rw-r--r-- | debian/copyright | 19 | ||||
-rwxr-xr-x | debian/rules | 75 | ||||
-rw-r--r-- | debian/watch | 2 | ||||
-rw-r--r-- | include/builddefs.in | 4 | ||||
-rw-r--r-- | m4/package_utilies.m4 | 22 | ||||
-rw-r--r-- | package/Makefile | 5 | ||||
-rw-r--r-- | package/rpm/Makefile | 76 | ||||
-rw-r--r-- | package/rpm/attr.spec.in | 91 | ||||
-rw-r--r-- | package/rpm/macros.template | 30 | ||||
-rw-r--r-- | package/rpm/rpm-2.rc.template | 25 |
17 files changed, 5 insertions, 782 deletions
@@ -10,11 +10,6 @@ /attr-* /attr/attr /autom4te.cache/ -/build/rpm/*.rpm -/build/rpm/attr.spec -/build/rpm/rpm-*.rc -/build/rpm/rpmfiles* -/build/rpm/rpmmacros /config.guess /config.log /config.status @@ -38,7 +38,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 libattr -TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian package +TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po package SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) @@ -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 2db31cf..0000000 --- a/debian/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. -# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> -# -# 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, see <http://www.gnu.org/licenses/>. -# - -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 21931e0..0000000 --- a/debian/changelog +++ /dev/null @@ -1,306 +0,0 @@ -attr (1:2.4.43-1) unstable; urgency=low - - * New upstream release - * Updated debian/watch - * Standards version is 3.8.0 - - -- Anibal Monsalve Salazar <anibal@debian.org> Thu, 03 Jul 2008 13:49:43 +1000 - -attr (1:2.4.41-1) unstable; urgency=low - - * New upstream release - * Add myself to Uploaders - * Remove /usr/share/doc/attr (closes: #405106, #445903) - * Bump dependency of attr to libattr1 (>= 2.4.41), might be too high but - good enough. (closes: #377700) - * Upstream closed bugs: - Manpage updated (closes: #446877) - * Closing old bugs: - 2.4.36: (closes: #299095) - * Bump Standards Versions, no changes were needed. - * Bump DH_COMPAT. - - -- Niv Sardi <xaiki@debian.org> Mon, 11 Feb 2008 17:45:43 +1100 - -attr (1:2.4.39-1) unstable; urgency=low - - * New upstream release - * debian/control: - - Added homepage - - Added myself as comaintainer - - Set Standards-Version to 3.7.2 - - libattr1-dev depends on libattr1 (= ${binary:Version}) - - attr and libattr1 depend on ${misc:Depends} - * debian/watch: Added - * include/buildrules: Drop --omit-header from xgettext call, so that the - generated POT file becomes valid. - * debian/rules: Rebuild POT file so that Ubuntu's Rosetta can always - import an up to date version. - - -- Anibal Monsalve Salazar <anibal@debian.org> Sun, 16 Sep 2007 09:14:11 +1000 - -attr (2.4.36-1) unstable; urgency=high - - * New upstream release - * Reinstate xattr syscall entry points (closes: #403585) - * Fix ARM EABI issue differently, thanks to Lennert Buytenhek. - - -- Nathan Scott <nathans@debian.org> Tue, 19 Dec 2006 09:46:05 +1100 - -attr (2.4.35-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Fri, 08 Dec 2006 14:12:25 +1100 - -attr (2.4.33-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Mon, 03 Jul 2006 10:08:43 +1000 - -attr (1:2.4.32-1.2) unstable; urgency=low - - * Non-maintainer upload (porter NMU). - * add armel support, Closes: #421627 - * fix kfreebsd build, Closes: #414232 - - -- Riku Voipio <riku.voipio@iki.fi> Wed, 25 Jul 2007 23:33:58 +0300 - -attr (1:2.4.32-1.1) unstable; urgency=emergency - - * Non-maintainer upload. - * Reupload previous version and fix breackage of ls -la, cp -a and other - essential utilities. - Closes: #403601, #403592, #403585, #403590, #403599 and probably more. - - -- Andreas Barth <aba@not.so.argh.org> Mon, 18 Dec 2006 13:42:31 +0000 - -attr (2.4.32-1) unstable; urgency=low - - * New upstream release - * Fixed build dependency on libc-dev (closes: #358786) - - -- Nathan Scott <nathans@debian.org> Tue, 28 Mar 2006 09:14:25 +1100 - -attr (2.4.31-1) unstable; urgency=low - - * New upstream release - * Updated Polish translation. - * Initial Swedish translation (closes: #349234) - * Switched from debmake to debhelper. - * Build updates for GNU/Hurd (closes: #299095) - - -- Nathan Scott <nathans@debian.org> Wed, 22 Feb 2006 13:14:24 +1100 - -attr (2.4.25-1) unstable; urgency=low - - * New upstream release - * Added French translation (closes: #333177) - - -- Nathan Scott <nathans@debian.org> Tue, 11 Oct 2005 06:47:13 +1000 - -attr (2.4.21-1) unstable; urgency=low - - * New upstream release - * Replace use of _POSIX_PATH_MAX with PATH_MAX (see bug 292819) - - -- Nathan Scott <nathans@debian.org> Mon, 31 Jan 2005 20:13:02 +1100 - -attr (2.4.20-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Tue, 30 Nov 2004 15:28:15 +1100 - -attr (2.4.18-1) unstable; urgency=low - - * New upstream release - * Added Dutch language translation from Luk Claes (closes: #272482) - - -- Nathan Scott <nathans@debian.org> Tue, 21 Sep 2004 10:38:28 +1000 - -attr (2.4.16-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Wed, 21 Apr 2004 08:54:29 +1000 - -attr (2.4.15-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Mon, 02 Feb 2004 12:36:53 +1100 - -attr (2.4.12-1) unstable; urgency=low - - * New upstream release - * Fix GNU/Hurd build issues, thanks to Robert Millan (closes: #215154) - - -- Nathan Scott <nathans@debian.org> Mon, 13 Oct 2003 13:02:58 +1000 - -attr (2.4.8-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Mon, 04 Aug 2003 09:18:00 +1000 - -attr (2.4.7-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Tue, 29 Jul 2003 11:09:50 +1000 - -attr (2.4.5-1) unstable; urgency=low - - * New upstream release - * Removed the need to always run msgmerge during the build - - -- Nathan Scott <nathans@debian.org> Thu, 03 Jul 2003 12:47:44 +1000 - -attr (2.4.4-1) unstable; urgency=low - - * New upstream release - * Fix lib package dependencies, thanks to Steve Langasek (closes: #196046) - - -- Nathan Scott <nathans@debian.org> Wed, 04 Jun 2003 15:50:50 +1000 - -attr (2.4.3-1) unstable; urgency=low - - * New upstream release - * Note: COMPAT_XFSROOT environment variable is no longer needed - - -- Nathan Scott <nathans@debian.org> Sat, 26 Apr 2003 04:36:01 +1000 - -attr (2.4.0-1) unstable; urgency=low - - * New upstream release - * Updated policy version to which this package conforms - * Note: xfsdump and xfsrestore are affected by a change in libattr - which deprecates the attribute name prefix "xfsroot", replacing - it with the generic "trusted" name -- the environment variable - COMPAT_XFSROOT can be used to obtain the old behavior - - -- Nathan Scott <nathans@debian.org> Wed, 26 Feb 2003 16:07:57 +1100 - -attr (2.2.0-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Sat, 30 Nov 2002 12:23:15 +1100 - -attr (2.1.1-1) unstable; urgency=low - - * Fix the group for libattr1, was "utils" now "libs" (closes: #166836) - - -- Nathan Scott <nathans@debian.org> Tue, 29 Oct 2002 09:29:52 +1100 - -attr (2.1.0-1) unstable; urgency=low - - * New upstream release, changing dev package name (closes: #141755) - - -- Nathan Scott <nathans@debian.org> Sat, 19 Oct 2002 08:40:38 +1000 - -attr (2.0.12-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Mon, 7 Oct 2002 05:41:55 +1000 - -attr (2.0.11-1) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Thu, 5 Sep 2002 09:12:02 +1000 - -attr (2.0.9-1) unstable; urgency=low - - * New upstream release (mainly build-related changes) - * Added system call numbers for the Alpha architecture - - -- Nathan Scott <nathans@debian.org> Thu, 4 Jul 2002 12:10:38 +1000 - -attr (2.0.8-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Mon, 22 Apr 2002 15:04:53 +1000 - -attr (2.0.7-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Sat, 13 Apr 2002 09:45:06 +1000 - -attr (2.0.6-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Tue, 26 Mar 2002 15:13:49 +1100 - -attr (2.0.5-1) unstable; urgency=low - - * New upstream bugfix release - - -- Nathan Scott <nathans@debian.org> Tue, 12 Mar 2002 09:31:30 +1100 - -attr (2.0.3-1) unstable; urgency=low - - * Major new upstream release - * Uses the new official ext2/ext3/XFS extended attributes interfaces - * Several system call changes - THIS WILL NOT WORK WITH OLD KERNELS! - (because old kernels use unreserved, unofficial system calls) - * Introduction of a new package (libattr) requested by ACL upstream - for new POSIX ACL packages; this is in addition to the existing - attr and attr-dev packages this source generates - - -- Nathan Scott <nathans@debian.org> Tue, 26 Feb 2002 13:25:26 +1100 - -attr (1.1.3-0) unstable; urgency=low - - * New release to fix system call issue on PowerPC - - -- Nathan Scott <nathans@debian.org> Fri, 3 Aug 2001 11:06:55 +1000 - -attr (1.1.2-0) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Fri, 27 Jul 2001 07:59:49 +1000 - -attr (1.1.1-0) unstable; urgency=low - - * New upstream release - - -- Nathan Scott <nathans@debian.org> Mon, 23 Jul 2001 10:27:37 +1000 - -attr (1.1.0-0) unstable; urgency=low - - * Reworked package slightly so that its not Debian native - * Debian-specific changes now documented in changelog.Debian.gz - * New upstream release (see /usr/share/doc/attr/changelog.gz) - * Checked standards compliance - update standards version to 3.5.5 - - -- Nathan Scott <nathans@debian.org> Mon, 16 Jul 2001 18:14:56 +1000 - -attr (1.0.4) unstable; urgency=low - - * Work around syscall number collision on recent ia64 kernels - - -- Nathan Scott <nathans@debian.org> Mon, 2 Jul 2001 13:02:02 +1000 - -attr (1.0.3) unstable; urgency=low - - * Updates to man pages. - - -- Nathan Scott <nathans@debian.org> Fri, 18 May 2001 15:47:54 +1000 - -attr (1.0.2) unstable; urgency=low - - * Initial release. - - -- Nathan Scott <nathans@debian.org> Wed, 25 Apr 2001 12:19:15 +1000 - -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 5614da9..0000000 --- a/debian/control +++ /dev/null @@ -1,46 +0,0 @@ -Source: attr -Section: utils -Priority: optional -Maintainer: Nathan Scott <nathans@debian.org> -Uploaders: Niv Sardi <xaiki@debian.org>, Anibal Monsalve Salazar <anibal@debian.org> -Build-Depends: autoconf, debhelper (>= 5), gettext, libtool -Standards-Version: 3.8.0 -Homepage: http://oss.sgi.com/projects/xfs/ - -Package: attr -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: xfsdump (<< 2.0.0) -Architecture: any -Description: Utilities for manipulating filesystem extended attributes - A set of tools for manipulating extended attributes on filesystem - objects, in particular getfattr(1) and setfattr(1). - An attr(1) command is also provided which is largely compatible - with the SGI IRIX tool of the same name. - -Package: libattr1-dev -Section: libdevel -Priority: extra -Depends: libc6-dev | libc-dev, libattr1 (= ${binary:Version}) -Provides: attr-dev -Replaces: attr-dev -Conflicts: attr-dev, attr (<< 2.0.0) -Architecture: any -Description: Extended attribute static libraries and headers - attr-dev contains the libraries and header files needed to develop - programs which make use of extended attributes. For Linux programs, - the documented system call API is the recommended interface, but an - SGI IRIX compatibility interface is also provided. - . - Currently only ext2, ext3, JFS and XFS support extended attributes. - The SGI IRIX compatibility API built above the Linux system calls is - used by programs such as xfsdump(8), xfsrestore(8) and xfs_fsr(8). - -Package: libattr1 -Depends: ${shlibs:Depends}, ${misc:Depends} -Section: libs -Priority: required -Conflicts: attr (<< 2.0.0) -Architecture: any -Description: Extended attribute shared library - Contains the runtime environment required by programs that make use - of extended attributes. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index ef9f486..0000000 --- a/debian/copyright +++ /dev/null @@ -1,19 +0,0 @@ -This package was debianized by Nathan Scott nathans@debian.org on -Sun, 19 Nov 2000 07:37:09 -0500. - -It can be downloaded from ftp://oss.sgi.com/projects/xfs/download/ - -Copyright: - -Copyright (C) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. -Copyright (C) 2001 Andreas Gruenbacher. - -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 version 2 of 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 1267c96..0000000 --- a/debian/rules +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/make -f - -package = attr -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 - rm -f po/attr.pot - $(MAKE) -C po attr.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) debian/tmp - -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 - - -rm -rf $(dirdev)/usr/share/doc/attr - -rm -rf $(dirlib)/usr/share/doc/attr - - dh_installdocs - dh_installchangelogs - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs -N $(library) - dh_makeshlibs -p $(library) -V 'libattr1 (>= 2.4.41-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 a87657d..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://oss.sgi.com/projects/xfs/cmd_tars/ attr_([\d]+[\d\.]*)-[\d].tar.gz diff --git a/include/builddefs.in b/include/builddefs.in index f888d25..eef7aad 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -67,10 +67,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 551c142..5f44914 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 85dc1c5..0a9b6ce 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 173c367..0000000 --- a/package/rpm/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. -# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> -# -# 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, see <http://www.gnu.org/licenses/>. -# - -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/attr.spec.in b/package/rpm/attr.spec.in deleted file mode 100644 index e577e6d..0000000 --- a/package/rpm/attr.spec.in +++ /dev/null @@ -1,91 +0,0 @@ -Summary: Utilities for managing filesystem extended attributes. -Name: @pkg_name@ -Version: @pkg_version@ -Release: @pkg_release@ -Packager: Silicon Graphics, Inc. <http://www.sgi.com/> -BuildRoot: @build_root@ -Prereq: /sbin/ldconfig -Conflicts: xfsdump < 2.0.0 -Source: @pkg_name@-@pkg_version@.src.tar.gz -License: GPL -Vendor: Silicon Graphics, Inc. -URL: http://oss.sgi.com/projects/xfs/ -Group: System Environment/Base - -%description -A set of tools for manipulating extended attributes on filesystem -objects, in particular getfattr(1) and setfattr(1). -An attr(1) command is also provided which is largely compatible -with the SGI IRIX tool of the same name. - -%package -n libattr -Summary: Dynamic library for extended attribute support. -Group: Development/Libraries -Prereq: /sbin/ldconfig - -%description -n libattr -This package contains the libattr.so dynamic library which contains -the extended attribute system calls and library functions. - -%package -n libattr-devel -Summary: Extended attribute static libraries and headers. -Group: Development/Libraries -Requires: libattr -Obsoletes: attr-devel - -%description -n libattr-devel -This package contains the libraries and header files needed to -develop programs which make use of extended attributes. -For Linux programs, the documented system call API is the -recommended interface, but an SGI IRIX compatibility interface -is also provided. - -Currently only ext2, ext3, JFS and XFS support extended attributes. -The SGI IRIX compatibility API built above the Linux system calls is -used by programs such as xfsdump(8), xfsrestore(8) and xfs_fsr(8). - -You should install libattr-devel if you want to develop programs -which make use of extended attributes. If you install libattr-devel -then you'll also want to install attr. - -%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 libattr -p /sbin/ldconfig - -%postun -n libattr -p /sbin/ldconfig - -%files -f build/rpm/rpmfiles - -%files -n libattr-devel -f build/rpm/rpmfiles-dev - -%files -n libattr -f build/rpm/rpmfiles-lib diff --git a/package/rpm/macros.template b/package/rpm/macros.template deleted file mode 100644 index 200ba39..0000000 --- a/package/rpm/macros.template +++ /dev/null @@ -1,30 +0,0 @@ -# -# rpmrc.template -# -# Template to fudge rpm directory structure inside IRIX-like build -# environment - -# Force 386 build on all platforms -%_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 b53684f..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 |