From e70bb8ec1393ca1afb6c983c2895908eff5e7558 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Fedora Unity)" Date: Tue, 22 Jul 2008 00:14:52 +0200 Subject: Other then the license issue in ticket #15, rpmlint is now silent for genome-bootstrap --- genome-bootstrap/Makefile | 3 +++ genome-bootstrap/extra/genome-bootstrap.spec | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/genome-bootstrap/Makefile b/genome-bootstrap/Makefile index 3fc132e..b8a4bdb 100644 --- a/genome-bootstrap/Makefile +++ b/genome-bootstrap/Makefile @@ -22,6 +22,9 @@ _RPM_OPTS = --define "_topdir $(RPM_TOPDIR)" \ RPM_OPTS = $(strip $(_RPM_OPTS)) rpm: clean gem $(RPM_TOPDIR) $(SPECFILE) + $(RPMBUILD) --clean $(RPM_OPTS) -ba $(SPECFILE) + +srpm: clean gem $(RPM_TOPDIR) $(SPECFILE) $(RPMBUILD) --clean $(RPM_OPTS) -bs $(SPECFILE) gem: diff --git a/genome-bootstrap/extra/genome-bootstrap.spec b/genome-bootstrap/extra/genome-bootstrap.spec index b62e82d..7f6eef0 100644 --- a/genome-bootstrap/extra/genome-bootstrap.spec +++ b/genome-bootstrap/extra/genome-bootstrap.spec @@ -10,6 +10,7 @@ Version: 1.0.0 Release: 8%{?dist} Group: Development/Languages License: Ruby License/GPL +URL: http://genome.et.redhat.com Source0: %{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) Requires: rubygems @@ -22,9 +23,7 @@ BuildRequires: rubygems BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} Obsoletes: genome-bootstrap -Obsoletes: rake -Obsoletes: highline -Obsoletes: rubyforge +Provides: genome-bootstrap %description Tool for bootstrapping the puppet configuration on machine images @@ -39,8 +38,8 @@ Tool for bootstrapping the puppet configuration on machine images mkdir -p %{buildroot}%{gemdir} gem install --local --install-dir %{buildroot}%{gemdir} --force --rdoc %{SOURCE0} mkdir -p %{buildroot}/%{_bindir} -mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} -rmdir %{buildroot}%{gemdir}/bin +cp %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} +rm -rf %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x %clean @@ -55,3 +54,7 @@ find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x %doc %{geminstdir}/README %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec + +%changelog +* Tue Jul 22 2008 Jeroen van Meeuwen - 1.0.0-8 +- Initial build -- cgit