From d8754969d82925c4b0691e158431b6799d14e0c3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Feb 24 2015 16:46:37 +0000 Subject: make the /etc/os-release symlink relative rhbz#1192276 --- diff --git a/fedora-release.spec b/fedora-release.spec index 77286fb..b3c481e 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -5,7 +5,7 @@ Summary: Fedora release files Name: fedora-release Version: 23 -Release: 0.2 +Release: 0.3 License: MIT Group: System Environment/Base URL: http://fedoraproject.org @@ -123,7 +123,7 @@ REDHAT_SUPPORT_PRODUCT_VERSION=%{bug_version} PRIVACY_POLICY=https://fedoraproject.org/wiki/Legal:PrivacyPolicy EOF -ln -s /usr/lib/os-release $RPM_BUILD_ROOT/etc/os-release +ln -s ../usr/lib/os-release $RPM_BUILD_ROOT/etc/os-release # Set up the dist tag macros install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d @@ -195,6 +195,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.override %changelog +* Tue Feb 24 2015 Dennis Gilmore - 23-0.3 +- make the /etc/os-release symlink relative rhbz#1192276 + * Tue Feb 10 2015 Dennis Gilmore 23-0.2 - bump @@ -202,345 +205,3 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - Setup for rawhide targetting f23 - Add PRIVACY_POLICY_URL to os-release (rhbz#1182635) - Move os-release to /usr/lib and symlink to etc (rhbz#1149568) - -* Thu Nov 20 2014 Kalev Lember - 22-0.10 -- Ship an override file to enable the gnome-shell background logo extension - in Workstation (#1161637) -- fix up handling of schema file from inccorect initail handling - dennis - -* Tue Nov 18 2014 Dennis Gilmore - 22-0.9 -- drop Requires on system-release-product rhbz#1156198 - -* Mon Oct 06 2014 Ray Strode 22-0.8 -- Rename fedora-release-standard to fedora-release-nonproduct - following discussion on list and irc - -* Fri Oct 03 2014 Stephen Gallagher 22-0.7 -- Add system-release-product virtual Provides and Requires - -* Tue Sep 30 2014 Josh Boyer - 22-0.6 -- Add requires for captive portal to Workstation - -* Mon Aug 04 2014 Dennis Gilmore - 22-0.5 -- reapply presets after installing - -* Wed Jul 23 2014 Dennis Gilmore - 22-0.4 -- add patch from https://fedorahosted.org/rel-eng/ticket/5947 for server - -* Mon Jul 14 2014 Stephen Gallagher 22-0.3 -- Add systemd preset file for Fedora Server -- Add requirement on Cockpit - -* Sat Jul 12 2014 Tom Callaway 22-0.2 -- fix license handling - -* Tue Jul 08 2014 Dennis Gilmore 22-0.1 -- setup for rawhide targeting f22 - -* Tue Jul 08 2014 Stephen Gallagher 21-0.8 -- Provide new release file metapackages for Fedora Products -- drop .repo files and gpg keys (dennis) -- Require fedora-repos - -* Sat Jun 07 2014 Fedora Release Engineering - 21-0.7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat May 10 2014 Dennis Gilmore - 21-0.6 -- update Fedora-Legal-README.txt with updates from legal rhbz#1096434 -- Change license to MIT to reflect the change in the fedora compilation -- based on reccomendations from Red Hat Legal rhbz#1096434 - -* Wed Feb 17 2014 Dennis Gilmore - 21-0.5 -- provide system-release(%%version) rhbz#1047058 - -* Mon Jan 13 2014 Dennis Gilmore - 21-0.4 -- set metadata expiry to 12 hours as dnf defaults to something silly bz#1045678 - -* Sat Dec 28 2013 Ville Skyttä - 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 - 21-0.2 -- remove f20 keys add f21 -- patch from Will Woods to use a archmap file for linking gpg keys -- add fields to /etc/os-release for rhbz#951119 -- set skip_if_unavailable=False for rhbz#985354 - -* Tue Aug 20 2013 Dennis Gilmore - 21-0.1 -- setup for f21 rawhide - -* Wed Jul 31 2013 Dennis Gilmore - 20-0.4 -- link armhfp gpg key to primary since its now living there - -* Mon Jul 08 2013 Dennis Gilmore - 20-0.3 -- fix up typo - -* Wed Jun 19 2013 Dennis Gilmore - 20-0.2 -- add f20 keys -- switch mirrorlist= to metalink= bz#948788 -- add bugzilla fields to os-release for brokeness in abrt bz#961477 -- add releasever into gpgkey paths -- use consistent macros for dist_release value - -* Tue Mar 12 2013 Dennis Gilmore - 20-0.1 -- setup for f20 -- 64 bit arm arch is aarch64 not arm64 -- drop sparc arches - -* Wed Aug 08 2012 Dennis Gilmore - 19-0.1 -- setup for f19 - -* Mon Aug 06 2012 Dennis Gilmore - 18-0.6 -- sync up from dist-git -- replace the fedora 18 gpg keys -- bring the Fedora-Legal-README file into upstream - -* Thu Jul 19 2012 Fedora Release Engineering - 18-0.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Mar 29 2012 Tom Callaway - 18-0.4 -- add Fedora-Legal-README.txt - -* Mon Feb 27 2012 Dennis Gilmore - 18-0.3 - add CPE info to os-release file bz#790509 - -* Wed Feb 08 2012 Dennis Gilmore - 18-0.2 -- add /etc/os-release file for bz#733117 - -* Tue Jan 10 2012 Dennis Gilmore - 18-0.1 -- setup for fedora 18 -- add the fedora 18 gpg keys - -* Tue Jan 10 2012 Dennis Gilmore - 17-0.4 -- install the fedora 17 gpg keys - -* Wed Dec 28 2011 Dennis Gilmore - 17-0.3 -- symlink the secondary arch key for the armhfp and arm64 basearch - -* Tue Jul 26 2011 Dennis Gilmore - 17-0.2 -- set dist_version to 17 - -* Tue Jul 26 2011 Dennis Gilmore - 17-0.1 -- build for Fedora 17 - -* Thu Feb 10 2011 Dennis Gilmore - 16-0.1 -- Build for Fedora 16 - -* Wed Feb 09 2011 Dennis Gilmore - 15-0.5 -- Add the Fedora 15 key - -* Tue Feb 08 2011 Fedora Release Engineering - 15-0.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jul 29 2010 Jesse Keating - 15-0.1 -- Build for Fedora 15 - -* Fri Jul 23 2010 Jesse Keating - 14-0.6 -- Add the Fedora 14 key - -* Thu May 06 2010 Dennis Gilmore - 14-0.5 -- link sparc key -- drop ppc ppc64 from primary arch list - -* Tue Mar 02 2010 Jesse Keating - 14-0.4 -- When in rawhide, require the -rawhide subpackage. - -* Thu Feb 18 2010 Jesse Keating - 14-0.3 -- Fix the key path in the updates-testing repo - -* Thu Feb 18 2010 Jesse Keating - 14-0.2 -- Fix the -rawhide requires -- Fix the -rawhide files -- Switch to bz2 source - -* Mon Feb 15 2010 Jesse Keating - 14-0.1 -- Update for Fedora 14 -- Move the rawhide repo file to it's own subpackage - -* Tue Jan 19 2010 Jesse Keating - 13-0.3 -- Put the right key in the key file this time - -* Tue Jan 19 2010 Jesse Keating - 13-0.2 -- Add the key for Fedora 13 - -* Thu Aug 27 2009 Jesse Keating - 13-0.1 -- Bump for Fedora 13's rawhide. -- Put the version at 13 from the start. - -* Fri Aug 07 2009 Jesse Keating - 11.91-3 -- Bump for new tarball - -* Fri Aug 07 2009 Jesse Keating - 11.91-2 -- Fix the gpg key file name - -* Fri Aug 07 2009 Jesse Keating - 11.91-1 -- Update for F12-Alpha -- Replace F11 key with F12 -- Drop old keys and inactive secondary arch keys -- Fix metalink urls to be https -- Drop the compose stuff - -* Mon Mar 30 2009 Jesse Keating - 11.90-1 -- Build for F12 collection - -* Mon Mar 09 2009 Jesse Keating - 10.92-1 -- Bump for F11 Beta -- Add the (giant) F11 Test key - -* Thu Mar 05 2009 Jesse Keating - 10.91-4 -- Drop req on fedora-release-notes (#483018) - -* Tue Mar 03 2009 Jesse Keating - 10.91-3 -- Move metalink urls to mirrorlist for helping anaconda - -* Tue Feb 24 2009 Fedora Release Engineering - 10.91-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 04 2009 Jesse Keating - 10.91-1 -- Use the correct CPE name (#481287) - -* Wed Jan 21 2009 Jesse Keating - 10.91-1 -- Update for Fedora 11 Alpha -- Use metalink urls to get mirror information - -* Wed Oct 01 2008 Jesse Keating - 10.90-1 -- Initial build for Fedora 11. - -* Mon Sep 15 2008 Jesse Keating - 9.91-1 -- Update for Fedora 10 beta -- Add the new keys for F10 -- Remove F8/9 keys -- Update compose configs -- Clarify rawhide repo definition - -* Wed Jun 11 2008 Jesse Keating - 9.90-2 -- Package up the ia64 key as the first secondary arch -- Mark config files correctly -- Stop using download.fedora.redhat.com and use download.fedoraproject.org instead - -* Mon Mar 31 2008 Jesse Keating - 9.90-1 -- Update for Fedora 10 rawhide. - -* Thu Mar 13 2008 Jesse Keating - 8.92-1 -- Update for 9 Beta -- Update the compose files for 9 Beta -- Add system-release-cpe (from Mark Cox) -- Add terminal to issue (#436387) -- Rename development to rawhide where appropriate. - -* Wed Oct 10 2007 Jesse Keating - 8.90-3 -- Bump for cvs oopsie - -* Wed Oct 10 2007 Jesse Keating - 8.90-2 -- Add the gpg info to the devel repo - -* Wed Oct 03 2007 Jesse Keating - 8.90-1 -- First build for Fedora 9 development. - -* Fri Sep 28 2007 Jesse Keating - 7.92-1 -- Bump for F8 Test2. -- Package up the compose kickstart files - -* Fri Sep 14 2007 Jesse Keating - 7.91-2 -- Use failovermethod=priority in yum configs (243698) - -* Thu Aug 30 2007 Jesse Keating - 7.91-1 -- Provide system-release, useful for spinoffs. -- Also link system-release to fedora-release for file level checks -- Bump for F8 Test2 -- Fix license tag - -* Fri Jul 27 2007 Jesse Keating - 7.90-1 -- Bump for F8 Test1 - -* Thu Jun 28 2007 Jesse Keating - 7.89-3 -- Cleanups from review -- Don't (noreplace) the dist tag macro file - -* Tue Jun 19 2007 Jesse Keating - 7.89-2 -- Define the dist macros in this package since we define everyting else here - -* Wed May 30 2007 Jesse Keating - 7.89-1 -- And we're back to rawhide. Re-enable devel repos - -* Thu May 24 2007 Jesse Keating - 7-3 -- We have a name! -- Require the newer release notes - -* Mon May 21 2007 Jesse Keating - 7-2 -- Use Everything in the non-mirror URL to the release tree - -* Mon May 21 2007 Jesse Keating - 7-1 -- First build for Fedora 7 -- Remove Extras repos (YAY!) -- Remove references to "core" in repo files. -- Adjust repo files for new mirror structure -- Remove Legacy repo - -* Fri Apr 20 2007 Jesse Keating - 6.93-1 -- Bump for Test 4 - -* Mon Mar 19 2007 Jesse Keating - 6.92-1 -- Bump for Test 3 -- No more eula in fedora-release, moved to firstboot - -* Fri Feb 23 2007 Jesse Keating - 6.91-1 -- Bump for Test 2 - -* Tue Feb 13 2007 Jesse Keating - 6.90-4 -- Specfile cleanups - -* Mon Feb 05 2007 Jesse Keating - 6.90-3 -- Drop the legacy repo file. - -* Fri Jan 26 2007 Jesse Keating - 6.90-2 -- Core? What Core? - -* Wed Jan 24 2007 Jeremy Katz - 6.90-1 -- Bump to 6.90. Keep working with older release notes - -* Mon Oct 16 2006 Jesse Keating - 6-89 -- Keep version 6, bump release. Saves from having to rebuild - release notes all the time - -* Sun Oct 15 2006 Jesse Keating - 6.89-1 -- Rebuild for rawhide - -* Thu Oct 12 2006 Jesse Keating - 6-3 -- version has to stay the same, safe to use. - -* Thu Oct 5 2006 Jesse Keating - 6-2 -- replace old mirror files with new mirrorlist cgi system - -* Thu Oct 5 2006 Jesse Keating - 6-1 -- Rebuild for Fedora Core 6 release - -* Tue Sep 5 2006 Jesse Keating - 5.92-1 -- Bump for FC6 Test3 - -* Thu Jul 27 2006 Jesse Keating - 5.91.1-1 -- Convert deprecated gtk calls. (#200242) -- Fix some of the versioning - -* Sun Jul 23 2006 Jesse Keating - 5.91-4 -- Bump for FC6 Test2 -- Remove release-notes content, now standalone package -- Don't replace issue and issue.net if the end user has modified it -- Require fedora-release-notes -- Cleanups - -* Mon Jun 19 2006 Jesse Keating - 5.90-3 -- Cleanups - -* Thu Jun 15 2006 Jesse Keating - 5.90-1 -- Update for 5.90 - -* Wed May 24 2006 Jesse Keating - 5.89-rawhide.2 -- Update to get new devel repo file -- merge minor changes from external cvs .spec file - -* Wed Apr 19 2006 Jesse Keating - 5.89-rawhide.1 -- Look, a changelog! -- Removed duplicate html/css content from doc dir. -- Add lynx as a buildreq - diff --git a/sources b/sources index f94a7cb..c9b49ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e42ca568c0059576c7a57c8af62d8b4c fedora-release-23.tar.bz2 +3df6d598c8775c0f88ffa6fab390f461 fedora-release-23.tar.bz2