Hello community, here is the log from the commit of package skelcd-openSUSE for openSUSE:Factory checked in at 2015-12-13 09:34:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-openSUSE/skelcd-openSUSE.changes 2015-10-28 17:14:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new/skelcd-openSUSE.changes 2015-12-13 09:34:35.000000000 +0100 @@ -1,0 +2,24 @@ +Mon Dec 7 21:04:52 UTC 2015 - dval...@suse.com + +- include no-acceptance-needed file into license tarball + +------------------------------------------------------------------- +Fri Dec 4 00:52:50 UTC 2015 - dval...@suse.com + +- Let prj conf decide if we want java or not. Build with release + notes by default + +------------------------------------------------------------------- +Wed Nov 25 12:49:01 UTC 2015 - lnus...@suse.com + +- move actual files to Github, use service file to generate +- drop -CD subpackage as it is unused +- build skelcd-openSUSE-non-OSS in same spec + +------------------------------------------------------------------- +Wed Nov 18 13:18:11 UTC 2015 - dims...@opensuse.org + +- Release notes are now only published in 'unified' English: copy + the relevant files. + +------------------------------------------------------------------- Old: ---- README license-SL.tar.bz2 pre_checkin.sh skelcd-openSUSE-non-OSS.changes skelcd-openSUSE-non-OSS.spec skelcd.tar.bz2 New: ---- _service _servicedata skelcd-openSUSE-84.87.20151207.94a820e.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.wwg6a5/_old 2015-12-13 09:34:36.000000000 +0100 +++ /var/tmp/diff_new_pack.wwg6a5/_new 2015-12-13 09:34:36.000000000 +0100 @@ -18,26 +18,21 @@ Name: skelcd-openSUSE BuildRequires: build-key -%ifarch %ix86 x86_64 %bcond_without java -%else -%bcond_with java -%endif %if %{with java} BuildRequires: release-notes-openSUSE %endif BuildRequires: recode -Conflicts: skelcd-SUSE_Linux skelcd-SUSE_Linux-AddOn skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-CD -Version: 2014.06.04 +Conflicts: skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-CD +Version: 84.87.20151207.94a820e 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.tar.bz2 -Source2: README -Source5: license-SL.tar.bz2 -Source7: skelcd-openSUSE-rpmlintrc +Source: skelcd-openSUSE-%{version}.tar.xz +Source99: skelcd-openSUSE-rpmlintrc # changed by pre_checkin %define is_non_oss 0 # define our version @@ -46,27 +41,15 @@ %description Internal package only, used for openSUSE OSS Media sets - - -%if !%is_non_oss - -%package CD -Summary: Skeleton for openSUSE OSS Media Sets +%package non-OSS +Summary: Skeleton for openSUSE non-OSS Media Sets Group: Metapackages -Conflicts: skelcd-SUSE_Linux skelcd-SUSE_Linux-AddOn skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-DVD skelcd-openSUSE-non-OSS-CD skelcd-openSUSE skelcd-openSUSE-FTP skelcd-openSUSE-CD-KDE skelcd-openSUSE-CD-GNOME - -%description CD -Internal package only, used for openSUSE OSS Media sets - - -%endif +%description non-OSS +Internal package only, used for openSUSE non-OSS Media sets %prep -%setup -n skelcd -%if !%is_non_oss -tar xvf %{S:5} -%endif +%setup %build @@ -75,69 +58,31 @@ BUILD_DISTRIBUTION_VERSION=%distribution_version # for now ... end test -e /.buildenv && . /.buildenv -%if !%is_non_oss -mkdir -p $RPM_BUILD_ROOT/CD1/docu -%endif mkdir -p $RPM_BUILD_ROOT/CD1/boot -cp READMEs/* $RPM_BUILD_ROOT/CD1/ -install -m 644 /usr/lib/rpm/gnupg/keys/*.asc $RPM_BUILD_ROOT/CD1/ -%ifarch ppc - rm -fv $RPM_BUILD_ROOT/CD1/SuSEgo.ico -%endif DATE_ENG=`date +"%%Y/%%m/%%d"` -pwd -ls -la -for i in README ; do - sed -e "s@#DATE#@$DATE_ENG@" \ - -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@g" $RPM_SOURCE_DIR/$i \ - > $RPM_BUILD_ROOT/CD1/$i -# but Mac linebreaks -%ifarch ppc - cp $RPM_BUILD_ROOT/CD1/$i $RPM_BUILD_ROOT/CD1/$i.mac.txt - recode utf8..mac $RPM_BUILD_ROOT/CD1/$i.mac.txt -%endif -done -%if !%is_non_oss -# -# Copy the right README.BETA or LICENSE.TXT file -# Note: kiwi will remove README.BETA for final product. # -# this is just a template -rm license-SL/license.translate.txt # Add infos to license files -for i in license-SL/license*; do - sed -i -e "s@#DATE#@$DATE_ENG@" \ - -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@g" $i -done -pushd license-SL -touch no-acceptance-needed -tar cvzf license.tar.gz --owner=root --group=root *txt no-acceptance-needed -cp license.tar.gz $RPM_BUILD_ROOT/CD1/ -popd - +sed -i -e "s@#DATE#@$DATE_ENG@" \ + -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@g" license/license*.txt +make +# YaST uses release notes txt for textmode installation and rtf for graphical %if %{with java} -# docudir stuff -# -# Install release notes as HTML and rtf (yast rtf) pages -# -cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en_US.html $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.html -cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en_US.rtf $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.rtf -%endif + mkdir -p $RPM_BUILD_ROOT/CD1/docu + cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.*.{rtf,txt} $RPM_BUILD_ROOT/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/ %files %defattr(644,root,root,755) /CD1 -%if !%is_non_oss -%doc /CD1/docu/ -%files CD +%files non-OSS %defattr(644,root,root,755) /CD1 %exclude /CD1/docu -%ifnarch ppc -%exclude /CD1/SuSEgo.ico -%endif -%endif +%exclude /CD1/license.tar.gz %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="localonly"> <param name="versionformat">%cd.%h</param> <!-- it's tumbleweed --> <param name="versionprefix">84.87</param> <param name="url">git://github.com/openSUSE/skelcd-openSUSE.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="localonly"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="localonly"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/skelcd-openSUSE.git</param> <param name="changesrevision">94a820ea3f5e5f94bc1ff082700b1d87534a9202</param></service></servicedata>