Accepting request 73831 from home:saschpe:branches:openSUSE:Tools

Spec file cleaner run, updated recommends.

OBS-URL: https://build.opensuse.org/request/show/73831
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=90

osc.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jun 16 09:50:55 UTC 2011 - saschpe@suse.de
+
+- spec file cleanup:
+  * run spec-cleaner
+  * simplified some shell commands
+- recommend obs-service-download_files,
+  obs-service-format_spec_file, obs-service-source_validator
+- remove recommends for osc-source_validator
+
 -------------------------------------------------------------------
 Wed Jun 15 12:20:07 UTC 2011 - adrian@suse.de
 

osc.spec

@@ -20,45 +20,50 @@
 Name:           osc
 Version:        0.132.4
 Release:        1
-Group:          Development/Tools/Other
 License:        GPLv2+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Url:            http://www.gitorious.org/opensuse/osc
-Source:         osc-%{version}.tar.gz
 Summary:        openSUSE Build Service Commander
+Url:            http://www.gitorious.org/opensuse/osc
+Group:          Development/Tools/Other
+Source:         %{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?mandriva_version} < 02010
-Requires:       python-urlgrabber
 BuildRequires:  python-urlgrabber
+Requires:       python-urlgrabber
 %endif
 BuildRequires:  python-devel
-%if 0%{?mandriva_version} 
+%if 0%{?mandriva_version}
-Requires:       python-rpm
 BuildRequires:  python-rpm
+Requires:       python-rpm
 %else
-Requires:       rpm-python
 BuildRequires:  rpm-python
+Requires:       rpm-python
 %endif
 #
 %if 0%{?suse_version}
-%if %suse_version < 1020
+%if 0%{?suse_version} < 1020
 BuildRequires:  python-elementtree
 Requires:       python-elementtree
 %else
 BuildRequires:  python-xml
 Requires:       python-xml
 %endif
-%if %suse_version > 1110
+%if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
-%if %suse_version > 1000
+%if 0%{?suse_version} > 1000
-Recommends:     osc-source_validator
 Recommends:     build >= 2010.05.04
 # These packages are needed for "osc add $URL"
-Recommends:     obs-service-set_version obs-service-tar_scm obs-service-recompress obs-service-verify_file
+Recommends:     obs-service-recompress
+Recommends:     obs-service-set_version
+Recommends:     obs-service-tar_scm
+Recommends:     obs-service-verify_file
+Recommends:     obs-service-download_files
+Recommends:     obs-service-format_spec_file
+Recommends:     obs-service-source_validator
 %endif
 %endif
 %if 0%{?rhel_version} || 0%{?centos_version}
-%if 0%{?rhel_version} < 600 
+%if 0%{?rhel_version} < 600
 BuildRequires:  python-elementtree
 Requires:       python-elementtree
 %endif
@@ -70,15 +75,13 @@ Requires:       python-m2crypto > 0.19
 BuildRequires:  m2crypto
 Requires:       m2crypto > 0.19
 %endif
-%if 0%{?mandriva_version} 
+%if 0%{?mandriva_version}
-Requires:       python-rpm
 BuildRequires:  python-rpm
+Requires:       python-rpm
 %else
-Requires:       rpm-python
 BuildRequires:  rpm-python
+Requires:       rpm-python
 %endif
-
-#
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 
@@ -89,52 +92,45 @@ See http://en.opensuse.org/openSUSE:OSC , as well as
 http://en.opensuse.org/openSUSE:Build_Service_Tutorial for a general
 introduction.
 
-
 %prep
 %setup -q
 
 
 %build
-CFLAGS="%{optflags}" \
+CFLAGS="%{optflags}" python setup.py build
-%{__python} setup.py build
 
 
 %install
-%{__python} setup.py install --prefix=%{_prefix} --root %{buildroot}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-%__ln_s osc-wrapper.py %{buildroot}/%{_bindir}/osc
+ln -s osc-wrapper.py %{buildroot}/%{_bindir}/osc
-%__mkdir_p %{buildroot}/var/lib/osc-plugins
+mkdir -p %{buildroot}%{_localstatedir}/lib/osc-plugins
-%__mkdir_p %{buildroot}%{_sysconfdir}/profile.d
+install -Dm0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh
-%__install -m 0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh
+install -Dm0644 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh
-%__install -m 0644 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh
 %if 0%{?suse_version} > 1110
-%__mkdir_p %{buildroot}%{_prefix}/lib/osc
+install -Dm0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete
-%__install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete
 %else
-%__mkdir_p %{buildroot}%{_prefix}/%{_lib}/osc
+install -Dm0755 dist/osc.complete %{buildroot}%{_libdir}/osc/complete
-%__install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/%{_lib}/osc/complete
 %endif
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc AUTHORS README TODO NEWS
 %{_bindir}/osc*
 %{python_sitelib}/*
-%config %{_sysconfdir}/profile.d/osc.sh
 %config %{_sysconfdir}/profile.d/osc.csh
+%config %{_sysconfdir}/profile.d/osc.sh
+%dir %{_localstatedir}/lib/osc-plugins
+%{_mandir}/man1/osc.*
 %if 0%{?suse_version} > 1110
-%dir %{_prefix}/lib/osc
+%{_prefix}/lib/osc
-%{_prefix}/lib/osc/complete
 %else
-%dir %{_prefix}/%{_lib}/osc
+%{_libdir}/osc
-%{_prefix}/%{_lib}/osc/complete
 %endif
-%dir /var/lib/osc-plugins
-%doc AUTHORS README TODO NEWS
-%doc %_mandir/man1/osc.*