dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: attr
-# $Id: Makefile,v 1.1 2004/09/09 03:14:35 cvsdist Exp $
-NAME := attr
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

attr-2.2.0-multilib.patch

@@ -1,11 +1,13 @@
---- attr-2.2.0/include/buildmacros.multilib	2003-01-28 19:00:05.000000000 -0500
+diff --git a/include/buildmacros b/include/buildmacros
-+++ attr-2.2.0/include/buildmacros	2003-01-28 19:04:13.000000000 -0500
+index ab89182..17423c0 100644
-@@ -103,8 +103,6 @@
+--- a/include/buildmacros
- 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
++++ b/include/buildmacros
+@@ -88,8 +88,6 @@ INSTALL_LTLIB_DEV = \
  	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
  	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
+ 	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
- 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
+ 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
+ 	fi
  else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)

attr-2.4.32-build.patch

@@ -1,6 +1,8 @@
---- attr-2.4.32/include/builddefs.in.build	2006-06-20 08:51:25.000000000 +0200
+diff --git a/include/builddefs.in b/include/builddefs.in
-+++ attr-2.4.32/include/builddefs.in	2006-07-05 16:25:44.000000000 +0200
+index 6df0f5a..575a6df 100644
-@@ -25,14 +25,14 @@
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -40,14 +40,14 @@ PKG_RELEASE	= @pkg_release@
  PKG_VERSION	= @pkg_version@
  PKG_PLATFORM	= @pkg_platform@
  PKG_DISTRIBUTION= @pkg_distribution@
@@ -23,14 +25,16 @@
  
  CC		= @cc@
  AWK		= @awk@
---- attr-2.4.32/include/buildmacros.build	2006-07-05 16:23:30.000000000 +0200
+diff --git a/include/buildmacros b/include/buildmacros
-+++ attr-2.4.32/include/buildmacros	2006-07-05 16:23:30.000000000 +0200
+index ab89182..3118a17 100644
-@@ -26,7 +26,7 @@
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
  	  $(LFILES:.l=.o) \
  	  $(YFILES:%.y=%.tab.o)
  
--INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL	= $(TOPDIR)/install-sh
++INSTALL	= $(TOPDIR)/include/install-sh
  
  SHELL = /bin/sh
  IMAGES_DIR = $(TOPDIR)/all-images

attr-2.4.43-leak.patch

@@ -1,33 +1,34 @@
-diff -up attr-2.4.43/libattr/attr_copy_action.c.leak attr-2.4.43/libattr/attr_copy_action.c
+diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c
---- attr-2.4.43/libattr/attr_copy_action.c.leak	2008-06-30 07:22:50.000000000 +0200
+index 0d7aca5..dc94224 100644
-+++ attr-2.4.43/libattr/attr_copy_action.c	2009-02-17 09:50:38.000000000 +0100
+--- a/libattr/attr_copy_action.c
-@@ -53,7 +53,7 @@ free_attr_actions(void)
++++ b/libattr/attr_copy_action.c
- static int
+@@ -53,7 +53,7 @@ free_attr_actions(void)
- attr_parse_attr_conf(struct error_context *ctx)
+ static int
- {
+ attr_parse_attr_conf(struct error_context *ctx)
--	char *text, *t;
+ {
-+	char *text = NULL, *t;
+-	char *text, *t;
- 	size_t size_guess = 4096, len;
++	char *text = NULL, *t;
- 	FILE *file;
+ 	size_t size_guess = 4096, len;
- 	char *pattern = NULL;
+ 	FILE *file;
-@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_contex
+ 	char *pattern = NULL;
- 		return 0;
+@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_context *ctx)
- 
+ 		return 0;
- repeat:
+ 
--	text = malloc(size_guess + 1);
+ repeat:
--	if (!text)
+-	text = malloc(size_guess + 1);
--		goto fail;
+-	if (!text)
--
+-		goto fail;
- 	if ((file = fopen(ATTR_CONF, "r")) == NULL) {
+-
- 		if (errno == ENOENT)
+ 	if ((file = fopen(ATTR_CONF, "r")) == NULL) {
- 			return 0;
+ 		if (errno == ENOENT)
- 		goto fail;
+ 			return 0;
- 	}
+ 		goto fail;
-+
+ 	}
-+	text = malloc(size_guess + 1);
++
-+	if (!text)
++	text = malloc(size_guess + 1);
-+		goto fail;
++	if (!text)
-+
++		goto fail;
- 	len = fread(text, 1, size_guess, file);
++
- 	if (ferror(file))
+ 	len = fread(text, 1, size_guess, file);
- 		goto fail;
+ 	if (ferror(file))
+ 		goto fail;

attr.spec

@@ -1,10 +1,10 @@
 Summary: Utilities for managing filesystem extended attributes
 Name: attr
-Version: 2.4.43
+Version: 2.4.44
-Release: 4%{?dist}
+Release: 1%{?dist}
 Conflicts: xfsdump < 2.0.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_%{version}-1.tar.gz
+Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/attr-%{version}.src.tar.gz
 Patch1: attr-2.2.0-multilib.patch
 Patch2: attr-2.4.32-build.patch
 Patch3: attr-2.4.43-leak.patch
@@ -55,9 +55,9 @@ you'll also want to install attr.
 # because we don't want to drag perl into the base.  Users advanced
 # enough to have used ACLs before they were added to the distro can
 # figure out how to chmod and how to install perl.  :-)
-%patch1 -p1 -b .multilib
+%patch1 -p1
-%patch2 -p1 -b .build
+%patch2 -p1
-%patch3 -p1 -b .leak
+%patch3 -p1
 
 autoconf
 
@@ -90,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n libattr -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc
 %{_bindir}/attr
 %{_bindir}/getfattr
@@ -101,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/attr.5*
 
 %files -n libattr-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /%{_lib}/libattr.so
 %{_includedir}/attr
 %{_libdir}/libattr.*
@@ -109,9 +109,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/attr_*.3.*
 
 %files -n libattr
+%defattr(-,root,root,-)
 /%{_lib}/libattr.so.*
 
 %changelog
+* Thu Nov 26 2009 Kamil Dudka <kdudka@redhat.com> 2.4.44-1
+- new upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.43-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

sources

@@ -1 +1 @@
-91583a14bcbd637adaa9b07ea49c5d4b  attr_2.4.43-1.tar.gz
+adeefe65c5ad1febe46da185c5bfd5d4  attr-2.4.44.src.tar.gz