From 5a6eaeec08f29af51b1fa217414654f03bf180c9 Mon Sep 17 00:00:00 2001 From: Robert Rati <rrati@redhat.com> Date: Tue, 3 Jan 2012 14:36:07 -0600 Subject: [PATCH 2/6] Packaging fixes --- Makefile | 2 +- condor-wallaby.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2944fea..4dbbf2d 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ SOURCES/${SOURCE}: cp -f config/* ${DIR} cp -f LICENSE-2.0.txt README ${DIR} cp -f doc/* ${DIR}/doc - tar -cf ${SOURCE} ${DIR} + tar -zcf ${SOURCE} ${DIR} mv "${SOURCE}" SOURCES clean: diff --git a/condor-wallaby.spec b/condor-wallaby.spec index 32ae554..a7a802a 100644 --- a/condor-wallaby.spec +++ b/condor-wallaby.spec @@ -33,7 +33,9 @@ Requires: python >= 2.3 Requires: python-qmf >= 0.9.1073306 Requires: python-condorutils >= 1.5-4 Requires: python-wallabyclient = %{version}-%{release}%{?dist} +%if 0%{?fedora} == 0 Obsoletes: condor-remote-configuration +%endif %description client This package provides a means to quickly and easily configure machines @@ -51,7 +53,9 @@ Requires: python-qmf >= 0.9.1073306 Requires: python-wallabyclient >= %{version}-%{release}%{?dist} Requires: PyYAML Requires: vim-minimal +%if 0%{?fedora} == 0 Obsoletes: condor-remote-configuration-server +%endif %description tools This package provides a means to quickly and easily configure machines @@ -77,6 +81,8 @@ Tools for interacting with wallaby %prep %setup -q +%build + %install rm -rf %{buildroot} mkdir -p %{buildroot}/%{python_sitelib}/wallabyclient @@ -110,7 +116,7 @@ rm -rf %{buildroot} %defattr(0755,root,root,-) %_sbindir/condor_configd %defattr(0644,root,root,-) -%config %_sysconfdir/condor/config.d/99configd.config +%_sysconfdir/condor/config.d/99configd.config %if 0%{?rhel} != 4 && 0%{?fedora} == 0 %files tools -- 1.7.6.5