rpms/procps-ng
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Resolving file conflicts with man-pages-*

Browse Source 
- Replacing hardcoded paths with macros
- Making the i18n subpackage noarch
This commit is contained in:
Jaromir Capik 2014-10-13 12:50:29 +02:00
parent 7a9a974389
commit 5416147856
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
procps-ng.spec
View File

@ -4,7 +4,7 @@
Summary: System and process monitoring utilities Summary: System and process monitoring utilities
Name: procps-ng Name: procps-ng
Version: 3.3.10 Version: 3.3.10
Release: 2%{?dist} Release: 3%{?dist}
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
Group: Applications/System Group: Applications/System
URL: https://sourceforge.net/projects/procps-ng/ URL: https://sourceforge.net/projects/procps-ng/
@ -36,6 +36,10 @@ Provides: /bin/ps
Obsoletes: sysvinit-tools < 0:2.89 Obsoletes: sysvinit-tools < 0:2.89
Provides: /sbin/pidof Provides: /sbin/pidof
# fortunately the same release number for f21 and f22
Conflicts: man-pages-de < 1.7-3
Conflicts: man-pages-fr < 3.66-3
%description %description
The procps package contains a set of system utilities that provide The procps package contains a set of system utilities that provide
@ -72,6 +76,7 @@ System and process monitoring utilities development headers
Summary: Internationalization pack for procps-ng Summary: Internationalization pack for procps-ng
Group: Applications/System Group: Applications/System
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description i18n %description i18n
Internationalization pack for procps-ng Internationalization pack for procps-ng
@ -117,11 +122,12 @@ make check
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
# --localedir doesn't work correctly # --localedir doesn't work correctly
mv %{buildroot}/share/locale %{buildroot}/usr/share mv %{buildroot}/share/locale %{buildroot}%{_datadir}
rmdir %{buildroot}/share rmdir %{buildroot}/share
# translated man pages # translated man pages
find man-po/ -type d -maxdepth 1 -mindepth 1 | while read dirname; do cp -a $dirname %{buildroot}/usr/share/man/ ; done find man-po/ -type d -maxdepth 1 -mindepth 1 | while read dirname; do cp -a $dirname %{buildroot}%{_mandir}/ ; done
rm -f %{buildroot}%{_mandir}/{de,fr,uk}/man1/kill.1
ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
@ -158,6 +164,11 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
%{_datadir}/locale/* %{_datadir}/locale/*
%changelog %changelog
* Mon Oct 06 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.10-3
- Resolving file conflicts with man-pages-*
- Replacing hardcoded paths with macros
- Making the i18n subpackage noarch
* Tue Sep 30 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.10-2 * Tue Sep 30 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.10-2
- Removing explicit dependency on systemd-libs - Removing explicit dependency on systemd-libs
- Removing /etc/sysctl.d (ownership quietly stolen by systemd) - Removing /etc/sysctl.d (ownership quietly stolen by systemd)