Hello community, here is the log from the commit of package skelcd-openSUSE for openSUSE:Factory checked in at 2017-10-07 17:49:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-openSUSE" Sat Oct 7 17:49:17 2017 rev:98 rq:532225 version:84.87.20170814.54da904 Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-openSUSE/skelcd-openSUSE.changes 2017-07-30 11:24:59.801573076 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new/skelcd-openSUSE.changes 2017-10-07 17:49:18.882866961 +0200 @@ -1,0 +2,17 @@ +Fri Oct 06 13:37:26 UTC 2017 - lnus...@suse.de + +- Update to version 84.87.20170814.54da904: + * Translated using Weblate (Indonesian) + * create tarball in a reproducible way + * Translated using Weblate (Danish) +- use /usr/lib/skelcd conditionally +- run through spec-cleaner + +------------------------------------------------------------------- +Thu Oct 5 15:11:27 UTC 2017 - dims...@opensuse.org + +- Remove README.BETA unless prjconf defines _with_betatest: 1; in + the past, kiwi was dropping README.BETA, but the new product + builder does no longer take care of that. + +------------------------------------------------------------------- Old: ---- skelcd-openSUSE-84.87.20170712.1dc7ffa.tar.xz New: ---- skelcd-openSUSE-84.87.20170814.54da904.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.md8z8O/_old 2017-10-07 17:49:19.522838829 +0200 +++ /var/tmp/diff_new_pack.md8z8O/_new 2017-10-07 17:49:19.526838653 +0200 @@ -16,28 +16,36 @@ # -%define version_unconverted 84.87.20170712.1dc7ffa - -Name: skelcd-openSUSE -BuildRequires: build-key -%bcond_without java -%if %{with java} -BuildRequires: release-notes-openSUSE -# we abuse the no java path here to skip license processing in staging -BuildRequires: translate-toolkit +%define version_unconverted 84.87.20170814.54da904 +# changed by pre_checkin +%define is_non_oss 0 +# +%if 0%{?suse_version} >= 1500 +%define skelcdpath %{_prefix}/lib/skelcd %endif -Conflicts: skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-CD -Version: 84.87.20170712.1dc7ffa +# +%bcond_with betatest +%bcond_without java +# +Name: skelcd-openSUSE +Version: 84.87.20170814.54da904 Release: 0 Summary: Skeleton for openSUSE OSS Media Sets License: MIT Group: Metapackages Url: https://github.com/openSUSE/skelcd-openSUSE -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: skelcd-openSUSE-%{version}.tar.xz Source99: skelcd-openSUSE-rpmlintrc -# changed by pre_checkin -%define is_non_oss 0 +BuildRequires: build-key +Conflicts: skelcd-openSUSE-non-OSS +Conflicts: skelcd-openSUSE-non-OSS-CD +Conflicts: skelcd-sled +Conflicts: skelcd-sles +%if %{with java} +BuildRequires: release-notes-openSUSE +# we abuse the no java path here to skip license processing in staging +BuildRequires: translate-toolkit +%endif %description Internal package only, used for openSUSE OSS Media sets @@ -50,43 +58,50 @@ Internal package only, used for openSUSE non-OSS Media sets %prep -%setup +%setup -q +%if ! %{with betatest} + # Remove README.BETA unless we build a beta version (prjconf flag) + rm skelcd/README.BETA +%endif %build -DIST="%distribution" +DIST="%{distribution}" DISTVER=${DIST#openSUSE } if [ "$DISTVER" = 'Factory' ]; then DISTVER=Tumbleweed fi sed -i -e"s@#VERSION#@$DISTVER@g" license/license.txt %if %{with java} -make VERSION="$DISTVER" +make %{?_smp_mflags} VERSION="$DISTVER" %else # build without translate-toolkit support in staging -make VERSION="$DISTVER" LICENSES= +make %{?_smp_mflags} VERSION="$DISTVER" LICENSES= %endif # %install -mkdir -p $RPM_BUILD_ROOT/CD1/boot +mkdir -p %{buildroot}%{?skelcdpath}/CD1/boot # YaST uses release notes txt for textmode installation and rtf for graphical %if %{with java} - mkdir -p $RPM_BUILD_ROOT/CD1/docu - cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.*.{rtf,txt} $RPM_BUILD_ROOT/CD1/docu + mkdir -p %{buildroot}%{?skelcdpath}/CD1/docu + cp -p %{_datadir}/doc/release-notes/openSUSE/RELEASE-NOTES.*.{rtf,txt} %{buildroot}%{?skelcdpath}/CD1/docu %endif # -# Note: kiwi will remove README.BETA for final product. -cp skelcd/* $RPM_BUILD_ROOT/CD1/ -install -m 644 /usr/lib/rpm/gnupg/keys/*.asc $RPM_BUILD_ROOT/CD1/ +cp skelcd/* %{buildroot}%{?skelcdpath}/CD1/ +install -m 644 %{_prefix}/lib/rpm/gnupg/keys/*.asc %{buildroot}%{?skelcdpath}/CD1/ %files -%defattr(644,root,root,755) -/CD1 +%if %{defined skelcdpath} +%dir %{skelcdpath} +%endif +%{?skelcdpath}/CD1 %files non-OSS -%defattr(644,root,root,755) -/CD1 -%exclude /CD1/docu -%exclude /CD1/license.tar.gz +%if %{defined skelcdpath} +%dir %{skelcdpath} +%endif +%{?skelcdpath}/CD1 +%exclude %{?skelcdpath}/CD1/docu +%exclude %{?skelcdpath}/CD1/license.tar.gz %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.md8z8O/_old 2017-10-07 17:49:19.570836719 +0200 +++ /var/tmp/diff_new_pack.md8z8O/_new 2017-10-07 17:49:19.574836543 +0200 @@ -1,5 +1,5 @@ <services> - <service name="tar_scm" mode="localonly"> + <service name="tar_scm" mode="disabled"> <param name="versionformat">%cd.%h</param> <!-- it's tumbleweed --> <param name="versionprefix">84.87</param> @@ -7,9 +7,9 @@ <param name="scm">git</param> <param name="changesgenerate">enable</param> </service> - <service name="recompress" mode="localonly"> + <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="localonly"/> + <service name="set_version" mode="disabled"/> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.md8z8O/_old 2017-10-07 17:49:19.610834960 +0200 +++ /var/tmp/diff_new_pack.md8z8O/_new 2017-10-07 17:49:19.610834960 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/skelcd-openSUSE.git</param> - <param name="changesrevision">1dc7ffa6504180fca15b25c3c92c6ee706b203ad</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">54da904b42a07b268ccd2db81a6c8591a35917db</param></service></servicedata> \ No newline at end of file ++++++ skelcd-openSUSE-84.87.20170712.1dc7ffa.tar.xz -> skelcd-openSUSE-84.87.20170814.54da904.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20170712.1dc7ffa/Makefile new/skelcd-openSUSE-84.87.20170814.54da904/Makefile --- old/skelcd-openSUSE-84.87.20170712.1dc7ffa/Makefile 2017-07-12 20:04:44.000000000 +0200 +++ new/skelcd-openSUSE-84.87.20170814.54da904/Makefile 2017-08-14 10:45:57.000000000 +0200 @@ -5,7 +5,8 @@ all: skelcd/license.tar.gz skelcd/license.tar.gz: $(LICENSES) | license/TEMPLATE - cd license && tar --owner=root --group=root -czf ../$@ no-acceptance-needed *.txt + [ -z "$$SOURCE_DATE_EPOCH" ] || rbopts="--mtime @$$SOURCE_DATE_EPOCH --format=gnu" ; \ + cd license && tar $$rbopts --owner=root --group=root -c no-acceptance-needed *.txt | gzip -n9 > ../$@ clean: rm -f skelcd/license.tar.gz $(LICENSES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20170712.1dc7ffa/license/license.da.po new/skelcd-openSUSE-84.87.20170814.54da904/license/license.da.po --- old/skelcd-openSUSE-84.87.20170712.1dc7ffa/license/license.da.po 2017-07-12 20:04:44.000000000 +0200 +++ new/skelcd-openSUSE-84.87.20170814.54da904/license/license.da.po 2017-08-14 10:45:57.000000000 +0200 @@ -1,3 +1,5 @@ +# scootergrisen, 2017. +# extracted from license/TEMPLATE #. extracted from license/TEMPLATE msgid "" msgstr "" @@ -5,7 +7,7 @@ "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-31 11:11+0200\n" "PO-Revision-Date: 2017-07-11 17:07+0000\n" -"Last-Translator: Martin Schlander <martin.schlan...@gmail.com>\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish <https://l10n.opensuse.org/projects/skelcd-" "opensuse/master/da/>\n" "Language: da\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-openSUSE-84.87.20170712.1dc7ffa/license/license.id.po new/skelcd-openSUSE-84.87.20170814.54da904/license/license.id.po --- old/skelcd-openSUSE-84.87.20170712.1dc7ffa/license/license.id.po 2017-07-12 20:04:44.000000000 +0200 +++ new/skelcd-openSUSE-84.87.20170814.54da904/license/license.id.po 2017-08-14 10:45:57.000000000 +0200 @@ -5,8 +5,8 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-31 11:11+0200\n" -"PO-Revision-Date: 2016-11-07 05:02+0000\n" -"Last-Translator: M. Edwin Zakaria <med...@opensuse.org>\n" +"PO-Revision-Date: 2017-07-23 19:43+0700\n" +"Last-Translator: Arif Budiman <arifpe...@gmail.com>\n" "Language-Team: Indonesian <https://l10n.opensuse.org/projects/skelcd-" "opensuse/master/id/>\n" "Language: id\n" @@ -14,7 +14,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.6\n" +"X-Generator: Poedit 2.0.2\n" #: license/TEMPLATE:1 msgid "" @@ -56,7 +56,7 @@ "openSUSE #VERSION# dan pembaruannya, tanpa memperhatikan mekanisme " "penyaluran.\n" "openSUSE #VERSION# adalah karya kolektif dibawah Undang-Undang Hak Cipta\n" -"Amerika Serikat. Tunduk pada ketentuan berikut, openSUSE Project\n" +"Amerika Serikat. Tunduk pada ketentuan berikut, Proyek openSUSE\n" "memberikan hak lisensi kepada Anda untuk karya kolektif ini sesuai dengan\n" "Lisensi Publik Umum GNU versi 2. Dengan mengunduh, memasang, atau " "menggunakan\n"