Update component for CloudRouter v3.0

Signed-off-by: John Siegrist <[email protected]>

Author: SiegristJ

…udrouter-centos-release/GNU-AGPL-3.0.txt GNU-AGPL-3.0.txtcloudrouter-centos-release/GNU-AGPL-3.0.txt renamed to GNU-AGPL-3.0.txt cloudrouter-centos-release/GNU-AGPL-3.0.txt renamed to GNU-AGPL-3.0.txt

@@ -1,23 +1,27 @@
 %define cr_display_name CloudRouter
 %define cr_name cloudrouter
-%define cr_version 2
+%define cr_version 3
+%define cr_readme README.%{cr_display_name}-Release-Notes
 # Set this to 'Beta' or 'Release' depending on what type of release is pending.
 %define release_tag Release
 
 %define base_display_name CentOS
 %define base_name centos
-%define base_version 7
+%define base_version 7.2
 
 %define project_url http://cloudrouter.org
 %define bug_url https://cloudrouter.atlassian.net/secure/Dashboard.jspa
 
 Summary:	%{cr_display_name} release files
 Name:		%{cr_name}-%{base_name}-release
 Version:	%{cr_version}
-Release:	4
+Release:	1
 License:	AGPLv3
+Source0:    %{cr_readme}
+Source1:    %{cr_readme}
+Source2:    %{cr_readme}
+
 Group:		System Environment/Base
-Source:		%{name}-%{version}.tar.gz
 Obsoletes:	redhat-release
 Obsoletes:	%{cr_name}-release
 Provides:	redhat-release
@@ -27,32 +31,39 @@ Provides:   cloudrouter-release
 BuildArch:	noarch
 Conflicts:	%{base_name}-release
 Conflicts:	cloudrouter-release-%{base_name}
-Requires:	epel-release
+Requires:   cloudrouter-repo
+Requires:   centos-repo
+Requires:   epel-release
+
 
 %description
-%{cr_display_name} release files such as yum configs and various /etc/ files that
+%{cr_display_name} release files such as the /etc/ files that
 define the release.
 
 %package notes
 Summary:	Release Notes
 License:	Open Publication
 Group:		System Environment/Base
 Provides:	system-release-notes = %{version}-%{release}
+Provides:   cloudrouter-release-notes
 Conflicts:	%{base_name}-release-notes
 
 %description notes
 CloudRouter release notes package. 
 
 %prep
-%setup -q
+#%setup -q
+
 
 %build
+echo OK
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc
 echo "%{cr_display_name} release %{version} (%{release_tag})" > $RPM_BUILD_ROOT/etc/%{cr_name}-release
-echo "cpe:/o:cloudrouter:cloudrouter:%{version}" > $RPM_BUILD_ROOT/etc/system-release-cpe
+echo "cpe:/o:%{cr_name}:%{cr_name}:%{version}" > $RPM_BUILD_ROOT/etc/system-release-cpe
 cp -p $RPM_BUILD_ROOT/etc/cloudrouter-release $RPM_BUILD_ROOT/etc/issue
 echo "Kernel \r on an \m (\l)" >> $RPM_BUILD_ROOT/etc/issue
 echo >> $RPM_BUILD_ROOT/etc/issue
@@ -67,28 +78,11 @@ ID=%{cr_name}
 VERSION_ID=%{version}
 PRETTY_NAME="%{cr_display_name} %{version} (%{release_tag})"
 ANSI_COLOR="0;34"
-CPE_NAME="cpe:/o:cloudrouter:cloudrouter:%{version}"
+CPE_NAME="cpe:/o:%{cr_name}:%{cr_name}:%{version}"
 HOME_URL="%{project_url}"
 BUG_REPORT_URL="%{bug_url}"
 EOF
 
-# Install the keys
-install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-install -m 644 RPM-GPG-KEY-%{cr_name}* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
-install -m 644 RPM-GPG-KEY-%{base_display_name}* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
-
-# and add symlink for compat generic location
-ln -s RPM-GPG-KEY-%{cr_name}-%{cr_version}-primary RPM-GPG-KEY-%{cr_name}-latest-primary
-
-install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
-for file in cloudrouter*repo ; do
-  install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
-done
-
-for file in %{base_display_name}*repo ; do
-  install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
-done
-
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d
 cat >> $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.dist << EOF
@@ -99,37 +93,48 @@ cat >> $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.dist << EOF
 %%cr%{cr_version}		%{cr_version}
 EOF
 
+# copy Release Notes
+DOCS=( %{SOURCE0} %{SOURCE1} %{SOURCE2} )
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/CloudRouter
+for file in "${DOCS[@]}"; do 
+	install -m 644 $file %{buildroot}/%{_docdir}/CloudRouter
+done
+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 # fix yum.conf
 sed -i s-"^bugtracker_url=.*$"-"bugtracker_url=%{bug_url}"- /etc/yum.conf
 sed -i s/"^distroverpkg=.*$"/"distroverpkg=%{name}"/ /etc/yum.conf
 
+
 %files
 %defattr(-,root,root,-)
-%doc GPL GNU-AGPL-3.0.txt
+%doc %{_docdir}/CloudRouter/*
 %config %attr(0644,root,root) /etc/os-release
 %config %attr(0644,root,root) /etc/%{cr_name}-release
 /etc/redhat-release
 /etc/system-release
 %config %attr(0644,root,root) /etc/system-release-cpe
-%dir /etc/yum.repos.d
-%config(noreplace) /etc/yum.repos.d/%{cr_name}.repo
-%config(noreplace) /etc/yum.repos.d/%{base_display_name}-Base.repo
-%config(noreplace) /etc/yum.repos.d/%{base_display_name}-Sources.repo
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %attr(0644,root,root) %{_rpmconfigdir}/macros.d/macros.dist
-%dir /etc/pki/rpm-gpg
-/etc/pki/rpm-gpg/*
+
 
 %files notes
 %defattr(-,root,root,-)
-%doc README.%{cr_display_name}-Release-Notes
+%doc %{_docdir}/CloudRouter/%{cr_readme}
+
 
 %changelog
+* Wed Dec 30 2015 John Siegrist <[email protected]> - 3-1
+- Updated version for CRv3
+- Separated out the CentOS and CloudRouter RPM repository info.
+
 * Tue Sep 01 2015 John Siegrist <[email protected]> - 2-4
 - Added dependency on epel-release so the CloudRouter dependencies in EPEL7 are accessible.