Accepting request 631597 from Base:System

OBS-URL: https://build.opensuse.org/request/show/631597
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/attr?expand=0&rev=40

0001-attr-2.4.48-test-suite-perl.patch

@@ -0,0 +1,29 @@
+From 46baedf88fe22abafa3f2341b2c1bcb4764ce389 Mon Sep 17 00:00:00 2001
+From: Troy Dawson <tdawson@redhat.com>
+Date: Fri, 21 Jul 2017 14:05:47 -0700
+Subject: [PATCH] attr: escape left brace in a regex in test/run
+
+... to fix test-suite failure with perl-5.26.0
+
+Bug: https://bugzilla.redhat.com/1473853
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ test/run | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/run b/test/run
+index 4b1f8d0..07e916c 100755
+--- a/test/run
++++ b/test/run
+@@ -106,7 +106,7 @@ for (;;) {
+   if (defined $line) {
+     # Substitute %VAR and %{VAR} with environment variables.
+     $line =~ s[%(\w+)][$ENV{$1}]eg;
+-    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
++    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
+   }
+   if (defined $line) {
+     if ($line =~ s/^\s*< ?//) {
+-- 
+2.13.0
+

attr-2.4.47.src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859
-size 343692

attr-2.4.48.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7
+size 467840

attr.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sat Aug 25 18:33:52 UTC 2018 - jengelh@inai.de
+
+- Replace unspecific boilerplate summary from years ago.
+
+-------------------------------------------------------------------
+Mon Aug 13 09:11:11 UTC 2018 - tchvatal@suse.com
+
+- Remove obsolete Obsolete lines
+- Drop static subpackage, nothing in TW depends on it Deb/RH do not
+  provide it either
+- Rely on simple upstream make install target
+- Run tests
+- Update to 2.4.48:
+  * Provide default xattr.conf
+  * Update buildsystem to reflect current autotools state
+  * Small test updates
+  * Remove various deprecated sections like attr/attr.h
+- Update keyring, Mike Frysinger released this version
+- Add patch to have tests working with newer perls:
+  * 0001-attr-2.4.48-test-suite-perl.patch
+
 -------------------------------------------------------------------
 Tue Mar 20 13:10:52 CET 2018 - kukuk@suse.de
 

attr.spec

@@ -16,25 +16,20 @@
 #
 
 
-Name:           attr
 %define lname	libattr1
+Name:           attr
+Version:        2.4.48
+Release:        0
 Summary:        Commands for Manipulating Extended Attributes
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          System/Filesystems
-Version:        2.4.47
+URL:            https://savannah.nongnu.org/projects/attr/
-Release:        0
+Source:         https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.tar.gz
-Url:            http://download.savannah.gnu.org/releases-noredirect/attr/
+Source2:        https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.tar.gz.sig
-
+Source3:        %{name}.keyring
-#Git-Web:	http://git.savannah.gnu.org/cgit/attr.git/
+Source99:       baselibs.conf
-#Git-Clone:	git://git.sv.gnu.org/attr
+Patch0:         0001-attr-2.4.48-test-suite-perl.patch
-Source:         http://download.savannah.gnu.org/releases-noredirect/attr/%{name}-%{version}.src.tar.gz
+BuildRequires:  pkgconfig
-Source2:        http://download.savannah.gnu.org/releases-noredirect/attr/%{name}-%{version}.src.tar.gz.sig
-Source3:        %name.keyring
-Source4:        xattr.conf
-Source5:        baselibs.conf
-#Patch0:         builddefs.in.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-#BuildRequires:  gpg-offline
 Conflicts:      xfsdump < 2.0.0
 
 %description
@@ -43,33 +38,23 @@ 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 %lname
+%package -n %{lname}
 Summary:        A dynamic library for filesystem extended attribute support
-# bug437293
 Group:          System/Libraries
-%ifarch ppc64
+Obsoletes:      libattr < %{version}-%{release}
-Obsoletes:      libattr-64bit
+Provides:       libattr = %{version}-%{release}
-%endif
-# Added for 12.1
-Obsoletes:      libattr < %version-%release
-Provides:       libattr = %version-%release
 
-%description -n %lname
+%description -n %{lname}
 This package contains the libattr.so dynamic library, which contains
 the extended attribute library functions.
 
 %package -n libattr-devel
-Summary:        Include Files and Libraries mandatory for Development
+Summary:        Header files for libattr
 Group:          Development/Libraries/C and C++
-Provides:       attr-devel = %version-%release
+Requires:       %{lname} = %{version}
-Obsoletes:      attr-devel < %version-%release
-# bug437293
-%ifarch ppc64
-Obsoletes:      libattr-devel-64bit
-%endif
-#
-Requires:       %lname = %version
 Requires:       glibc-devel
+Provides:       attr-devel = %{version}-%{release}
+Obsoletes:      attr-devel < %{version}-%{release}
 
 %description -n libattr-devel
 This package contains the libraries and header files needed to develop
@@ -77,71 +62,47 @@ 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.
 
-%package -n libattr-devel-static
-Summary:        Include Files and Libraries mandatory for Development
-Group:          Development/Libraries/C and C++
-Provides:       libattr-devel:%{_libdir}/libattr.a
-Requires:       libattr-devel = %version
-
-%description -n libattr-devel-static
-This package contains the static library of libattr which is needed to develop
-statically linked programs which make use of extended attributes.
-
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-export OPTIMIZER="$RPM_OPT_FLAGS -fPIC"
+%configure \
-export DEBUG=-DNDEBUG
+    --disable-static \
-%configure --with-pic --enable-static
+    --disable-silent-rules
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-b="%buildroot"
+%make_install
-make install install-lib install-dev DESTDIR="$b" PKG_DOC_DIR="%_docdir/%name"
+# remove libtool archives
+find %{buildroot} -type f -name "*.la" -delete -print
+# handle docs on our own
+rm -rf %{buildroot}/%{_datadir}/doc/%{name}
+%find_lang %{name}
 
-mkdir -p "$b/%_lib/"
+%check
-mv "$b/%_libdir"/libattr.so.* "$b/%_lib/"
+make %{?_smp_mflags} check
-t=$(readlink "$b/%_libdir/libattr.so")
-ln -sf "/%_lib/$t" "$b/%_libdir/libattr.so"
-rm -f "$b/%_libdir"/*.la
-rm -fv $RPM_BUILD_ROOT%{_mandir}/man2/*xattr.2*
-rm $b%{_mandir}/man5/attr.5
-rm -fv $b%_defaultdocdir/attr/COPYING*
-install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}
-install -m 644 %_sourcedir/xattr.conf $RPM_BUILD_ROOT/%{_sysconfdir}
-%find_lang %name
 
-%post -n %lname -p /sbin/ldconfig
+%post -n %{lname} -p /sbin/ldconfig
-
+%postun -n %{lname} -p /sbin/ldconfig
-%postun -n %lname -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr (-,root,root)
+%license doc/COPYING*
-%license doc/COPYING
+%doc doc/CHANGES doc/PORTING
-%dir %_defaultdocdir/attr
+%{_mandir}/man1/*.1%{?ext_man}
-%_defaultdocdir/attr/README
+%{_bindir}/attr
-%_defaultdocdir/attr/CHANGES.gz
+%{_bindir}/getfattr
-%_defaultdocdir/attr/PORTING
+%{_bindir}/setfattr
-%_mandir/man1/*.1*
-%_bindir/attr
-%_bindir/getfattr
-%_bindir/setfattr
 
 %files -n libattr-devel
-%defattr(-,root,root)
+%{_includedir}/attr/
-%_includedir/attr/
+%{_libdir}/pkgconfig/libattr.pc
-%_libdir/libattr.so
+%{_libdir}/libattr.so
-%_mandir/man3/*.3*
+%{_mandir}/man3/*.3%{?ext_man}
 
-%files -n libattr-devel-static
+%files -n %{lname}
-%defattr(-,root,root)
+%license doc/COPYING*
-%{_libdir}/libattr.a
+%{_libdir}/libattr.so.1*
-
-%files -n %lname
-%defattr (-,root,root)
-%license doc/COPYING.LGPL
-/%{_lib}/libattr.so.1*
 %config %{_sysconfdir}/xattr.conf
 
 %changelog

xattr.conf

@@ -1,22 +0,0 @@
-# /etc/xattr.conf
-#
-# How to handle extended attributes when copying between files
-#
-# Format:
-# <pattern> <action>
-#
-# Actions:
-#   permissions - copy when trying to preserve permissions.
-#   skip - do not copy.
-
-system.nfs4_acl			permissions
-system.nfs4acl			permissions
-system.posix_acl_access		permissions
-system.posix_acl_default	permissions
-trusted.SGI_ACL_DEFAULT		skip		# xfs specific
-trusted.SGI_ACL_FILE		skip		# xfs specific
-trusted.SGI_CAP_FILE		skip		# xfs specific
-trusted.SGI_DMI_*		skip		# xfs specific
-trusted.SGI_MAC_FILE		skip		# xfs specific
-xfsroot.*			skip		# xfs specific; obsolete
-user.Beagle.*			skip		# ignore Beagle index data