From 17f0c69e50328462d004c9e6fb6578a3a05053ae Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Jun 18 2014 23:14:55 +0000 Subject: enforce install class && setup the right eula path --- diff --git a/SOURCES/anaconda-centos-add-centos-install-class.patch b/SOURCES/anaconda-centos-add-centos-install-class.patch index 95e7865..242ff46 100644 --- a/SOURCES/anaconda-centos-add-centos-install-class.patch +++ b/SOURCES/anaconda-centos-add-centos-install-class.patch @@ -32,8 +32,8 @@ diff -uNr anaconda-19.31.79__orig/pyanaconda/installclasses/centos.py anaconda-1 + # name has underscore used for mnemonics, strip if you dont need it + id = "centos" + name = N_("CentOS Linux") -+ sortPriority = 5000 -+ if not productName.startswith("CentOS "): ++ sortPriority = 25000 ++ if productName.startswith("Red Hat ") or productName.startswith("Fedora "): + hidden = 1 + + defaultFS = "xfs" diff --git a/SOURCES/anaconda-centos-set-right-eula-location.patch b/SOURCES/anaconda-centos-set-right-eula-location.patch new file mode 100644 index 0000000..e33eb4e --- /dev/null +++ b/SOURCES/anaconda-centos-set-right-eula-location.patch @@ -0,0 +1,12 @@ +diff -uNr anaconda-19.31.79__orig/pyanaconda/constants.py anaconda-19.31.79/pyanaconda/constants.py +--- anaconda-19.31.79__orig/pyanaconda/constants.py 2014-04-29 01:45:59.000000000 +0100 ++++ anaconda-19.31.79/pyanaconda/constants.py 2014-06-18 23:42:35.944668381 +0100 +@@ -50,7 +50,7 @@ + productArch = product.productArch + bugzillaUrl = product.bugUrl + isFinal = product.isFinal +-eulaLocation = "/usr/share/redhat-release/EULA" ++eulaLocation = "/usr/share/centos-release/EULA" + + # for use in device names, eg: "fedora", "rhel" + shortProductName = productName.lower() diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index f57ed43..2aa1f84 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 19.31.79 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -14,7 +14,8 @@ URL: http://fedoraproject.org/wiki/Anaconda # ./autogen.sh # make dist Source0: %{name}-%{version}.tar.bz2 -Patch1: anaconda-centos-add-centos-install-class.patch +Patch1000: anaconda-centos-add-centos-install-class.patch +Patch1001: anaconda-centos-set-right-eula-location.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -188,7 +189,8 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %setup -q -%patch1 -p1 +%patch1000 -p1 +%patch1001 -p1 %build %configure --disable-static \ @@ -261,6 +263,11 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Jun 18 2014 Karanbir Singh - 19.31.79-1.el7.centos.2 +- make centos.py the default installclass if its not RHEL/Fedora being built +- use the right path for the EULA string ( #7165 bstinson ) +- use patch numbers greater than 1000, just in case + * Mon Jun 16 2014 Karanbir Singh - 19.31.79-1.el7.centos.1 - Add patch to inject CentOS install class, and make it default