- mainly changes to the building process of sos

- altered spec file to conform to fedora guidelines


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@546 ef72aa8b-4018-0410-8976-d6e080ef94d8

4 files changed, 20 insertions, 12 deletions

diff --git a/src/MANIFEST.in b/src/MANIFEST.in
index 6755b997..b9309c6b 100644
--- a/src/MANIFEST.in
+++ b/src/MANIFEST.in
@@ -1,9 +1,9 @@
 recursive-include locale *.mo
 recursive-include extras *
 include sosreport*
-include README
+include README*
 include LICENSE
-include READ.rh-upload-core
 include TODO
-include rhsupport.pub
+include ChangeLog
+include gpgkeys/*.pub
 include sos.conf
\ No newline at end of file
diff --git a/src/Makefile b/src/Makefile
index fae3f476..1fd60c81 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,7 +28,7 @@ tarball: clean mo gpgkey
 	@python setup.py sdist -d $(TMPDIR)
 	@cp {$(SOURCE1),$(SOURCE2),$(SOURCE3)} $(TMPDIR)
 	@mkdir $(PWD)/dist
-	@mv $(TMPDIR)/* $(PWD)/dist
+	@cp $(TMPDIR)/* $(PWD)/dist
 	@echo " "
 	@echo "The final archive is $(PWD)/dist/"
 
diff --git a/src/setup.py b/src/setup.py
index 55125d8d..f5fa60d8 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -16,7 +16,8 @@ setup(
 	package_dir = {'': 'lib',},
 	data_files = [ ('/etc', [ 'sos.conf']), 
     ('/usr/sbin', ['sosreport', 'extras/sysreport/sysreport.legacy']), 
-    ('/usr/bin', ['extras/rh-upload-core']), 
+    ('/usr/bin', ['extras/rh-upload-core']),
+    ('/usr/share/sos/',['gpgkeys/rhsupport.pub']),
     ('/usr/share/sysreport', ['extras/sysreport/text.xsl', 'extras/sysreport/functions', 'extras/sysreport/sysreport-fdisk']), 
     ('/usr/share/man/man1', ['sosreport.1.gz']),
 	('/usr/share/locale/af/LC_MESSAGES', ['locale/af/LC_MESSAGES/sos.mo']),
diff --git a/src/sos.spec b/src/sos.spec
index 891426ce..08821296 100644
--- a/src/sos.spec
+++ b/src/sos.spec
@@ -11,8 +11,11 @@ Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
 Group: Application/Tools
-Source0: %{name}-%{version}.tar.gz
-License: GPL
+Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
+Source1: sos.conf
+Source2: rhsupport.pub
+Source3: sosreport.1.gz
+License: GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Url: http://fedorahosted.org/sos
@@ -35,7 +38,7 @@ support technicians and developers.
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-#install -D -m644 rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+install -D -m644 gpgkeys/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
 
@@ -44,12 +47,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/rh-upload-core
 %{_sbindir}/sosreport
-/usr/share/sos/rhsupport.pub
-/usr/bin/rh-upload-core
-/usr/sbin/sysreport
-/usr/sbin/sysreport.legacy
+%{_sbindir}/sysreport
+%{_sbindir}/sysreport.legacy
 /usr/share/sysreport
+/usr/share/sos/rhsupport.pub
 %{python_sitelib}/sos/
 %{_mandir}/man1/sosreport.1.gz
 %{_localedir}/*/LC_MESSAGES/sos.mo
@@ -57,6 +60,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %config %{_sysconfdir}/sos.conf
 
 %changelog
+* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 1.8-4
+- spec cleanup, fixed license, source
+- reworked Makefile to build properly
+
 * Thu Oct 23 2008 Adam Stokes <astokes at redhat dot com> - 1.8-1
 - Resolves: bz459845 collect krb5.conf
 - Resolves: bz457880 include output of xm list and xm list --long