fix el5 build

Merge branch 'master' into el5
2012-01-25 17:44:35 +08:00 · 2012-01-25 17:00:11 +08:00 · 2011-04-21 21:27:45 -07:00 · 2010-09-02 21:49:41 -07:00 · 2010-09-02 21:38:40 -07:00 · 2010-07-28 09:34:22 +00:00
1 changed files with 7 additions and 18 deletions
--- a/ack.spec
+++ b/ack.spec
@ -6,6 +6,7 @@ License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/ack/
 Source0:        http://www.cpan.org/modules/by-module/App/ack-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::Basename)
@ -28,6 +29,8 @@ Ack is designed as a replacement for grep.
 make

 %install
+rm -rf $RPM_BUILD_ROOT
+
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@ -41,7 +44,11 @@ cp -p etc/ack.bash_completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d
 %check
 make test

+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
+%defattr(-,root,root,-)
 %doc ack-help.txt ack-help-types.txt Changes README.markdown
 %{perl_vendorlib}/*
 %{_bindir}/ack
@ -59,27 +66,9 @@ make test
 * Thu Apr 21 2011  <ianburrell@gmail.com> - 1.94-1
 - Update to 1.94

-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.92-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Aug  4 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.92-2
- rebuild with perl-5.12.1 again
-
 * Wed Jun 16 2010 Ian Burrell <ianburrell@gmail.com> - 1.92-1
 - Update to 1.92

-* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.86-5
- Mass rebuild with perl-5.12.0
-
-* Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.86-4
- rebuild against perl 5.10.1
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.86-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.86-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Sat Aug 23 2008 Ian Burrell <ianburrell@gmail.com> - 1.86-1
 - Update to 1.86
Author	SHA1	Message	Date
Robin Lee	9376a54791	fix el5 build	2012-01-25 17:44:35 +08:00
Robin Lee	02a847b2e1	Merge branch 'master' into el5	2012-01-25 17:00:11 +08:00
Ian Burrell	30e4944124	Merge branch 'master' into el5 * master: Remove README Update to 1.94 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild Conflicts: .gitignore ack.spec	2011-04-21 21:27:45 -07:00
Ian Burrell	657f81b17b	Merge branch 'el6' into el5 * el6: * Wed Aug 4 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.92-2 - rebuild with perl-5.12.1 again dist-git conversion dist-git conversion Update to 1.92 - Mass rebuild with perl-5.12.0 Initialize branch EL-6 for ack - rebuild against perl 5.10.1 Fix typo that causes a failure to update the common directory. (releng #2781) Fix typo that causes a failure to update the common directory. (releng #2781) - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Update to 1.86 update to 1.78 Rebuild for new perl Update to 1.76 Update to 1.64; add Test::More to BuildRequires Disable tests Update to 1.62; enable tests add BuildRequires perl(ExtUtils::MakeMaker) update to 1.60 Conflicts: ack.spec sources	2010-09-02 21:49:41 -07:00
Ian Burrell	1dcd44942b	Merge branch 'f14' into el6 * f14: * Wed Aug 4 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.92-2 - rebuild with perl-5.12.1 again dist-git conversion Update to 1.92 - Mass rebuild with perl-5.12.0 - rebuild against perl 5.10.1 Fix typo that causes a failure to update the common directory. (releng #2781) Conflicts: .gitignore	2010-09-02 21:38:40 -07:00
Fedora Release Engineering	05c56af663	dist-git conversion	2010-07-28 09:34:22 +00:00
Fedora Release Engineering	899312bc4f	dist-git conversion	2010-07-28 09:34:19 +00:00
Dennis Gilmore	3d27b582fd	Initialize branch EL-6 for ack	2010-05-08 01:42:26 +00:00
Bill Nottingham	0144a859c1	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:24:43 +00:00
Bill Nottingham	10097331bd	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:24:42 +00:00
Ian Burrell	b0738478b7	Update to 1.86	2008-08-23 23:57:01 +00:00
Ian Burrell	b3866d3de4	update to 1.78	2008-03-24 18:14:37 +00:00
Ian Burrell	1a3403ff30	Update to 1.76	2008-01-17 21:05:08 +00:00
Warren Togami	43dff7aab4	Initialize branch EL-5 for ack	2007-08-29 20:20:04 +00:00
Ian Burrell	a94bd75adb	Update to 1.64; add BuildRequires Test::More	2007-08-16 23:45:36 +00:00
Ian Burrell	e374c49f0f	Update to 1.62; merge from devel	2007-06-19 05:14:15 +00:00
Ian Burrell	26c8d4d6b2	merge from devel	2007-05-15 16:52:54 +00:00