From: buildmaster <buildmaster@git.cephalix.eu>
Date: Thu, 20 Sep 2018 07:50:54 +0000 (+0200)
Subject: Adapt makefile and .gitignore
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=44de8738d75e164ee714bc14c171cc7901c9d584;p=FileZilla.git

Adapt makefile and .gitignore
---

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