From c5139517af8500e35f2f1952bd39725ee05dba7d Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Tue, 9 Aug 2016 16:30:41 -0400 Subject: [PATCH] Remove old RPM defs, use new template for .specs Removed builds for which the artifacts have aged out, or have been supplanted by official releases. Update other .specs with recent changes to opendaylight.spec template. Change-Id: I36d41323f3c9e0c1ec2af2db194b5ccaed10b716 Signed-off-by: Daniel Farrell --- rpm/build_vars.yaml | 60 ---------------- rpm/specs/opendaylight-3.3.0-2.spec | 2 +- rpm/specs/opendaylight-3.4.0-1.spec | 2 +- rpm/specs/opendaylight-4.0.0-1.spec | 2 +- rpm/specs/opendaylight-4.1.0-1.spec | 2 +- rpm/specs/opendaylight-4.2.0-1.spec | 2 +- rpm/specs/opendaylight-4.3.0-1.1345.spec | 69 ------------------- rpm/specs/opendaylight-4.3.0-1.1367.spec | 69 ------------------- .../opendaylight-4.3.0-1.201605200033.spec | 69 ------------------- .../opendaylight-4.3.0-1.201605250031.spec | 69 ------------------- .../opendaylight-4.3.0-1.201606060052.spec | 69 ------------------- .../opendaylight-5.0.0-1.201606060053.spec | 69 ------------------- 12 files changed, 5 insertions(+), 479 deletions(-) delete mode 100644 rpm/specs/opendaylight-4.3.0-1.1345.spec delete mode 100644 rpm/specs/opendaylight-4.3.0-1.1367.spec delete mode 100644 rpm/specs/opendaylight-4.3.0-1.201605200033.spec delete mode 100644 rpm/specs/opendaylight-4.3.0-1.201605250031.spec delete mode 100644 rpm/specs/opendaylight-4.3.0-1.201606060052.spec delete mode 100644 rpm/specs/opendaylight-5.0.0-1.201606060053.spec diff --git a/rpm/build_vars.yaml b/rpm/build_vars.yaml index c55cb41..ca0764c 100644 --- a/rpm/build_vars.yaml +++ b/rpm/build_vars.yaml @@ -74,66 +74,6 @@ builds: changelog_date: "Wed May 11 2016" changelog_name: "Daniel Farrell" changelog_email: "dfarrell@redhat.com" - - version_major: "4" - version_minor: "3" - version_patch: "0" - rpm_release: "1.201605200033" - sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed - codename: beryllium-daily-v201605200033 - download_url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.3-beryllium-daily-v201605200033/distribution-karaf-0.4.3-beryllium-daily-v201605200033.tar.gz" - changelog_date: "Sat May 21 2016" - changelog_name: "Daniel Farrell" - changelog_email: "dfarrell@redhat.com" - - version_major: "4" - version_minor: "3" - version_patch: "0" - rpm_release: "1.201605250031" - sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed - codename: beryllium-daily-v201605250031 - download_url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.3-beryllium-daily-v201605250031/distribution-karaf-0.4.3-beryllium-daily-v201605250031.tar.gz" - changelog_date: "Thu May 26 2016" - changelog_name: "Daniel Farrell" - changelog_email: "dfarrell@redhat.com" - - version_major: "5" - version_minor: "0" - version_patch: "0" - rpm_release: "1.201606060053" - sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed - codename: boron-daily-v201606060053 - download_url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.5.0-boron-daily-v201606060053/distribution-karaf-0.5.0-boron-daily-v201606060053.tar.gz" - changelog_date: "Mon Jun 06 2016" - changelog_name: "Daniel Farrell" - changelog_email: "dfarrell@redhat.com" - - version_major: "4" - version_minor: "3" - version_patch: "0" - rpm_release: "1.201606060052" - sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed - codename: beryllium-daily-v201606060052 - download_url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.3-beryllium-daily-v201606060052/distribution-karaf-0.4.3-beryllium-daily-v201606060052.tar.gz" - changelog_date: "Mon Jun 06 2016" - changelog_name: "Daniel Farrell" - changelog_email: "dfarrell@redhat.com" - - version_major: "4" - version_minor: "3" - version_patch: "0" - rpm_release: "1.1345" - sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed - codename: Beryllium-SR3 - download_url: "https://nexus.opendaylight.org/content/repositories/autorelease-1345/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz" - changelog_date: "Wed Jul 13 2016" - changelog_name: "Daniel Farrell" - changelog_email: "dfarrell@redhat.com" - - version_major: "4" - version_minor: "3" - version_patch: "0" - rpm_release: "1.1367" - sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed - codename: Beryllium-SR3 - download_url: "https://nexus.opendaylight.org/content/repositories/autorelease-1367/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz" - changelog_date: "Tue Jul 26 2016" - changelog_name: "Daniel Farrell" - changelog_email: "dfarrell@redhat.com" - version_major: "4" version_minor: "3" version_patch: "0" diff --git a/rpm/specs/opendaylight-3.3.0-2.spec b/rpm/specs/opendaylight-3.3.0-2.spec index 082eca7..6972e88 100644 --- a/rpm/specs/opendaylight-3.3.0-2.spec +++ b/rpm/specs/opendaylight-3.3.0-2.spec @@ -14,7 +14,7 @@ Summary: OpenDaylight SDN Controller Group: Applications/Communications License: EPL-1.0 URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz +Source0: %name-3.3.0-2.tar.gz Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz Buildroot: /tmp # Required for ODL at run time diff --git a/rpm/specs/opendaylight-3.4.0-1.spec b/rpm/specs/opendaylight-3.4.0-1.spec index b8d474e..a861ba7 100644 --- a/rpm/specs/opendaylight-3.4.0-1.spec +++ b/rpm/specs/opendaylight-3.4.0-1.spec @@ -14,7 +14,7 @@ Summary: OpenDaylight SDN Controller Group: Applications/Communications License: EPL-1.0 URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.3.4-Lithium-SR4/distribution-karaf-0.3.4-Lithium-SR4.tar.gz +Source0: %name-3.4.0-1.tar.gz Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz Buildroot: /tmp # Required for ODL at run time diff --git a/rpm/specs/opendaylight-4.0.0-1.spec b/rpm/specs/opendaylight-4.0.0-1.spec index 2751004..fdee36d 100644 --- a/rpm/specs/opendaylight-4.0.0-1.spec +++ b/rpm/specs/opendaylight-4.0.0-1.spec @@ -14,7 +14,7 @@ Summary: OpenDaylight SDN Controller Group: Applications/Communications License: EPL-1.0 URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium/distribution-karaf-0.4.0-Beryllium.tar.gz +Source0: %name-4.0.0-1.tar.gz Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz Buildroot: /tmp # Required for ODL at run time diff --git a/rpm/specs/opendaylight-4.1.0-1.spec b/rpm/specs/opendaylight-4.1.0-1.spec index 64dda4d..5e724b1 100644 --- a/rpm/specs/opendaylight-4.1.0-1.spec +++ b/rpm/specs/opendaylight-4.1.0-1.spec @@ -14,7 +14,7 @@ Summary: OpenDaylight SDN Controller Group: Applications/Communications License: EPL-1.0 URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz +Source0: %name-4.1.0-1.tar.gz Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz Buildroot: /tmp # Required for ODL at run time diff --git a/rpm/specs/opendaylight-4.2.0-1.spec b/rpm/specs/opendaylight-4.2.0-1.spec index e609836..c66f8c9 100644 --- a/rpm/specs/opendaylight-4.2.0-1.spec +++ b/rpm/specs/opendaylight-4.2.0-1.spec @@ -14,7 +14,7 @@ Summary: OpenDaylight SDN Controller Group: Applications/Communications License: EPL-1.0 URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz +Source0: %name-4.2.0-1.tar.gz Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz Buildroot: /tmp # Required for ODL at run time diff --git a/rpm/specs/opendaylight-4.3.0-1.1345.spec b/rpm/specs/opendaylight-4.3.0-1.1345.spec deleted file mode 100644 index 19ec382..0000000 --- a/rpm/specs/opendaylight-4.3.0-1.1345.spec +++ /dev/null @@ -1,69 +0,0 @@ -# ODL is a noarch package, so this isn't necessary. It's also very slow. -%define __jar_repack 0 - -Name: opendaylight -Version: 4.3.0 -# The Fedora/CentOS packaging guidelines *require* the use of a disttag. ODL's -# RPM build doesn't do anything Fedora/CentOS specific, so the disttag is -# unnecessary and unused in our case, but both the docs and the pros (apevec) -# agree that we should include it. -# See: https://fedoraproject.org/wiki/Packaging:DistTag -Release: 1.1345.el7 -BuildArch: noarch -Summary: OpenDaylight SDN Controller -Group: Applications/Communications -License: EPL-1.0 -URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/autorelease-1345/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz -Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz -Buildroot: /tmp -# Required for ODL at run time -Requires: java >= 1:1.7.0 -# Required for creating odl group -Requires(pre): shadow-utils -# Required for configuring systemd -BuildRequires: systemd - -%pre -# Create `odl` user/group -# Short circuits if the user/group already exists -# Home dir must be a valid path for various files to be created in it -getent passwd odl > /dev/null || useradd odl -M -d $RPM_BUILD_ROOT/opt/%name -getent group odl > /dev/null || groupadd odl - -%description -OpenDaylight Beryllium-SR3 - -%prep -# Extract Source0 (ODL archive) -%autosetup -n distribution-karaf-0.4.3-Beryllium-SR3 -# Extract Source1 (systemd config) -%autosetup -T -D -b 1 -c -n %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service - -%install -# Create directory in build root for ODL -mkdir -p $RPM_BUILD_ROOT/opt/%name -# Copy ODL from archive to its dir in build root -cp -r ../distribution-karaf-0.4.3-Beryllium-SR3/* $RPM_BUILD_ROOT/opt/%name -# Create directory in build root for systemd .service file -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -# Copy ODL's systemd .service file to correct dir in build root -cp ../../BUILD/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service $RPM_BUILD_ROOT/%{_unitdir}/%name.service - -%postun -# When the RPM is removed, the subdirs containing new files wouldn't normally -# be deleted. Manually clean them up. -# Warning: This does assume there's no data there that should be preserved -if [ $1 -eq 0 ]; then - rm -rf $RPM_BUILD_ROOT/opt/%name -fi - -%files -# ODL will run as odl:odl, set as user:group for ODL dir, don't override mode -%attr(-,odl,odl) /opt/%name -# Configure systemd unitfile user/group/mode -%attr(0644,root,root) %{_unitdir}/%name.service - -%changelog -* Wed Jul 13 2016 Daniel Farrell - 4.3.0-1.1345 -- Create 4.3.0-1.1345 RPM \ No newline at end of file diff --git a/rpm/specs/opendaylight-4.3.0-1.1367.spec b/rpm/specs/opendaylight-4.3.0-1.1367.spec deleted file mode 100644 index 0e99b20..0000000 --- a/rpm/specs/opendaylight-4.3.0-1.1367.spec +++ /dev/null @@ -1,69 +0,0 @@ -# ODL is a noarch package, so this isn't necessary. It's also very slow. -%define __jar_repack 0 - -Name: opendaylight -Version: 4.3.0 -# The Fedora/CentOS packaging guidelines *require* the use of a disttag. ODL's -# RPM build doesn't do anything Fedora/CentOS specific, so the disttag is -# unnecessary and unused in our case, but both the docs and the pros (apevec) -# agree that we should include it. -# See: https://fedoraproject.org/wiki/Packaging:DistTag -Release: 1.1367.el7 -BuildArch: noarch -Summary: OpenDaylight SDN Controller -Group: Applications/Communications -License: EPL-1.0 -URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/autorelease-1367/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz -Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz -Buildroot: /tmp -# Required for ODL at run time -Requires: java >= 1:1.7.0 -# Required for creating odl group -Requires(pre): shadow-utils -# Required for configuring systemd -BuildRequires: systemd - -%pre -# Create `odl` user/group -# Short circuits if the user/group already exists -# Home dir must be a valid path for various files to be created in it -getent passwd odl > /dev/null || useradd odl -M -d $RPM_BUILD_ROOT/opt/%name -getent group odl > /dev/null || groupadd odl - -%description -OpenDaylight Beryllium-SR3 - -%prep -# Extract Source0 (ODL archive) -%autosetup -n distribution-karaf-0.4.3-Beryllium-SR3 -# Extract Source1 (systemd config) -%autosetup -T -D -b 1 -c -n %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service - -%install -# Create directory in build root for ODL -mkdir -p $RPM_BUILD_ROOT/opt/%name -# Copy ODL from archive to its dir in build root -cp -r ../distribution-karaf-0.4.3-Beryllium-SR3/* $RPM_BUILD_ROOT/opt/%name -# Create directory in build root for systemd .service file -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -# Copy ODL's systemd .service file to correct dir in build root -cp ../../BUILD/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service $RPM_BUILD_ROOT/%{_unitdir}/%name.service - -%postun -# When the RPM is removed, the subdirs containing new files wouldn't normally -# be deleted. Manually clean them up. -# Warning: This does assume there's no data there that should be preserved -if [ $1 -eq 0 ]; then - rm -rf $RPM_BUILD_ROOT/opt/%name -fi - -%files -# ODL will run as odl:odl, set as user:group for ODL dir, don't override mode -%attr(-,odl,odl) /opt/%name -# Configure systemd unitfile user/group/mode -%attr(0644,root,root) %{_unitdir}/%name.service - -%changelog -* Tue Jul 26 2016 Daniel Farrell - 4.3.0-1.1367 -- Create 4.3.0-1.1367 RPM \ No newline at end of file diff --git a/rpm/specs/opendaylight-4.3.0-1.201605200033.spec b/rpm/specs/opendaylight-4.3.0-1.201605200033.spec deleted file mode 100644 index bf58547..0000000 --- a/rpm/specs/opendaylight-4.3.0-1.201605200033.spec +++ /dev/null @@ -1,69 +0,0 @@ -# ODL is a noarch package, so this isn't necessary. It's also very slow. -%define __jar_repack 0 - -Name: opendaylight -Version: 4.3.0 -# The Fedora/CentOS packaging guidelines *require* the use of a disttag. ODL's -# RPM build doesn't do anything Fedora/CentOS specific, so the disttag is -# unnecessary and unused in our case, but both the docs and the pros (apevec) -# agree that we should include it. -# See: https://fedoraproject.org/wiki/Packaging:DistTag -Release: 1.201605200033.el7 -BuildArch: noarch -Summary: OpenDaylight SDN Controller -Group: Applications/Communications -License: EPL-1.0 -URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.3-beryllium-daily-v201605200033/distribution-karaf-0.4.3-beryllium-daily-v201605200033.tar.gz -Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz -Buildroot: /tmp -# Required for ODL at run time -Requires: java >= 1:1.7.0 -# Required for creating odl group -Requires(pre): shadow-utils -# Required for configuring systemd -BuildRequires: systemd - -%pre -# Create `odl` user/group -# Short circuits if the user/group already exists -# Home dir must be a valid path for various files to be created in it -getent passwd odl > /dev/null || useradd odl -M -d $RPM_BUILD_ROOT/opt/%name -getent group odl > /dev/null || groupadd odl - -%description -OpenDaylight beryllium-daily-v201605200033 - -%prep -# Extract Source0 (ODL archive) -%autosetup -n distribution-karaf-0.4.3-beryllium-daily-v201605200033 -# Extract Source1 (systemd config) -%autosetup -T -D -b 1 -c -n %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service - -%install -# Create directory in build root for ODL -mkdir -p $RPM_BUILD_ROOT/opt/%name -# Copy ODL from archive to its dir in build root -cp -r ../distribution-karaf-0.4.3-beryllium-daily-v201605200033/* $RPM_BUILD_ROOT/opt/%name -# Create directory in build root for systemd .service file -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -# Copy ODL's systemd .service file to correct dir in build root -cp ../../BUILD/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service $RPM_BUILD_ROOT/%{_unitdir}/%name.service - -%postun -# When the RPM is removed, the subdirs containing new files wouldn't normally -# be deleted. Manually clean them up. -# Warning: This does assume there's no data there that should be preserved -if [ $1 -eq 0 ]; then - rm -rf $RPM_BUILD_ROOT/opt/%name -fi - -%files -# ODL will run as odl:odl, set as user:group for ODL dir, don't override mode -%attr(-,odl,odl) /opt/%name -# Configure systemd unitfile user/group/mode -%attr(0644,root,root) %{_unitdir}/%name.service - -%changelog -* Sat May 21 2016 Daniel Farrell - 4.3.0-1.201605200033 -- Create 4.3.0-1.201605200033 RPM \ No newline at end of file diff --git a/rpm/specs/opendaylight-4.3.0-1.201605250031.spec b/rpm/specs/opendaylight-4.3.0-1.201605250031.spec deleted file mode 100644 index 983d07c..0000000 --- a/rpm/specs/opendaylight-4.3.0-1.201605250031.spec +++ /dev/null @@ -1,69 +0,0 @@ -# ODL is a noarch package, so this isn't necessary. It's also very slow. -%define __jar_repack 0 - -Name: opendaylight -Version: 4.3.0 -# The Fedora/CentOS packaging guidelines *require* the use of a disttag. ODL's -# RPM build doesn't do anything Fedora/CentOS specific, so the disttag is -# unnecessary and unused in our case, but both the docs and the pros (apevec) -# agree that we should include it. -# See: https://fedoraproject.org/wiki/Packaging:DistTag -Release: 1.201605250031.el7 -BuildArch: noarch -Summary: OpenDaylight SDN Controller -Group: Applications/Communications -License: EPL-1.0 -URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.3-beryllium-daily-v201605250031/distribution-karaf-0.4.3-beryllium-daily-v201605250031.tar.gz -Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz -Buildroot: /tmp -# Required for ODL at run time -Requires: java >= 1:1.7.0 -# Required for creating odl group -Requires(pre): shadow-utils -# Required for configuring systemd -BuildRequires: systemd - -%pre -# Create `odl` user/group -# Short circuits if the user/group already exists -# Home dir must be a valid path for various files to be created in it -getent passwd odl > /dev/null || useradd odl -M -d $RPM_BUILD_ROOT/opt/%name -getent group odl > /dev/null || groupadd odl - -%description -OpenDaylight beryllium-daily-v201605250031 - -%prep -# Extract Source0 (ODL archive) -%autosetup -n distribution-karaf-0.4.3-beryllium-daily-v201605250031 -# Extract Source1 (systemd config) -%autosetup -T -D -b 1 -c -n %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service - -%install -# Create directory in build root for ODL -mkdir -p $RPM_BUILD_ROOT/opt/%name -# Copy ODL from archive to its dir in build root -cp -r ../distribution-karaf-0.4.3-beryllium-daily-v201605250031/* $RPM_BUILD_ROOT/opt/%name -# Create directory in build root for systemd .service file -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -# Copy ODL's systemd .service file to correct dir in build root -cp ../../BUILD/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service $RPM_BUILD_ROOT/%{_unitdir}/%name.service - -%postun -# When the RPM is removed, the subdirs containing new files wouldn't normally -# be deleted. Manually clean them up. -# Warning: This does assume there's no data there that should be preserved -if [ $1 -eq 0 ]; then - rm -rf $RPM_BUILD_ROOT/opt/%name -fi - -%files -# ODL will run as odl:odl, set as user:group for ODL dir, don't override mode -%attr(-,odl,odl) /opt/%name -# Configure systemd unitfile user/group/mode -%attr(0644,root,root) %{_unitdir}/%name.service - -%changelog -* Thu May 26 2016 Daniel Farrell - 4.3.0-1.201605250031 -- Create 4.3.0-1.201605250031 RPM \ No newline at end of file diff --git a/rpm/specs/opendaylight-4.3.0-1.201606060052.spec b/rpm/specs/opendaylight-4.3.0-1.201606060052.spec deleted file mode 100644 index d3034e9..0000000 --- a/rpm/specs/opendaylight-4.3.0-1.201606060052.spec +++ /dev/null @@ -1,69 +0,0 @@ -# ODL is a noarch package, so this isn't necessary. It's also very slow. -%define __jar_repack 0 - -Name: opendaylight -Version: 4.3.0 -# The Fedora/CentOS packaging guidelines *require* the use of a disttag. ODL's -# RPM build doesn't do anything Fedora/CentOS specific, so the disttag is -# unnecessary and unused in our case, but both the docs and the pros (apevec) -# agree that we should include it. -# See: https://fedoraproject.org/wiki/Packaging:DistTag -Release: 1.201606060052.el7 -BuildArch: noarch -Summary: OpenDaylight SDN Controller -Group: Applications/Communications -License: EPL-1.0 -URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.3-beryllium-daily-v201606060052/distribution-karaf-0.4.3-beryllium-daily-v201606060052.tar.gz -Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz -Buildroot: /tmp -# Required for ODL at run time -Requires: java >= 1:1.7.0 -# Required for creating odl group -Requires(pre): shadow-utils -# Required for configuring systemd -BuildRequires: systemd - -%pre -# Create `odl` user/group -# Short circuits if the user/group already exists -# Home dir must be a valid path for various files to be created in it -getent passwd odl > /dev/null || useradd odl -M -d $RPM_BUILD_ROOT/opt/%name -getent group odl > /dev/null || groupadd odl - -%description -OpenDaylight beryllium-daily-v201606060052 - -%prep -# Extract Source0 (ODL archive) -%autosetup -n distribution-karaf-0.4.3-beryllium-daily-v201606060052 -# Extract Source1 (systemd config) -%autosetup -T -D -b 1 -c -n %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service - -%install -# Create directory in build root for ODL -mkdir -p $RPM_BUILD_ROOT/opt/%name -# Copy ODL from archive to its dir in build root -cp -r ../distribution-karaf-0.4.3-beryllium-daily-v201606060052/* $RPM_BUILD_ROOT/opt/%name -# Create directory in build root for systemd .service file -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -# Copy ODL's systemd .service file to correct dir in build root -cp ../../BUILD/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service $RPM_BUILD_ROOT/%{_unitdir}/%name.service - -%postun -# When the RPM is removed, the subdirs containing new files wouldn't normally -# be deleted. Manually clean them up. -# Warning: This does assume there's no data there that should be preserved -if [ $1 -eq 0 ]; then - rm -rf $RPM_BUILD_ROOT/opt/%name -fi - -%files -# ODL will run as odl:odl, set as user:group for ODL dir, don't override mode -%attr(-,odl,odl) /opt/%name -# Configure systemd unitfile user/group/mode -%attr(0644,root,root) %{_unitdir}/%name.service - -%changelog -* Mon Jun 06 2016 Daniel Farrell - 4.3.0-1.201606060052 -- Create 4.3.0-1.201606060052 RPM \ No newline at end of file diff --git a/rpm/specs/opendaylight-5.0.0-1.201606060053.spec b/rpm/specs/opendaylight-5.0.0-1.201606060053.spec deleted file mode 100644 index a340a7f..0000000 --- a/rpm/specs/opendaylight-5.0.0-1.201606060053.spec +++ /dev/null @@ -1,69 +0,0 @@ -# ODL is a noarch package, so this isn't necessary. It's also very slow. -%define __jar_repack 0 - -Name: opendaylight -Version: 5.0.0 -# The Fedora/CentOS packaging guidelines *require* the use of a disttag. ODL's -# RPM build doesn't do anything Fedora/CentOS specific, so the disttag is -# unnecessary and unused in our case, but both the docs and the pros (apevec) -# agree that we should include it. -# See: https://fedoraproject.org/wiki/Packaging:DistTag -Release: 1.201606060053.el7 -BuildArch: noarch -Summary: OpenDaylight SDN Controller -Group: Applications/Communications -License: EPL-1.0 -URL: http://www.opendaylight.org -Source0: https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.5.0-boron-daily-v201606060053/distribution-karaf-0.5.0-boron-daily-v201606060053.tar.gz -Source1: %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz -Buildroot: /tmp -# Required for ODL at run time -Requires: java >= 1:1.7.0 -# Required for creating odl group -Requires(pre): shadow-utils -# Required for configuring systemd -BuildRequires: systemd - -%pre -# Create `odl` user/group -# Short circuits if the user/group already exists -# Home dir must be a valid path for various files to be created in it -getent passwd odl > /dev/null || useradd odl -M -d $RPM_BUILD_ROOT/opt/%name -getent group odl > /dev/null || groupadd odl - -%description -OpenDaylight boron-daily-v201606060053 - -%prep -# Extract Source0 (ODL archive) -%autosetup -n distribution-karaf-0.5.0-boron-daily-v201606060053 -# Extract Source1 (systemd config) -%autosetup -T -D -b 1 -c -n %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service - -%install -# Create directory in build root for ODL -mkdir -p $RPM_BUILD_ROOT/opt/%name -# Copy ODL from archive to its dir in build root -cp -r ../distribution-karaf-0.5.0-boron-daily-v201606060053/* $RPM_BUILD_ROOT/opt/%name -# Create directory in build root for systemd .service file -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -# Copy ODL's systemd .service file to correct dir in build root -cp ../../BUILD/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service $RPM_BUILD_ROOT/%{_unitdir}/%name.service - -%postun -# When the RPM is removed, the subdirs containing new files wouldn't normally -# be deleted. Manually clean them up. -# Warning: This does assume there's no data there that should be preserved -if [ $1 -eq 0 ]; then - rm -rf $RPM_BUILD_ROOT/opt/%name -fi - -%files -# ODL will run as odl:odl, set as user:group for ODL dir, don't override mode -%attr(-,odl,odl) /opt/%name -# Configure systemd unitfile user/group/mode -%attr(0644,root,root) %{_unitdir}/%name.service - -%changelog -* Mon Jun 06 2016 Daniel Farrell - 5.0.0-1.201606060053 -- Create 5.0.0-1.201606060053 RPM \ No newline at end of file -- 2.36.6