Hello community, here is the log from the commit of package scout for openSUSE:Factory checked in at 2016-06-03 16:36:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scout (Old) and /work/SRC/openSUSE:Factory/.scout.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scout" Changes: -------- --- /work/SRC/openSUSE:Factory/scout/scout.changes 2015-10-30 13:41:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scout.new/scout.changes 2016-06-03 16:36:15.000000000 +0200 @@ -1,0 +2,20 @@ +Mon May 30 13:17:25 UTC 2016 - [email protected] + +- Update to version 0.1.0+20160523.472154b: + * Translated using Weblate (German) + * Translated using Weblate (Lithuanian) + * Translated using Weblate (Polish) + * Translated using Weblate (Dutch) + * Translated using Weblate (Norwegian Nynorsk) + * Translated using Weblate (German) + * Translated using Weblate (Arabic) + * Translated using Weblate (French) + * Translated using Weblate (Korean) + * Translated using Weblate (Swedish) + +------------------------------------------------------------------- +Mon May 30 12:59:35 UTC 2016 - [email protected] + +- Cleanup a bit to have the spec readable and point to proper url + +------------------------------------------------------------------- Old: ---- scout-0.1.0+20151023.tar.xz New: ---- scout-0.1.0+20160523.472154b.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scout.spec ++++++ --- /var/tmp/diff_new_pack.zOJeXc/_old 2016-06-03 16:36:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zOJeXc/_new 2016-06-03 16:36:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scout # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,84 +16,35 @@ # +%define cnfrepo zypp Name: scout -Version: 0.1.0+20151023 +Version: 0.1.0+20160523.472154b Release: 0 -Url: http://old-en.opensuse.org/Scout Summary: Indexing Package Properties License: MIT Group: System/Packages +Url: https://github.com/openSUSE/scout/ Source: %{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gettext BuildRequires: python +BuildRequires: python-solv +BuildRequires: python-xml BuildRequires: rpm-python Requires: python - -%if 0%{?suse_version} -BuildRequires: python-xml -Requires: python-xml -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%else -%define python_sitelib %{py_sitedir} -%endif -%if 0%{?suse_version} > 1100 -BuildRequires: python-solv Requires: python-solv >= 0.6.0 -%endif -%else +Requires: python-xml +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%endif %description The scout tool helps with indexing of various package properties. - -%define scoutrepo none -%define cnfrepo none - -%if 0%{?suse_version} > 1120 -%define scoutrepo suse113 -%define cnfrepo zypp -%endif -%if 0%{?suse_version} <= 1120 && 0%{?suse_version} > 1110 -%define scoutrepo suse112 -%define cnfrepo zypp -%endif -%if 0%{?suse_version} <= 1110 && 0%{?suse_version} > 1100 -%define scoutrepo suse111 -%define cnfrepo zypp -%endif -%if 0%{?suse_version} <= 1100 && 0%{?suse_version} > 1030 -%define scoutrepo suse110 -%define cnfrepo suse110 -%endif -%if 0%{?suse_version} <= 1030 && 0%{?suse_version} > 1020 -%define scoutrepo suse103 -%define cnfrepo suse103 -%endif -%if 0%{?sles_version} == 10 -%define scoutrepo sle10 -%define cnfrepo sle10 -%endif - -%if %{cnfrepo} != none - %package -n command-not-found -Version: 0.1.0+20151023 -Release: 0 Summary: Command Not Found extension for shell Group: System/Packages Requires: python Requires: rpm-python Requires: scout = %{version}-%{release} -%if 0%{?suse_version} && 0%{?suse_version} <= 1100 -Requires: bash(CommandNotFound) -%endif -%if %{cnfrepo} != zypp -Requires: scout-bin-%{cnfrepo} -%endif %description -n command-not-found The "command not found" message is not very helpful. If e.g. the unzip @@ -101,30 +52,6 @@ interesting if the system could tell that the command is currently not available, but installing a package would provide it. - - -%endif - -# %if %{scoutrepo} != none -# -# %package -n python-import-error -# Version: 0.1.0 -# Release: 1 -# License: X11/MIT -# Group: System/Packages -# Summary: Import Error extension for python interpretter -# Requires: scout = %{version}-%{release} -# Requires: python(ImportError) -# Requires: scout-python-%{scoutrepo} -# -# %description -n python-import-error -# The "Import Error exception" is not really helpfull (as a "command not found" -# in shell). This package contains an ImportError exception handler called by -# (patched) Python interpreter, which could tell to the user, where the missing -# Python module is. -# -# %endif - %prep %setup -q @@ -135,55 +62,45 @@ %install # --- scout --- # install python scripts -mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name} +mkdir -p %{buildroot}%{python_sitelib}/%{name} shopt -s extglob -cp -a scout/!(foo).py{,c} $RPM_BUILD_ROOT%{python_sitelib}/%{name} +cp -a scout/!(foo).py{,c} %{buildroot}%{python_sitelib}/%{name} # install data files -install -D -m 0644 repos.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/repos.conf +install -D -m 0644 repos.conf %{buildroot}%{_datadir}/%{name}/repos.conf # install scout binary -install -D -m 0755 scout-cmd.py $RPM_BUILD_ROOT%{_bindir}/%{name} +install -D -m 0755 scout-cmd.py %{buildroot}%{_bindir}/%{name} # install bash completion -install -D -m 0644 scout-bash-completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/scout.sh +install -D -m 0644 scout-bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/scout.sh # install manpage -install -D -m 0644 doc/scout.1 $RPM_BUILD_ROOT%{_mandir}/man1/scout.1 +install -D -m 0644 doc/scout.1 %{buildroot}%{_mandir}/man1/scout.1 # install and find languages for po in i18n/scout/*.po; do pofile=${po##*/} lang=${pofile%.po} msgfmt $po -o i18n/scout/$lang.mo - install -D -m 0644 i18n/scout/$lang.mo $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/scout.mo + install -D -m 0644 i18n/scout/$lang.mo %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/scout.mo done %find_lang scout -%if %{cnfrepo} != none # --- command-not-found --- -install -D -m 0755 handlers/bin/command-not-found $RPM_BUILD_ROOT%{_bindir}/command-not-found -ln -sf command-not-found $RPM_BUILD_ROOT%{_bindir}/cnf +install -D -m 0755 handlers/bin/command-not-found %{buildroot}%{_bindir}/command-not-found +ln -sf command-not-found %{buildroot}%{_bindir}/cnf # install manpage -install -D -m 0644 doc/command-not-found.1 $RPM_BUILD_ROOT%{_mandir}/man1/command-not-found.1 -ln -sf command-not-found.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cnf.1.gz +install -D -m 0644 doc/command-not-found.1 %{buildroot}%{_mandir}/man1/command-not-found.1 +ln -sf command-not-found.1.gz %{buildroot}%{_mandir}/man1/cnf.1.gz # install shell handlers for shell in bash zsh; do - install -D -m 644 handlers/bin/command_not_found_${shell} $RPM_BUILD_ROOT%{_sysconfdir}/${shell}_command_not_found - sed -i 's:__REPO__:%{cnfrepo}:' $RPM_BUILD_ROOT%{_sysconfdir}/${shell}_command_not_found + install -D -m 644 handlers/bin/command_not_found_${shell} %{buildroot}%{_sysconfdir}/${shell}_command_not_found + sed -i 's:__REPO__:%{cnfrepo}:' %{buildroot}%{_sysconfdir}/${shell}_command_not_found done # install and find languages for po in i18n/command-not-found/*.po; do pofile=${po##*/} lang=${pofile%.po} msgfmt $po -o i18n/command-not-found/$lang.mo - install -D -m 0644 i18n/command-not-found/$lang.mo $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/command-not-found.mo + install -D -m 0644 i18n/command-not-found/$lang.mo %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/command-not-found.mo done %find_lang command-not-found -%endif - -# %if %{scoutrepo} != none -# # --- python-import-error --- -# install -D -m 0755 handlers/python/python_import_error_handler $RPM_BUILD_ROOT/%{python_sitelib}/python_import_error_handler -# %endif - -%clean -rm -rf $RPM_BUILD_ROOT %files -f scout.lang %defattr(-,root,root) @@ -194,8 +111,6 @@ %config %{_sysconfdir}/bash_completion.d/* %{_mandir}/man1/scout* -%if %{cnfrepo} != none - %files -n command-not-found -f command-not-found.lang %defattr(-,root,root) %doc handlers/bin/README @@ -205,14 +120,4 @@ %{_mandir}/man1/cnf* %{_mandir}/man1/command-not-found* -%endif - -# %if %{scoutrepo} != none -# -# %files -n python-import-error -# %defattr(-,root,root) -# %{python_sitelib}/python_import_error_handler -# -# %endif - %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.zOJeXc/_old 2016-06-03 16:36:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zOJeXc/_new 2016-06-03 16:36:16.000000000 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/openSUSE/scout.git</param> <param name="scm">git</param> - <param name="versionformat">0.1.0+%cd</param> + <param name="versionformat">0.1.0+%cd.%h</param> <param name="submodules">enable</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.zOJeXc/_old 2016-06-03 16:36:16.000000000 +0200 +++ /var/tmp/diff_new_pack.zOJeXc/_new 2016-06-03 16:36:16.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/scout.git</param> - <param name="changesrevision">1013a910be9a661b31ec41d31e815eac33798e54</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">472154ba8641d9ebe495ef0596dee9aa2566c8b9</param></service></servicedata> \ No newline at end of file
