commit yast2-packager

30 Oct 2008

Hello community,

here is the log from the commit of package yast2-packager
checked in at Thu Oct 30 15:11:32 CET 2008.


--------

--- yast2-packager/yast2-packager.changes	2008-10-27 16:36:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes	2008-10-29 16:36:13.004776000 +0100
@@ -1,0 +2,6 @@
+Wed Oct 29 15:33:45 CET 2008 - lslezak@suse.cz
+
+- copy slideshow to the correct place (bnc#439799)
+- 2.17.36
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  yast2-packager-2.17.35.tar.bz2

New:
----
  yast2-packager-2.17.36.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.s29177/_old	2008-10-30 15:11:27.000000000 +0100
+++ /var/tmp/diff_new_pack.s29177/_new	2008-10-30 15:11:27.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-packager (Version 2.17.35)
+# spec file for package yast2-packager (Version 2.17.36)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,12 +19,12 @@
 
 
 Name:           yast2-packager
-Version:        2.17.35
+Version:        2.17.36
 Release:        1
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-packager-2.17.35.tar.bz2
+Source0:        yast2-packager-2.17.36.tar.bz2
 Prefix:         /usr
 BuildRequires:  gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
 # HTTP.ycp
@@ -78,7 +78,7 @@
     Arvin Schnell <arvin@suse.de>
 
 %prep
-%setup -n yast2-packager-2.17.35
+%setup -n yast2-packager-2.17.36
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -113,7 +113,11 @@
 /usr/share/YaST2/scrconf/*
 %{prefix}/lib/YaST2/servers_non_y2/ag_*
 %doc %{prefix}/share/doc/packages/yast2-packager
+
 %changelog
+* Wed Oct 29 2008 lslezak@suse.cz
+- copy slideshow to the correct place (bnc#439799)
+- 2.17.36
 * Mon Oct 27 2008 locilka@suse.cz
 - Reporting an error if software proposal cache is invalid
   (bnc #436925).

++++++ yast2-packager-2.17.35.tar.bz2 -> yast2-packager-2.17.36.tar.bz2 ++++++
++++ 3201 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.17.35/configure.in new/yast2-packager-2.17.36/configure.in
--- old/yast2-packager-2.17.35/configure.in	2008-10-09 19:19:24.000000000 +0200
+++ new/yast2-packager-2.17.36/configure.in	2008-10-29 16:35:56.000000000 +0100
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-packager, 2.17.27, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.36, http://bugs.opensuse.org/, yast2-packager)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -18,7 +18,7 @@
 AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
 
 dnl Important YaST2 variables
-VERSION="2.17.27"
+VERSION="2.17.36"
 RPMNAME="yast2-packager"
 MAINTAINER="Ladislav Slezak <lslezak@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.17.35/src/modules/Packages.ycp new/yast2-packager-2.17.36/src/modules/Packages.ycp
--- old/yast2-packager-2.17.35/src/modules/Packages.ycp	2008-10-27 14:17:27.000000000 +0100
+++ new/yast2-packager-2.17.36/src/modules/Packages.ycp	2008-10-29 15:35:44.000000000 +0100
@@ -3,7 +3,7 @@
  * Package:	Package selections
  * Authors:	Anas Nashif <nashif@suse.de>
  *
- * $Id: Packages.ycp 52587 2008-10-27 13:17:35Z locilka $
+ * $Id: Packages.ycp 52677 2008-10-29 14:34:55Z lslezak $
  */
 
 {
@@ -1096,8 +1096,12 @@
     WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (loc_slidedir)));
 
     // copy all files to our own cache
-    y2milestone ("Copying %1/* to %2", providedir, String::Quote (loc_slidedir));
-    WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", providedir, String::Quote (loc_slidedir)));
+    string copy_command = sformat("cp -r '%1/%2/txt/%3'/* '%4'",
+	String::Quote(providedir), String::Quote(search_for_dir),
+	String::Quote(used_loc_dir), String::Quote(loc_slidedir));
+
+    y2milestone ("Copying: %1", copy_command);
+    WFM::Execute (.local.bash, copy_command);
 
     // where images are stored
     string imagesdir = sformat ("%1/pic", search_for_dir);
@@ -1109,8 +1113,11 @@
 	string our_imagesdir = sformat ("%1/pic/", our_slidedir);
 	WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (our_imagesdir)));
 
-	y2milestone ("Copying %1/* to '%2'", imagesdir, String::Quote (our_imagesdir));
-	WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", imagesdir, String::Quote (our_imagesdir)));
+	copy_command = sformat("cp -r '%1/%2/pic'/* '%3'",
+	    String::Quote(imagesdir), String::Quote(search_for_dir), String::Quote (our_imagesdir));
+
+	y2milestone ("Copying: %1", copy_command);
+	WFM::Execute (.local.bash, copy_command);
     } else {
 	y2error ("No such dir: %1", imagesdir);
     }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.17.35/VERSION new/yast2-packager-2.17.36/VERSION
--- old/yast2-packager-2.17.35/VERSION	2008-10-27 16:37:23.000000000 +0100
+++ new/yast2-packager-2.17.36/VERSION	2008-10-29 15:35:24.000000000 +0100
@@ -1 +1 @@
-2.17.35
+2.17.36


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)