rpms/rpm
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Avoid nuking the new python-macro-helper along with dep generators (#1535692)

Browse Source
This commit is contained in:
Panu Matilainen 2018-01-18 10:45:58 +02:00
parent 8219d71cbb
commit eb1281d241
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpm.spec
View File

@ -23,7 +23,7 @@
%global rpmver 4.14.1 %global rpmver 4.14.1
#global snapver rc2 #global snapver rc2
%global rel 1 %global rel 2
%global srcver %{version}%{?snapver:-%{snapver}} %global srcver %{version}%{?snapver:-%{snapver}}
%global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x}
@ -428,7 +428,7 @@ done
find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f
# These live in perl-generators and python-rpm-generators now # These live in perl-generators and python-rpm-generators now
rm -f $RPM_BUILD_ROOT/%{rpmhome}/{perldeps.pl,perl.*,python*} rm -f $RPM_BUILD_ROOT/%{rpmhome}/{perldeps.pl,perl.*,pythond*}
rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*} rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*}
# Axe unused cruft # Axe unused cruft
rm -f $RPM_BUILD_ROOT/%{rpmhome}/{tcl.req,osgideps.pl} rm -f $RPM_BUILD_ROOT/%{rpmhome}/{tcl.req,osgideps.pl}
@ -536,6 +536,7 @@ make check || cat tests/rpmtests.log
%{rpmhome}/sepdebugcrcfix %{rpmhome}/sepdebugcrcfix
%{rpmhome}/find-debuginfo.sh %{rpmhome}/find-debuginfo.sh
%{rpmhome}/find-lang.sh %{rpmhome}/find-lang.sh
%{rpmhome}/python-macro-helper
%{rpmhome}/*provides* %{rpmhome}/*provides*
%{rpmhome}/*requires* %{rpmhome}/*requires*
%{rpmhome}/*deps* %{rpmhome}/*deps*
@ -574,6 +575,9 @@ make check || cat tests/rpmtests.log
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Thu Jan 18 2018 Panu Matilainen <pmatilai@redhat.com> - 4.14.1-2
- Avoid nuking the new python-macro-helper along with dep generators (#1535692)
* Tue Jan 16 2018 Panu Matilainen <pmatilai@redhat.com> - 4.14.1-1 * Tue Jan 16 2018 Panu Matilainen <pmatilai@redhat.com> - 4.14.1-1
- Rebase to rpm 4.14.1 (http://rpm.org/wiki/Releases/4.14.1) - Rebase to rpm 4.14.1 (http://rpm.org/wiki/Releases/4.14.1)