rename package to "fpm"

pld-linux · Aug 10, 2015 · 73f3539 · 73f3539
1 parent 44e2d7b
commit 73f3539
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/ruby-fpm.spec → fpm.spec b/ruby-fpm.spec → fpm.spec
@@ -2,14 +2,13 @@
 # Conditional build:
 %bcond_with	tests		# build without tests
 
-%define	pkgname	fpm
 Summary:	fpm - package building and mangling
-Name:		ruby-%{pkgname}
+Name:		fpm
 Version:	1.4.0
-Release:	2
+Release:	1
 License:	MIT-like
 Group:		Development/Languages
-Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
+Source0:	http://rubygems.org/downloads/%{name}-%{version}.gem
 # Source0-md5:	4d82b0484db150928330b04bb44c92a2
 Patch0:		templates.patch
 URL:		https://github.com/jordansissel/fpm
@@ -34,6 +33,7 @@ Requires:	ruby-clamp >= 0.6
 Requires:	ruby-ffi
 Requires:	ruby-json >= 1.7.7
 Suggests:	rpm-build
+Obsoletes:	ruby-fpm <= 1.4.0-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,7 +43,7 @@ debs, solaris packages and more. Win at package management without
 wasting pointless hours debugging bad rpm specs!
 
 %prep
-%setup -q -n %{pkgname}-%{version}
+%setup -q
 %patch0 -p1
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
 
@@ -59,15 +59,15 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_specdir},%{_bindir}}
 cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 cp -a bin/* $RPM_BUILD_ROOT%{_bindir}
-cp -a templates $RPM_BUILD_ROOT%{ruby_vendorlibdir}/%{pkgname}
-cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
+cp -a templates $RPM_BUILD_ROOT%{ruby_vendorlibdir}/%{name}
+cp -p %{name}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/fpm
-%{ruby_vendorlibdir}/%{pkgname}.rb
-%{ruby_vendorlibdir}/%{pkgname}
-%{ruby_specdir}/%{pkgname}-%{version}.gemspec
+%{ruby_vendorlibdir}/%{name}.rb
+%{ruby_vendorlibdir}/%{name}
+%{ruby_specdir}/%{name}-%{version}.gemspec