[rpms/fedora-release] f45: set metadata expiry to 12 hours as dnf defaults to something silly bz#1045678

[rpms/fedora-release] f45: set metadata expiry to 12 hours as dnf defaults to something silly bz#1045678

[Dennis Gilmore]

A new commit has been pushed.

Repo   : rpms/fedora-release
Branch : f45
Commit : b1e9816b22964177bd82a23026c8bd135afc4926
Author : Dennis Gilmore <dennis@ausil.us>
Date   : 2014-01-13T21:44:36-06:00
Stats  : +13/-6 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/fedora-release/c/b1e9816b22964177bd82a23026c8bd135afc4926?branch=f45

Log:
set metadata expiry to 12 hours as dnf defaults to something silly bz#1045678

---
diff --git a/fedora-release.spec b/fedora-release.spec
index 1fcc216..b4b5a95 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -5,7 +5,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        21
-Release:        0.2
+Release:        0.4
 License:        GPLv2
 Group:          System Environment/Base
 URL:            http://fedoraproject.org
@@ -90,8 +90,8 @@ for file in fedora*repo ; do
 done
 
 # Set up the dist tag macros
-install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
-cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
+install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d
+cat >> $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.dist << EOF
 # dist macros.
 
 %%fedora                %{dist_version}
@@ -115,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/yum.repos.d/fedora-updates*.repo
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
-%config %attr(0644,root,root) /etc/rpm/macros.dist
+%attr(0644,root,root) %{_rpmconfigdir}/macros.d/macros.dist
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
@@ -124,6 +124,13 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 
 %changelog
+* Mon Jan 13 2014 Dennis Gilmore <dennis@ausil.us> - 21-0.4
+- set metadata expiry to 12 hours as dnf defaults to something silly bz#1045678
+
+* Sat Dec 28 2013 Ville Skyttä <ville.skytta@iki.fi> - 21-0.3
+- Install macros.dist as non-%%config to %%{_rpmconfigdir}/macros.d (#846679).
+- Fix bogus date in %%changelog.
+
 * Wed Nov 13 2013 Dennis Gilmore <dennis@ausil.us> - 21-0.2
 - remove f20 keys add f21
 - patch from Will Woods to use a archmap file for linking gpg keys
@@ -314,7 +321,7 @@ rm -rf $RPM_BUILD_ROOT
 - Bump for F8 Test2
 - Fix license tag
 
-* Thu Jul 27 2007 Jesse Keating <jkeating@redhat.com> - 7.90-1
+* Fri Jul 27 2007 Jesse Keating <jkeating@redhat.com> - 7.90-1
 - Bump for F8 Test1
 
 * Thu Jun 28 2007 Jesse Keating <jkeating@redhat.com> - 7.89-3

diff --git a/sources b/sources
index 52c74cd..9f8bd9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a29757d2a0895e08019b014c4055cd9c  fedora-release-21.tar.bz2
+048181b0313100c7120da828e9c88191  fedora-release-21.tar.bz2