From 3a0ed30cca1639d532fec2a146c32335617c9c8f Mon Sep 17 00:00:00 2001 From: Martin Gracik Date: Fri, 17 Dec 2010 17:04:04 +0100 Subject: [PATCH] Setup and spec file changes Added the license files and executable. Marked lorax.conf as config. --- lorax.spec | 30 +++++++++++++++++++----------- setup.py | 4 +++- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/lorax.spec b/lorax.spec index 8ba9765e..5337c1f3 100644 --- a/lorax.spec +++ b/lorax.spec @@ -7,11 +7,25 @@ Group: Applications/System License: GPLv2+ URL: http://git.fedorahosted.org/git/?p=lorax.git Source0: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch BuildRequires: python-setuptools -Requires: python +Requires: python2-devel Requires: python-mako +Requires: gawk +Requires: glibc-common +Requires: cpio +Requires: module-init-tools +Requires: device-mapper +Requires: findutils +Requires: GConf2 +Requires: isomd5sum +Requires: syslinux +Requires: glibc +Requires: util-linux-ng +Requires: dosfstools +Requires: genisoimage +Requires: parted %description Lorax is a tool for creating the anaconda install images. @@ -19,30 +33,24 @@ Lorax is a tool for creating the anaconda install images. %prep %setup -q - %build %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install - -%clean -rm -rf $RPM_BUILD_ROOT - - %files %defattr(-,root,root,-) -%doc +%doc COPYING AUTHORS %{python_sitelib}/pylorax %{python_sitelib}/*.egg-info +%{_sbindir}/lorax %dir %{_sysconfdir}/lorax -%{_sysconfdir}/lorax/lorax.conf +%config %{_sysconfdir}/lorax/lorax.conf %dir %{_datadir}/lorax %{_datadir}/lorax/* - %changelog * Wed Dec 01 2010 Martin Gracik 0.1-1 - First packaging of the new lorax tool. diff --git a/setup.py b/setup.py index 5b936030..e0266512 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,9 @@ for root, dnames, fnames in os.walk("share"): data_files.append((root.replace("share", "/usr/share/lorax", 1), [os.path.join(root, fname)])) +# executable +data_files.append(("/usr/sbin", ["src/sbin/lorax"])) + setup(name="lorax", version="0.1", description="Lorax", @@ -25,6 +28,5 @@ setup(name="lorax", license="GPLv2+", packages=["pylorax"], package_dir={"" : "src"}, - #scripts=["src/bin/lorax"], data_files=data_files )