Fix license

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

diff --git a/Makefile b/Makefile
index 601e3faa850aa9d1936e33ce9d69b13c6a648a61..fc166cc7d169157b4da4f61f01246510f6906b99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,17 @@ REPO            = /srv/www/repo/TESTING/salt-packages/
 VERSION         = $(shell cat VERSION )
 RELEASE         = $(shell cat RELEASE )
 NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
+YEAR           = $(shell date +%Y )
 
 
 package:
-       cp ../template/packages.spec   oss-pkg-$(PACKAGE).spec
-       sed -i s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec
+       sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > 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
        mkdir -p oss-pkg-$(PACKAGE)
-       sed s/PACKAGE/$(PACKAGE)/g  ../template/temlate.sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls
+       if [ ! -e $(PACKAGE).sls ];  then cp ../template/template.sls $(PACKAGE).sls; fi
+       sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls
        if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; fi
        tar hjcvpf oss-pkg-$(PACKAGE).tar.bz2 oss-pkg-$(PACKAGE)  
        rm -rf oss-pkg-$(PACKAGE)

diff --git a/packages.spec.in b/oss-pkg-JavaJDK.spec.in
similarity index 98%
rename from packages.spec.in
rename to oss-pkg-JavaJDK.spec.in
index b58c49c7613cbb6843167d853249ef048553623c..76e3bee6b5b8ebffec4626c977ee565c9a5156d8 100644 (file)
--- a/packages.spec.in
+++ b/oss-pkg-JavaJDK.spec.in
@@ -7,7 +7,7 @@ Name:         oss-pkg-PACKAGE
 Summary:      Package to install PACKAGE on OSS-Clients
 Version:      VERSION
 Release:      RELEASE
-License:      Commercial
+License:      GPL-2.0
 Vendor:       Peter Varkoly and Helmuth Varkoly
 Distribution: SLE11
 Packager:     peter@varkoly.de