summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2012-02-15 10:56:14 -0500
committerTodd Zullinger <tmz@pobox.com>2012-02-15 10:59:23 -0500
commit0f66986cd1c5b18c3161088e581073861f16fec8 (patch)
tree3fbc8c180ce2cc2df59504cda016bfc5f2a4908f
parentc57f3832a5eb10af1ca0468e7a58e78d37368601 (diff)
downloadgit-package-0f66986cd1c5b18c3161088e581073861f16fec8.tar.gz
git-package-0f66986cd1c5b18c3161088e581073861f16fec8.tar.xz
git-package-0f66986cd1c5b18c3161088e581073861f16fec8.zip
Fix EPEL builds - rpm doesn't accept mutiple -f options in %files
While we don't push these packages to EPEL regularly, making sure they continue to build for when we do update is convenient. It also allows people running EL systems to easily stay up to date.
-rw-r--r--git.spec4
1 files changed, 3 insertions, 1 deletions
diff --git a/git.spec b/git.spec
index 7f1210d..a809837 100644
--- a/git.spec
+++ b/git.spec
@@ -418,6 +418,7 @@ desktop-file-install \
# find translations
%find_lang %{name} %{name}.lang
+cat %{name}.lang >> bin-man-doc-files
# quiet some rpmlint complaints
chmod -R g-w %{buildroot}
@@ -431,7 +432,7 @@ find contrib -type f | xargs chmod -x
rm -rf %{buildroot}
-%files -f bin-man-doc-files -f %{name}.lang
+%files -f bin-man-doc-files
%defattr(-,root,root)
%{_datadir}/git-core/
%dir %{gitcoredir}
@@ -531,6 +532,7 @@ rm -rf %{buildroot}
%changelog
* Wed Feb 15 2012 Todd Zullinger <tmz@pobox.com> - 1.7.9.1-1
- Update to 1.7.9.1
+- Fix EPEL builds (rpm doesn't accept mutiple -f options in %files)
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 1.7.9-2
- Rebuild against PCRE 8.30