From 4896dbeb43eab67fd030901212705eb4ea333912 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 22 Dec 2021 10:08:37 +0100 Subject: [PATCH] New release --- Makefile | 2 +- RELEASE | 2 +- oss-pkg-OpenVPN.spec | 58 ++++++++++++++++++++++++++++++++++++++++ oss-pkg-packages.spec.in | 58 ---------------------------------------- 4 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 oss-pkg-packages.spec.in diff --git a/Makefile b/Makefile index 024320a..38fc928 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PACKAGE = $(shell basename `pwd` ) DESTDIR = / REPO = /srv/www/repo/salt-packages/ -VERSION = $(shell cat VERSION ) +VERSION = 2.4.7 RELEASE = $(shell cat RELEASE ) NRELEASE = $(shell echo $(RELEASE) + 1 | bc ) YEAR = $(shell date +%Y ) diff --git a/RELEASE b/RELEASE index c227083..d00491f 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -0 \ No newline at end of file +1 diff --git a/oss-pkg-OpenVPN.spec b/oss-pkg-OpenVPN.spec index e69de29..53ce673 100644 --- a/oss-pkg-OpenVPN.spec +++ b/oss-pkg-OpenVPN.spec @@ -0,0 +1,58 @@ +# +# Spec file for OpenVPN +# Copyright (c) 2021 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany. All rights reserved. +# + +Name: oss-pkg-OpenVPN +Summary: Package to install OpenVPN on OSS-Clients +Version: 2.4.7 +Release: 1 +License: GPL-2.0 +Vendor: Peter Varkoly and Helmuth Varkoly +Packager: peter@varkoly.de +Group: Productivity/ +Source: %{name}.tar.bz2 +BuildArch: noarch +BuildRequires:unzip +#Requires: +Requires: filesystem +PreReq: salt-master +PreReq: %fillup_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Package to install OpenVPN on OSS-Clients + +Authors: +-------- + helmuth@varkoly.de + peter@varkoly.de + + +%prep +%setup -n %{name} + +%build + +%install + +mkdir -p %{buildroot}/srv/salt/win/repo-ng/OpenVPN +mkdir -p %{buildroot}/srv/salt/packages/ +cp OpenVPN.sls %{buildroot}/srv/salt/packages/ +cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/OpenVPN + +%clean +rm -rf %{buildroot} + +%pre + +%post + +/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/OpenVPN/HASH.json + +%files +%defattr(644,root,root) +/srv/salt/win/repo-ng/OpenVPN +/srv/salt/packages/OpenVPN.sls + + diff --git a/oss-pkg-packages.spec.in b/oss-pkg-packages.spec.in deleted file mode 100644 index cd3e3f7..0000000 --- a/oss-pkg-packages.spec.in +++ /dev/null @@ -1,58 +0,0 @@ -# -# Spec file for PACKAGE -# Copyright (c) YEAR Helmuth Varkoly and Peter Varkoly Nuremberg, Germany. All rights reserved. -# - -Name: oss-pkg-PACKAGE -Summary: Package to install PACKAGE on OSS-Clients -Version: VERSION -Release: RELEASE -License: GPL-2.0 -Vendor: Peter Varkoly and Helmuth Varkoly -Packager: peter@varkoly.de -Group: Productivity/ -Source: %{name}.tar.bz2 -BuildArch: noarch -BuildRequires:unzip -#Requires: -Requires: filesystem -PreReq: salt-master -PreReq: %fillup_prereq -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Package to install PACKAGE on OSS-Clients - -Authors: --------- - helmuth@varkoly.de - peter@varkoly.de - - -%prep -%setup -n %{name} - -%build - -%install - -mkdir -p %{buildroot}/srv/salt/win/repo-ng/PACKAGE -mkdir -p %{buildroot}/srv/salt/packages/ -cp PACKAGE.sls %{buildroot}/srv/salt/packages/ -cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/PACKAGE - -%clean -rm -rf %{buildroot} - -%pre - -%post - -/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/PACKAGE/HASH.json - -%files -%defattr(644,root,root) -/srv/salt/win/repo-ng/PACKAGE -/srv/salt/packages/PACKAGE.sls - - -- 2.43.0