aboutsummaryrefslogtreecommitdiffstats
path: root/src/sos.spec
diff options
context:
space:
mode:
authorastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2008-12-19 13:43:41 +0000
committerastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2008-12-19 13:43:41 +0000
commit9cae97215665ca7e6e69cab99286cdec3b2f2054 (patch)
treeb6aa45efd3763aa339db0a4b1a18eff16e85ef53 /src/sos.spec
parent4eded2db1f1800db48f5b8ffc7f74b446d992160 (diff)
downloadsos-9cae97215665ca7e6e69cab99286cdec3b2f2054.tar.gz
attempting to fix build process to be more sane
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@545 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src/sos.spec')
-rw-r--r--src/sos.spec17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/sos.spec b/src/sos.spec
index f686e698..891426ce 100644
--- a/src/sos.spec
+++ b/src/sos.spec
@@ -2,7 +2,7 @@
%define name sos
%define version 1.8
-%define release 3
+%define release 4
%define _localedir %_datadir/locale
@@ -11,12 +11,11 @@ Name: %{name}
Version: %{version}
Release: %{release}%{?dist}
Group: Application/Tools
-Source0: %{name}-%{version}.tar.bz2
-Source1: rhsupport.pub
+Source0: %{name}-%{version}.tar.gz
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
-Url: https://hosted.fedoraproject.org/projects/sos
+Url: http://fedorahosted.org/sos
BuildRequires: python-devel
Requires: libxml2-python
Provides: sysreport = 1.4.3-13
@@ -32,12 +31,12 @@ support technicians and developers.
%setup -q
%build
-python setup.py build
+%{__python} setup.py build
%install
rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
-python setup.py install --optimize 1 --root=$RPM_BUILD_ROOT
+#install -D -m644 rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
%clean
@@ -52,10 +51,10 @@ rm -rf ${RPM_BUILD_ROOT}
/usr/sbin/sysreport.legacy
/usr/share/sysreport
%{python_sitelib}/sos/
-%{_mandir}/man1/sosreport.1*
+%{_mandir}/man1/sosreport.1.gz
%{_localedir}/*/LC_MESSAGES/sos.mo
%doc README README.rh-upload-core TODO LICENSE ChangeLog
-%config /etc/sos.conf
+%config %{_sysconfdir}/sos.conf
%changelog
* Thu Oct 23 2008 Adam Stokes <astokes at redhat dot com> - 1.8-1