rpms/sos/devel sos.spec,1.18,1.19 sources,1.13,1.14
Adam Stokes
astokes at fedoraproject.org
Fri Mar 26 21:01:11 UTC 2010
Author: astokes
Update of /cvs/pkgs/rpms/sos/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26078
Modified Files:
sos.spec sources
Log Message:
translation update
Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sos.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sos.spec 17 Feb 2010 16:32:41 -0000 1.18
+++ sos.spec 26 Mar 2010 21:01:11 -0000 1.19
@@ -3,16 +3,19 @@
Summary: A set of tools to gather troubleshooting information from a system
Name: sos
Version: 1.9
-Release: 1%{?dist}
+Release: 3%{?dist}
Group: Applications/System
Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: http://fedorahosted.org/sos
-BuildRequires: python-devel, python-setuptools
+BuildRequires: python-devel
+BuildRequires: gettext
Requires: libxml2-python
-Requires: tar, bzip2, xz
+Requires: tar
+Requires: bzip2
+Requires: xz
Provides: sysreport = 1.4.3-13
Obsoletes: sysreport
@@ -26,34 +29,33 @@ support technicians and developers.
%setup -q
%build
-%{__python} setup.py build
+make
%install
rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/rhsupport.pub
-install -D -m644 extras/sysreport/sysreport.legacy ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/sysreport
-%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}
-ln -s /usr/sbin/sosreport ${RPM_BUILD_ROOT}/usr/sbin/sysreport
-%find_lang %{name}
+make DESTDIR=${RPM_BUILD_ROOT} install
+%find_lang %{name} || echo 0
%clean
rm -rf ${RPM_BUILD_ROOT}
%files -f %{name}.lang
%defattr(-,root,root,-)
-%{_bindir}/rh-upload
%{_sbindir}/sosreport
-%{_sbindir}/sysreport
-%{_sbindir}/sysreport.legacy
%{_datadir}/%{name}
-%{_datadir}/sysreport
%{python_sitelib}/*
-%{_mandir}/man1/sosreport.1.gz
-%doc README README.rh-upload TODO LICENSE ChangeLog docs/*
+%{_mandir}/man1/*
+%doc README README.rh-upload TODO LICENSE ChangeLog doc/*
%config(noreplace) %{_sysconfdir}/sos.conf
%changelog
-* Wed Feb 17 2010 Adam Stokes <ajs at redhat dot com> = 1.9-1
+* Fri Mar 26 2010 Adam Stokes <ajs at redhat dot com> = 1.9-3
+- fix setup.py to autocompile translations and man pages
+
+* Fri Mar 19 2010 Adam Stokes <ajs at redhat dot com> = 1.9-2
+- updated translations
+
+* Thu Mar 04 2010 Adam Stokes <ajs at redhat dot com> = 1.9-1
- version bump 1.9
- replaced compression utility with xz
- strip threading/multiprocessing
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources 17 Feb 2010 16:32:41 -0000 1.13
+++ sources 26 Mar 2010 21:01:11 -0000 1.14
@@ -1 +1 @@
-69114b93abd2b148bfb13980c6c3c33e sos-1.9.tar.gz
+e8158cb99e40eedbe745497d99fba446 sos-1.9.tar.gz
More information about the scm-commits
mailing list