Add .gitignore. Adapt Makefile.

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

diff --git a/Makefile b/Makefile
index 601e3faa850aa9d1936e33ce9d69b13c6a648a61..f2ba05c41538f4d7781d3da64aa698aa74bbdb74 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,7 @@ NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
 
 
 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
        mkdir -p oss-pkg-$(PACKAGE)

diff --git a/oss-pkg-MsOffice2016ProfPlusDE.spec.in b/oss-pkg-MsOffice2016ProfPlusDE.spec.in
new file mode 100644 (file)
index 0000000..079b12d
--- /dev/null
+++ b/oss-pkg-MsOffice2016ProfPlusDE.spec.in
@@ -0,0 +1,58 @@
+#
+# 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.sh POST 'softwares/add' '{"name":"PACKAGE","manually":false,"description":"PACKAGE","softwareVersions":[{"version":"VERSION"}]}'
+
+%files
+%defattr(644,root,root)
+/srv/salt/win/repo-ng/PACKAGE
+/srv/salt/packages/PACKAGE.sls
+
+