commit skelcd-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-openSUSE for openSUSE:Factory checked in at 2011-11-05 11:08:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-openSUSE", Maintainer is "coolo@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-openSUSE/skelcd-openSUSE-non-OSS.changes 2011-11-02 12:18:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new/skelcd-openSUSE-non-OSS.changes 2011-11-05 11:31:08.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 3 09:04:30 UTC 2011 - aj@suse.de + +- Update FSF Address in GPL v2 document. + +------------------------------------------------------------------- +Thu Nov 3 08:51:41 UTC 2011 - aj@suse.de + +- Do not package empty docu dir for non-oss. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/skelcd-openSUSE/skelcd-openSUSE.changes 2011-11-02 12:18:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-openSUSE.new/skelcd-openSUSE.changes 2011-11-05 11:31:08.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Nov 3 09:04:30 UTC 2011 - aj@suse.de + +- Update FSF Address in GPL v2 document. +- Remove obsolete comments about README.BETA + +------------------------------------------------------------------- +Thu Nov 3 08:51:41 UTC 2011 - aj@suse.de + +- Do not package empty docu dir for non-oss. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE-non-OSS.spec ++++++ --- /var/tmp/diff_new_pack.3Ld4cI/_old 2011-11-05 11:34:38.000000000 +0100 +++ /var/tmp/diff_new_pack.3Ld4cI/_new 2011-11-05 11:34:38.000000000 +0100 @@ -72,7 +72,10 @@ BUILD_DISTRIBUTION_VERSION=%distribution_version # for now ... end test -e /.buildenv && . /.buildenv -mkdir -p $RPM_BUILD_ROOT/CD1/{boot,docu} +%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/ test -s /usr/lib/rpm/gnupg/pubring.gpg || exit 1 cp -v /usr/lib/rpm/gnupg/pubring.gpg $RPM_BUILD_ROOT/CD1/ @@ -126,7 +129,7 @@ popd # docudir stuff # -# SuSE manuals +# SUSE manuals # # The SUSE Linux Manuals (PDF) # ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.3Ld4cI/_old 2011-11-05 11:34:38.000000000 +0100 +++ /var/tmp/diff_new_pack.3Ld4cI/_new 2011-11-05 11:34:38.000000000 +0100 @@ -72,7 +72,10 @@ BUILD_DISTRIBUTION_VERSION=%distribution_version # for now ... end test -e /.buildenv && . /.buildenv -mkdir -p $RPM_BUILD_ROOT/CD1/{boot,docu} +%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/ test -s /usr/lib/rpm/gnupg/pubring.gpg || exit 1 cp -v /usr/lib/rpm/gnupg/pubring.gpg $RPM_BUILD_ROOT/CD1/ @@ -113,6 +116,7 @@ %if !%is_non_oss # # Copy the right README.BETA or LICENSE.TXT file +# Note: kiwi will remove README.BETA for final product. # # Add infos to license files for i in license-SL/license*; do @@ -126,7 +130,7 @@ popd # docudir stuff # -# SuSE manuals +# SUSE manuals # # The SUSE Linux Manuals (PDF) # @@ -138,8 +142,6 @@ cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.html cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.rtf $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.rtf %endif -# uncomment for final -#rm $RPM_BUILD_ROOT/CD1/README.BETA* %files %defattr(644,root,root,755) ++++++ skelcd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd/READMEs/GPLv2.txt new/skelcd/READMEs/GPLv2.txt --- old/skelcd/READMEs/GPLv2.txt 2006-08-15 13:28:22.000000000 +0200 +++ new/skelcd/READMEs/GPLv2.txt 2006-08-15 13:28:22.000000000 +0200 @@ -303,9 +303,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de