Fixed packaging

Fixed empty binary package
Changed versioning scheme

Change-Id: I01e0083e9c79c6d9784b5ba0197a598a94ee00cd
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>

diff --git a/packaging/Makefile b/packaging/Makefile
deleted file mode 100644 (file)
index fa4ece0..0000000
--- a/packaging/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-PKG_NAME := jenkins-scripts
-SPECFILE = $(addsuffix .spec, $(PKG_NAME))
-PKG_VERSION := $(shell grep '^Version: ' $(SPECFILE)|awk '{print $$2}')
-
-TARBALL := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-tarball:
-       @cd .. && git archive --prefix $(PKG_NAME)-$(PKG_VERSION)/ HEAD \
-               | gzip > packaging/$(TARBALL)
-
-clean:
-       @rm -f $(PKG_NAME)-*.tar.gz
-
-all: clean tarball

diff --git a/packaging/jenkins-scripts.changes b/packaging/jenkins-scripts.changes
new file mode 100644 (file)
index 0000000..47c2012
--- /dev/null
+++ b/packaging/jenkins-scripts.changes
@@ -0,0 +1,6 @@
+-------------------------------------------------------------------
+Wed Jun 19 07:39:42 UTC 2013 - eduard.bartosh@intel.com
+
+- Changed versioning scheme
+- Fixed empty package 
+

diff --git a/packaging/jenkins-scripts.spec b/packaging/jenkins-scripts.spec
index 7d2069a..8bddece 100644 (file)
--- a/packaging/jenkins-scripts.spec
+++ b/packaging/jenkins-scripts.spec
@@ -1,6 +1,10 @@
 Name:           jenkins-scripts
-Version:        0.12
-Release:        1
+Version:        0.14
+%if 0%{?opensuse_bs}
+Release:        0.dev.<CI_CNT>.<B_CNT>
+%else
+Release:       0
+%endif
 License:        Intel Proprietary
 Summary:        An extendable backend scripts for jenkins
 Url:            http://www.tizen.org
@@ -21,36 +25,19 @@ Jenkins build job will call this scripts when build job is triggered by
 Gerrit/OBS event.
 
 %prep
-%setup -q -c
+%setup -q
 
 %build
 
 %install
-install -d %{name} %{buildroot}%{_localstatedir}/lib/jenkins
-cp -rf jenkins-scripts %{buildroot}%{_localstatedir}/lib/jenkins/
+install -d %{buildroot}%{_localstatedir}/lib/jenkins/%{name}
+cp -r *  %{buildroot}%{_localstatedir}/lib/jenkins/%{name}
 
 %clean
 rm -rf %{buildroot}
 
-%post
-if [ -s /etc/sysconfig/jenkins ]; then
-  source /etc/sysconfig/jenkins
-  if [ -n $JENKINS_HOME -a x$JENKINS_HOME != "x/var/lib/jenkins" ]; then
-    ln -sf /var/lib/jenkins/jenkins-scripts $JENKINS_HOME/jenkins-scripts
-  fi
-fi
-
-%postun
-if [ $1 = 0 ]; then
-  if [ -s /etc/sysconfig/jenkins ]; then
-    source /etc/sysconfig/jenkins
-    if [ -L $JENKINS_HOME/jenkins-scripts ]; then
-      rm $JENKINS_HOME/jenkins-scripts
-    fi
-  fi
-fi
-
 %files
 %defattr(-,jenkins,jenkins)
 %{_localstatedir}/lib/jenkins
 
+%changelog