removed %%defattr, BuildRoot and other ancient bits

added arch'ed bits to all Requires
This commit is contained in:
Björn Esser 2016-03-07 19:09:43 +01:00
parent 3f1eeba8a1
commit efd48f11f9

View File

@ -1,13 +1,11 @@
Name: libarchive Name: libarchive
Version: 3.1.2 Version: 3.1.2
Release: 15%{?dist} Release: 16%{?dist}
Summary: A library for handling streaming archive formats Summary: A library for handling streaming archive formats
Group: System Environment/Libraries
License: BSD License: BSD
URL: http://www.libarchive.org/ URL: http://www.libarchive.org/
Source0: http://www.libarchive.org/downloads/%{name}-%{version}.tar.gz Source0: http://www.libarchive.org/downloads/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bison BuildRequires: bison
@ -50,7 +48,6 @@ read ISO9660 CDROM images and ZIP archives.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
@ -60,8 +57,7 @@ developing applications that use %{name}.
%package -n bsdtar %package -n bsdtar
Summary: Manipulate tape archives Summary: Manipulate tape archives
Group: Applications/File Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description -n bsdtar %description -n bsdtar
The bsdtar package contains standalone bsdtar utility split off regular The bsdtar package contains standalone bsdtar utility split off regular
@ -70,8 +66,7 @@ libarchive packages.
%package -n bsdcpio %package -n bsdcpio
Summary: Copy files to and from archives Summary: Copy files to and from archives
Group: Applications/File Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description -n bsdcpio %description -n bsdcpio
The bsdcpio package contains standalone bsdcpio utility split off regular The bsdcpio package contains standalone bsdcpio utility split off regular
@ -94,7 +89,6 @@ make %{?_smp_mflags} $verbose_make
%install %install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@ -131,10 +125,6 @@ run_testsuite
%endif %endif
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -142,7 +132,6 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%doc README NEWS %doc README NEWS
@ -152,8 +141,6 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/tar.* %{_mandir}/*/tar.*
%files devel %files devel
%defattr(-,root,root,-)
%doc
%{_includedir}/*.h %{_includedir}/*.h
%{_mandir}/*/archive* %{_mandir}/*/archive*
%{_mandir}/*/libarchive* %{_mandir}/*/libarchive*
@ -161,7 +148,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libarchive.pc %{_libdir}/pkgconfig/libarchive.pc
%files -n bsdtar %files -n bsdtar
%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%doc README NEWS %doc README NEWS
@ -169,7 +155,6 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/bsdtar* %{_mandir}/*/bsdtar*
%files -n bsdcpio %files -n bsdcpio
%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%doc README NEWS %doc README NEWS
@ -178,6 +163,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Mar 07 2016 Björn Esser <fedora@besser82.io> - 3.1.2-16
- removed %%defattr, BuildRoot and other ancient bits
- added arch'ed bits to all Requires
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-15 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild