Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2013-10-06 19:37:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-country" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2013-10-02 13:34:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2013-10-06 19:37:42.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 2 14:46:53 UTC 2013 - lslezak@suse.cz + +- do not use *.spec.in template, use *.spec file with RPM macros + instead +- 3.1.0 + +------------------------------------------------------------------- Old: ---- yast2-country-3.0.2.tar.bz2 New: ---- yast2-country-3.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.ISmRKw/_old 2013-10-06 19:37:42.000000000 +0200 +++ /var/tmp/diff_new_pack.ISmRKw/_new 2013-10-06 19:37:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-country # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,25 @@ Name: yast2-country -Version: 3.0.2 +Version: 3.1.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 - -Group: System/YaST -License: GPL-2.0 #policy files for YaPI dbus interface Source1: org.opensuse.yast.modules.yapi.time.policy Source2: org.opensuse.yast.modules.yapi.language.policy -BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2 yast2-perl-bindings +BuildRequires: perl-XML-Writer BuildRequires: polkit-devel -Requires: yast2-trans-stats yast2-perl-bindings timezone +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-perl-bindings +BuildRequires: yast2-testsuite +Requires: timezone +Requires: yast2-perl-bindings +Requires: yast2-trans-stats # XVersion.ycp # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 @@ -54,8 +58,12 @@ Obsoletes: yast2-config-keyboard Obsoletes: yast2-config-language Obsoletes: yast2-config-timezone -Provides: yast2-db-country yast2-db-keyboard yast2-db-timezone -Obsoletes: yast2-db-country yast2-db-keyboard yast2-db-timezone +Provides: yast2-db-country +Provides: yast2-db-keyboard +Provides: yast2-db-timezone +Obsoletes: yast2-db-country +Obsoletes: yast2-db-keyboard +Obsoletes: yast2-db-timezone Provides: yast2-trans-inst-keyboard Obsoletes: yast2-trans-inst-keyboard Provides: yast2-trans-inst-language @@ -76,64 +84,47 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone) +License: GPL-2.0 +Group: System/YaST %description Country specific data and configuration modules (language, keyboard, timezone) for yast2. %prep -%setup -n yast2-country-%{version} +%setup -n %{name}-%{version} %build -%{_prefix}/bin/y2tool y2autoconf -%{_prefix}/bin/y2tool y2automake -autoreconf --force --install - -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" - -./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} -# V=1: verbose build in case we used AM_SILENT_RULES(yes) -# so that RPM_OPT_FLAGS check works -make %{?jobs:-j%jobs} V=1 +%yast_build %install -make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done - +%yast_install # Policies mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/actions install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ -%clean -rm -rf "$RPM_BUILD_ROOT" - # common %files %defattr(-,root,root) -%doc %{_prefix}/share/doc/packages/yast2-country +%doc %{yast_docdir} %doc COPYING -/usr/share/YaST2/modules/Console.rb -/usr/share/YaST2/modules/Keyboard.rb -/usr/share/YaST2/modules/Timezone.rb -%dir /usr/share/YaST2/modules/YaPI -/usr/share/YaST2/modules/YaPI/TIME.pm -/usr/share/YaST2/modules/YaPI/LANGUAGE.pm -/usr/share/YaST2/clients/*.rb -/usr/share/YaST2/data/*.ycp -/usr/share/YaST2/include/keyboard/ -/usr/share/YaST2/include/timezone/ -/usr/share/YaST2/scrconf/*.scr -/usr/share/YaST2/schema/autoyast/rnc/*.rnc -%{_prefix}/share/applications/YaST2/yast-language.desktop -%{_prefix}/share/applications/YaST2/timezone.desktop -%{_prefix}/share/applications/YaST2/keyboard.desktop +%{yast_moduledir}/Console.rb +%{yast_moduledir}/Keyboard.rb +%{yast_moduledir}/Timezone.rb +%dir %{yast_moduledir}/YaPI +%{yast_moduledir}/YaPI/TIME.pm +%{yast_moduledir}/YaPI/LANGUAGE.pm +%{yast_clientdir}/*.rb +%{yast_ydatadir}/*.ycp +%{yast_yncludedir}/keyboard/ +%{yast_yncludedir}/timezone/ +%{yast_scrconfdir}/*.scr +%{yast_schemadir}/autoyast/rnc/*.rnc +%{yast_desktopdir}/yast-language.desktop +%{yast_desktopdir}/timezone.desktop +%{yast_desktopdir}/keyboard.desktop %dir /usr/share/polkit-1 %dir /usr/share/polkit-1/actions %attr(644,root,root) %config /usr/share/polkit-1/actions/org.opensuse.yast.modules.yapi.*.policy @@ -150,6 +141,8 @@ %files data %defattr(-,root,root) -%dir /usr/share/YaST2/data/languages -/usr/share/YaST2/data/languages/*.ycp -/usr/share/YaST2/modules/Language.rb +%dir %{yast_ydatadir}/languages +%{yast_ydatadir}/languages/*.ycp +%{yast_moduledir}/Language.rb + +%changelog ++++++ yast2-country-3.0.2.tar.bz2 -> yast2-country-3.1.0.tar.bz2 ++++++ ++++ 23427 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org