rpms/facter/devel facter-1.5.4-libperms.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 facter.spec, 1.12, 1.13 sources, 1.9, 1.10

Todd M. Zullinger tmz at fedoraproject.org
Tue Mar 3 03:28:39 UTC 2009


Author: tmz

Update of /cvs/extras/rpms/facter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21517

Modified Files:
	.cvsignore facter.spec sources 
Added Files:
	facter-1.5.4-libperms.patch 
Log Message:
Update to 1.5.4

- Use upstream install script


facter-1.5.4-libperms.patch:

--- NEW FILE facter-1.5.4-libperms.patch ---
diff -up facter-1.5.4/install.rb.libperms facter-1.5.4/install.rb
--- facter-1.5.4/install.rb.libperms	2008-09-08 23:00:03.000000000 -0400
+++ facter-1.5.4/install.rb	2009-02-28 14:15:53.000000000 -0500
@@ -93,7 +93,7 @@ def do_libs(libs, strip = 'lib/')
     op = File.dirname(olf)
     File.makedirs(op, true)
     File.chmod(0755, op)
-    File.install(lf, olf, 0755, true)
+    File.install(lf, olf, 0644, true)
   end
 end
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Sep 2008 06:40:51 -0000	1.9
+++ .cvsignore	3 Mar 2009 03:28:08 -0000	1.10
@@ -1 +1 @@
-facter-1.5.2.tgz
+facter-1.5.4.tgz


Index: facter.spec
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/facter.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- facter.spec	24 Feb 2009 16:03:41 -0000	1.12
+++ facter.spec	3 Mar 2009 03:28:08 -0000	1.13
@@ -5,12 +5,14 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.2
-Release: 2%{?dist}
+Version: 1.5.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
+# http://github.com/reductivelabs/facter/commit/75db918c37a9fef36c829105d1f8a99ff8bcf751
+Patch0: facter-1.5.4-libperms.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
 BuildArch: noarch
@@ -30,26 +32,13 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .libperms
 
 %build
-sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist
-%{__install} -d -m0755 %{buildroot}%{_bindir}
-%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
-
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
-%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util
-%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist
-%{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
+ruby install.rb --destdir=%{buildroot} --quick --no-rdoc
 
 %clean
 rm -rf %{buildroot}
@@ -64,6 +53,10 @@
 
 
 %changelog
+* Sat Feb 28 2009 Todd Zullinger <tmz at pobox.com> - 1.5.4-1
+- New version
+- Use upstream install script
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/facter/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Sep 2008 06:40:52 -0000	1.9
+++ sources	3 Mar 2009 03:28:08 -0000	1.10
@@ -1 +1 @@
-3d257bc2755217690fca868c0fa0cc7b  facter-1.5.2.tgz
+0df92b81606f8e23bdd1f2ade597049b  facter-1.5.4.tgz




More information about the fedora-extras-commits mailing list