[osc] Update osc to 0.140.1-107.1.1

Miroslav Suchý msuchy at fedoraproject.org
Wed Jul 17 08:40:51 UTC 2013


commit 116953c596b3a6b2432fda619cbece5166d7637f
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Wed Jul 17 10:40:36 2013 +0200

    Update osc to 0.140.1-107.1.1

 .gitignore |    1 +
 osc.spec   |   51 +++++++++++++++++++++++++--------------------------
 sources    |    2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48bbbf2..f8e8ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /osc-0.132.1.tar.gz
 /osc-0.132.4.tar.gz
+/osc-0.140.1.tar.gz
diff --git a/osc.spec b/osc.spec
index 4649f62..cbab9a5 100644
--- a/osc.spec
+++ b/osc.spec
@@ -1,24 +1,24 @@
-%if (0%{?fedora} > 12 || 0%{?rhel} > 6)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%endif
-
 Name:           osc
-Version:        0.132.4
-Release:        4%{?dist}
+Version:        0.140.1
+Release:        107.1.1%{?dist}
 Group:          Development/Tools
 License:        GPLv2+
-Url:            http://www.gitorious.org/opensuse/osc
+Url:            https://github.com/openSUSE/osc
 #the tarball come from gitourious.
 #i check out the latest version, same as openSUSE version.
-#git clone git://gitorious.org/opensuse/osc.git
-#git archive --prefix="osc-0.132.4/" --format=tar 0.132.4| gzip > osc-0.132.4.tar.gz
+#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
 Source:         osc-%{version}.tar.gz
 Summary:        The openSUSE Build Service Commander
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  python-devel
-Requires:       rpm-python m2crypto python-lxml python-urlgrabber fuse-python
+BuildRequires:  rpm-python
+Requires:       rpm-python
+Requires:       m2crypto
+Requires:       python-lxml
+Requires:       python-urlgrabber
+Requires:       fuse-python
 
 #Recommends:     osc-source_validator
 
@@ -38,33 +38,32 @@ iconv -f ISO8859-1 -t UTF-8 -o TODO.new TODO
 mv TODO.new TODO
 
 %build
-%{__python} setup.py build
+CFLAGS="%{optflags}" %{__python} setup.py build
 
 %install
 %{__python} setup.py install -O1 --prefix=%{_prefix} --root %{buildroot}
 %__ln_s osc-wrapper.py %{buildroot}/%{_bindir}/osc
-%__mkdir_p %{buildroot}/var/lib/osc-plugins
-%__mkdir_p %{buildroot}%{_datadir}/%{name}/complete
-%__install -m 0644 dist/complete.csh %{buildroot}%{_datadir}/%{name}/complete/osc.csh
-%__install -m 0644 dist/complete.sh %{buildroot}%{_datadir}/%{name}/complete/osc.sh
-%__mkdir_p %{buildroot}/%{_prefix}/lib/osc
-%__install -m 0755 dist/osc.complete %{buildroot}/%{_prefix}/lib/osc/complete
-
-%clean
-%{__rm} -rf %{buildroot}
+%__mkdir_p %{buildroot}%{_localstatedir}/lib/osc-plugins
+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
 
 %files
-
-%defattr(-,root,root,-)
 %doc AUTHORS README TODO NEWS
 %{_bindir}/osc*
 %{python_sitelib}/*
-%{_prefix}/lib/osc/complete
-%dir /var/lib/osc-plugins
+%config %{_sysconfdir}/profile.d/osc.csh
+%config %{_sysconfdir}/profile.d/osc.sh
+%dir %{_localstatedir}/lib/osc-plugins
 %{_mandir}/man1/osc.*
-%{_datadir}/%{name}/*
+%{_prefix}/lib/osc
 
 %changelog
+* Wed Jul 17 2013 Miroslav Suchý <msuchy at redhat.com> 0.140.1-107.1.1
+- add one number to release so we can distinguish from OpenSuse v-r
+  (msuchy at redhat.com)
+- rebase to 0.140.1 (msuchy at redhat.com)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.132.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index d54de8b..80ece8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb3e246e481fee17786b960f77677e5e  osc-0.132.4.tar.gz
+f6d5cc5edf50e769836b7c56b3a9f056  osc-0.140.1.tar.gz


More information about the scm-commits mailing list