New release

diff --git a/Makefile b/Makefile
index 024320a6fc04f5c854e7d47386edb1f28b2d5cbf..38fc928ce5115e8de779022fcf3414ced8411f5f 100644 (file)
--- 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 c227083464fb9af8955c90d2924774ee50abb547..d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..53ce673853007958fddc67caa7a27d5b99bc1bcb 100644 (file)
--- 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 (file)
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
-
-