Rebased the scl-utils:
- Correct the %_sharedstatedir macro - Don't install /%{_lib} when not necessary - Add LICENSE file - Add scl_source script - Don't change directory in %scl_install - Don't generate provides from sonames in the SCL root - Add prefix to virtual provides of SCL packages - Implement "--" as a command separator - Removed binary file scl from git tracking - Fixed typo - Added example wrapper script.
This commit is contained in:
parent
d07ec102d8
commit
6fb2c211bf
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
/scl-utils-20121110.tar.gz
|
/scl-utils-20121110.tar.gz
|
||||||
/scl-utils-20130529.tar.gz
|
/scl-utils-20130529.tar.gz
|
||||||
|
/scl-utils-20131009.tar.gz
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
%scl_files %{expand:
|
%scl_files %{expand:
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %_scl_prefix
|
||||||
%dir %attr(555,root,root) %{_scl_root}
|
%dir %attr(555,root,root) %{_scl_root}
|
||||||
%dir %attr(555,root,root) %{_scl_scripts}
|
%dir %attr(555,root,root) %{_scl_scripts}
|
||||||
%{_scl_scripts}/enable
|
%{_scl_scripts}/enable
|
||||||
@ -262,7 +264,7 @@ H
|
|||||||
EOF
|
EOF
|
||||||
mkdir -p %{buildroot}%{_scl_root}
|
mkdir -p %{buildroot}%{_scl_root}
|
||||||
rm -f $RPM_BUILD_DIR/%{buildsubdir}/filesystem
|
rm -f $RPM_BUILD_DIR/%{buildsubdir}/filesystem
|
||||||
cd %{buildroot}%{_scl_root}
|
pushd %{buildroot}%{_scl_root}
|
||||||
mkdir -p boot dev \\
|
mkdir -p boot dev \\
|
||||||
etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \\
|
etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \\
|
||||||
home media mnt opt proc root run/lock srv sys tmp \\
|
home media mnt opt proc root run/lock srv sys tmp \\
|
||||||
@ -273,7 +275,9 @@ ln -snf spool/mail var/mail
|
|||||||
ln -snf usr/bin bin
|
ln -snf usr/bin bin
|
||||||
ln -snf usr/sbin sbin
|
ln -snf usr/sbin sbin
|
||||||
ln -snf usr/lib lib
|
ln -snf usr/lib lib
|
||||||
|
%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
|
||||||
ln -snf usr/%{_lib} %{_lib}
|
ln -snf usr/%{_lib} %{_lib}
|
||||||
|
%endif
|
||||||
sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml >%{buildroot}/iso_639.tab
|
sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml >%{buildroot}/iso_639.tab
|
||||||
sed -n -f %{buildroot}/iso_3166.sed /usr/share/xml/iso-codes/iso_3166.xml >%{buildroot}/iso_3166.tab
|
sed -n -f %{buildroot}/iso_3166.sed /usr/share/xml/iso-codes/iso_3166.xml >%{buildroot}/iso_3166.tab
|
||||||
grep -v "^$" %{buildroot}/iso_639.tab | grep -v "^#" | while read a b c d ; do
|
grep -v "^$" %{buildroot}/iso_639.tab | grep -v "^#" | while read a b c d ; do
|
||||||
@ -321,4 +325,5 @@ for i in man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}; do
|
|||||||
echo "%{_scl_root}/usr/share/man/$i" >> $RPM_BUILD_DIR/%{buildsubdir}/filesystem
|
echo "%{_scl_root}/usr/share/man/$i" >> $RPM_BUILD_DIR/%{buildsubdir}/filesystem
|
||||||
done
|
done
|
||||||
set -x
|
set -x
|
||||||
|
popd
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Summary: Utilities for alternative packaging
|
Summary: Utilities for alternative packaging
|
||||||
Name: scl-utils
|
Name: scl-utils
|
||||||
Version: 20130529
|
Version: 20131009
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/File
|
Group: Applications/File
|
||||||
URL: https://fedorahosted.org/released/scl-utils/
|
URL: https://fedorahosted.org/released/scl-utils/
|
||||||
@ -56,6 +56,7 @@ rm -rf %buildroot
|
|||||||
%{_bindir}/scl_enabled
|
%{_bindir}/scl_enabled
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
%{_sysconfdir}/bash_completion.d/scl.bash
|
%{_sysconfdir}/bash_completion.d/scl.bash
|
||||||
|
%doc LICENSE
|
||||||
|
|
||||||
%{!?_rpmconfigdir:%global _rpmconfigdir /usr/lib/rpm}
|
%{!?_rpmconfigdir:%global _rpmconfigdir /usr/lib/rpm}
|
||||||
%files build
|
%files build
|
||||||
@ -68,6 +69,19 @@ rm -rf %buildroot
|
|||||||
%{_rpmconfigdir}/brp-scl-python-bytecompile
|
%{_rpmconfigdir}/brp-scl-python-bytecompile
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 09 2013 Jan Zeleny <jzeleny@redhat.com> - 20131009-1
|
||||||
|
- Correct the %_sharedstatedir macro
|
||||||
|
- Don't install /%{_lib} when not necessary
|
||||||
|
- Add LICENSE file
|
||||||
|
- Add scl_source script
|
||||||
|
- Don't change directory in %scl_install
|
||||||
|
- Don't generate provides from sonames in the SCL root
|
||||||
|
- Add prefix to virtual provides of SCL packages
|
||||||
|
- Implement "--" as a command separator
|
||||||
|
- Removed binary file scl from git tracking
|
||||||
|
- Fixed typo
|
||||||
|
- Added example wrapper script.
|
||||||
|
|
||||||
* Mon Aug 26 2013 Jan Zeleny <jzeleny@redhat.com> - 20130529-3
|
* Mon Aug 26 2013 Jan Zeleny <jzeleny@redhat.com> - 20130529-3
|
||||||
- updated the file list to handle /etc/scl/conf correctly
|
- updated the file list to handle /etc/scl/conf correctly
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user