[bzr] Let bzr and bsr-doc own %{_pkgdocdir} (RHBZ #1113236).
corsepiu
corsepiu at fedoraproject.org
Fri Jun 27 02:40:39 UTC 2014
commit ac8735dcb946e1eb0b1143de13fd4b924e7c46ea
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Fri Jun 27 04:40:35 2014 +0200
Let bzr and bsr-doc own %{_pkgdocdir} (RHBZ #1113236).
- Fix bogus %changelog timestamps.
- Restore %release tag having been broken by Fedora_21_Mass_Rebuild.
bzr.spec | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/bzr.spec b/bzr.spec
index 989878d..baf6a08 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -18,11 +18,11 @@
%global bzrmajor 2.6
%global bzrminor .0
#global bzrrc b6
-%global release 3
+%global release 4
Name: bzr
Version: %{bzrmajor}%{?bzrminor}
-Release: %{release}%{?bzrrc:.}%{?bzrrc}%{?dist}.1
+Release: %{release}%{?bzrrc:.}%{?bzrrc}%{?dist}
Summary: Friendly distributed version control system
Group: Development/Tools
@@ -133,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f bzr.lang
%defattr(-,root,root,-)
+%dir %{_pkgdocdir}
%doc %{_pkgdocdir}/NEWS
%doc %{_pkgdocdir}/README
%doc %{_pkgdocdir}/TODO
@@ -149,6 +150,7 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(-,root,root,-)
+%dir %{_pkgdocdir}
%doc %{_pkgdocdir}/*
%exclude %{_pkgdocdir}/NEWS
%exclude %{_pkgdocdir}/README
@@ -157,10 +159,15 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_pkgdocdir}/contrib/
%changelog
+* Fri Jun 27 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.6.0-4
+- Let bzr and bsr-doc own %%{_pkgdocdir} (RHBZ #1113236).
+- Fix bogus %%changelog timestamps.
+- Restore %%release tag having been broken by Fedora_21_Mass_Rebuild.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-* Tue Aug 6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - -
+* Tue Aug 6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6.0-2
- Move the documentation in the bzr-doc subpackage into _pkgdocdir. This is
a cleanup prompted by
https://fedoraproject.org/wiki/Changes/UnversionedDocdirs but in addition to
@@ -275,11 +282,11 @@ rm -rf $RPM_BUILD_ROOT
* Wed Sep 29 2010 jkeating - 2.2.1-3
- Rebuilt for gcc bug 634757
-* Sun Sep 21 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.2.1-2
+* Tue Sep 21 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.2.1-2
- Backport bzr.dev rev 5439 change fixing lp: branch references
(Toshio Kuratomi)
-* Sun Sep 21 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.2.1-1
+* Tue Sep 21 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.2.1-1
- Upstream 2.2.1 bugfix release
* Sat Aug 21 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.2.0-1
@@ -424,7 +431,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.1-0.1.rc2
- New upstream bugfix release.
-* Thu May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5-2
+* Wed May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5-2
- Upload tarball.
* Wed May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5-1
@@ -440,7 +447,7 @@ rm -rf $RPM_BUILD_ROOT
- Paramiko/sftp backport from 1.4.0. bz#444325
- Update to 1.3.1 final.
-* Sat Apr 4 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.3.1-0.1.rc1
+* Sat Apr 5 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.3.1-0.1.rc1
- Update to 1.3.1rc1 to fix a bug when you have a pack based remote repo and
knit based local branch.
More information about the scm-commits
mailing list