fullnames

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..4b3031d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+oss-pkg-OssLogon.spec

diff --git a/FULLNAMES b/FULLNAMES
new file mode 100644 (file)
index 0000000..7ab30b7
--- /dev/null
+++ b/FULLNAMES
@@ -0,0 +1 @@
+OssLogon

diff --git a/Makefile b/Makefile
index 50c588a500f799e5cd29f25a870b9e8b40244dbe..f0fc4cdfb18ac1bd52b0fc50fcec1f3ba70f00cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,12 @@ YEAR          = $(shell date +%Y )
 
 
 package:
-       if [ ! -e oss-pkg-$(PACKAGE).spec ]; then cp ../template/package.spec oss-pkg-$(PACKAGE).spec; fi
+       sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec
        sed -i s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec
        sed -i s/RELEASE/$(NRELEASE)/g oss-pkg-$(PACKAGE).spec
        sed -i s/PACKAGE/$(PACKAGE)/g  oss-pkg-$(PACKAGE).spec
        sed -i s/YEAR/$(YEAR)/g        oss-pkg-$(PACKAGE).spec
+       ../oss-pkg-tools/create_hash.sh $(PACKAGE)
        mkdir -p oss-pkg-$(PACKAGE)
        if [ ! -e $(PACKAGE).sls ];  then cp ../template/template.sls $(PACKAGE).sls; fi
        sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls
@@ -21,6 +22,7 @@ package:
        rm -rf oss-pkg-$(PACKAGE)
        mv  oss-pkg-$(PACKAGE).tar.bz2  /usr/src/packages/SOURCES/
        rpmbuild -bb oss-pkg-$(PACKAGE).spec
+       for i in $(REPO)/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm; do test -e $$i && rm $$i; done
        mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch
        echo $(NRELEASE) > RELEASE
        git commit -a -m "New release"

diff --git a/oss-pkg-OssLogon.spec b/oss-pkg-OssLogon.spec.in
similarity index 60%
rename from oss-pkg-OssLogon.spec
rename to oss-pkg-OssLogon.spec.in
index dfe7928a231b4e964ac9b65c03810c0d99a61fa6..2010bf1c15bc0fe0384f1bcf73d81d9d50795c5f 100644 (file)
--- a/oss-pkg-OssLogon.spec
+++ b/oss-pkg-OssLogon.spec.in
@@ -1,12 +1,12 @@
 #
-# Spec file for OssLogon
+# Spec file for PACKAGE
 # Copyright (c) 2018 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
 #
 
-Name:         oss-pkg-OssLogon
-Summary:      Package to install OssLogon on OSS-Clients
-Version:      2.0
-Release:      2
+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
@@ -21,7 +21,7 @@ PreReq:       %fillup_prereq
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
-Package to install OssLogon on OSS-Clients
+Package to install PACKAGE on OSS-Clients
 
 Authors:
 --------
@@ -36,10 +36,10 @@ Authors:
 
 %install
 
-mkdir -p %{buildroot}/srv/salt/win/repo-ng/OssLogon
+mkdir -p %{buildroot}/srv/salt/win/repo-ng/PACKAGE
 mkdir -p %{buildroot}/srv/salt/packages/
-cp OssLogon.sls  %{buildroot}/srv/salt/packages/
-cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/OssLogon
+cp PACKAGE.sls  %{buildroot}/srv/salt/packages/
+cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/PACKAGE
 
 %clean
 rm -rf %{buildroot}
@@ -48,7 +48,7 @@ rm -rf %{buildroot}
 
 %post
 
-/usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"OssLogon","manually":false,"description":"OssLogon","softwareVersions":[{"version":"2.0"}]}'
+/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/PACKAGE/HASH.json
 
 %files
 %defattr(644,root,root)