Adapt makefile and .gitignore

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

diff --git a/Makefile b/Makefile
index 50c588a500f799e5cd29f25a870b9e8b40244dbe..fc166cc7d169157b4da4f61f01246510f6906b99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE         = $(shell basename `pwd` )
 DESTDIR         = /
-REPO            = /srv/www/repo/salt-packages/
+REPO            = /srv/www/repo/TESTING/salt-packages/
 VERSION         = $(shell cat VERSION )
 RELEASE         = $(shell cat RELEASE )
 NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
@@ -8,8 +8,7 @@ YEAR            = $(shell date +%Y )
 
 
 package:
-       if [ ! -e oss-pkg-$(PACKAGE).spec ]; then cp ../template/package.spec oss-pkg-$(PACKAGE).spec; fi
-       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

diff --git a/oss-pkg-Gimp.spec b/oss-pkg-Gimp.spec
deleted file mode 100644 (file)
index 714780c..0000000
--- a/oss-pkg-Gimp.spec
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Spec file for Gimp
-# Copyright (c) 2018 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
-#
-
-Name:         oss-pkg-Gimp
-Summary:      Package to install Gimp on OSS-Clients
-Version:      2.10.6
-Release:      2
-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 Gimp on OSS-Clients
-
-Authors:
---------
-        helmuth@varkoly.de
-        peter@varkoly.de
-
-
-%prep
-%setup -n %{name}
-
-%build
-
-%install
-
-mkdir -p %{buildroot}/srv/salt/win/repo-ng/Gimp
-mkdir -p %{buildroot}/srv/salt/packages/
-cp Gimp.sls  %{buildroot}/srv/salt/packages/
-cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/Gimp
-
-%clean
-rm -rf %{buildroot}
-
-%pre
-
-%post
-
-/usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"Gimp","manually":false,"description":"Gimp","softwareVersions":[{"version":"2.10.6"}]}'
-
-%files
-%defattr(644,root,root)
-/srv/salt/win/repo-ng/Gimp
-/srv/salt/packages/Gimp.sls
-
-