[osc] rebase to osc-0.151.1

[Miroslav Suchý]

commit 40db244886b34e99f2117b313847e110a87a22dc
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Tue Mar 24 07:47:05 2015 +0100

    rebase to osc-0.151.1

 .gitignore |  1 +
 osc.spec   | 31 ++++++++++++++++++++-----------
 sources    |  2 +-
 3 files changed, 22 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8e8ac1..f8057e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /osc-0.132.1.tar.gz
 /osc-0.132.4.tar.gz
 /osc-0.140.1.tar.gz
+/osc-0.151.1.tar.gz
diff --git a/osc.spec b/osc.spec
index 083f5ec..097d2e4 100644
--- a/osc.spec
+++ b/osc.spec
@@ -1,13 +1,16 @@
 Name:           osc
-Version:        0.140.1
-Release:        109.1.1%{?dist}
+Version:        0.151.1
+# suse guys use weird release numbers, jus follow them
+# when rebasing check what they are using
+# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_21/
+# and add .1 so we are one level up from upstream
+Release:        163.2.1%{?dist}
 Group:          Development/Tools
 License:        GPLv2+
 Url:            https://github.com/openSUSE/osc
-#the tarball come from gitourious.
-#i check out the latest version, same as openSUSE version.
-#git clone git at github.com:openSUSE/osc.git
-#git archive --prefix="osc-0.140.1/" --format=tar 0.140.1| gzip > osc-0.140.1.tar.gz
+# git clone git at github.com:openSUSE/osc.git
+# git reset --hard 0.151.1
+# git archive --prefix="osc-0.151.1/" --format=tar 0.151.1| gzip > osc-0.151.1.tar.gz
 Source:         osc-%{version}.tar.gz
 Summary:        The openSUSE Build Service Commander
 BuildArch:      noarch
@@ -20,7 +23,7 @@ Requires:       python-lxml
 Requires:       python-urlgrabber
 Requires:       fuse-python
 
-#Recommends:     osc-source_validator
+Recommends:     osc-source_validator
 
 %description
 Commandline client for the openSUSE Build Service.
@@ -44,21 +47,27 @@ CFLAGS="%{optflags}" %{__python} setup.py build
 %{__python} setup.py install -O1 --prefix=%{_prefix} --root %{buildroot}
 %__ln_s osc-wrapper.py %{buildroot}/%{_bindir}/osc
 %__mkdir_p %{buildroot}%{_localstatedir}/lib/osc-plugins
+%__mkdir_p %{buildroot}%{_datadir}/bash-completion/completions/
 install -Dm0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh
-install -Dm0644 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh
-install -Dm0755 dist/osc.complete %{buildroot}/%{_prefix}/lib/osc/complete
+install -Dm0644 dist/complete.sh %{buildroot}%{_datadir}/bash-completion/completions/osc
+install -Dm0755 dist/osc.complete %{buildroot}%{_datadir}/osc/complete
 
 %files
 %doc AUTHORS README TODO NEWS
+%license COPYING
 %{_bindir}/osc*
 %{python_sitelib}/*
 %config %{_sysconfdir}/profile.d/osc.csh
-%config %{_sysconfdir}/profile.d/osc.sh
+%{_datadir}/bash-completion/completions/osc
 %dir %{_localstatedir}/lib/osc-plugins
 %{_mandir}/man1/osc.*
-%{_prefix}/lib/osc
+%{_datadir}/osc
 
 %changelog
+* Tue Feb 24 2015 Miroslav Suchý <msuchy at redhat.com> 0.151.1-163.2.1
+- rebase to 0.140.1
+- fixed shell command injection via crafted _service files CVE-2015-0778
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.140.1-109.1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 80ece8f..9b2fd80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6d5cc5edf50e769836b7c56b3a9f056  osc-0.140.1.tar.gz
+2c7c8cd1e4f9f3c829e1afb1d1fc4275  osc-0.151.1.tar.gz