commit scpm

27 Oct 2008

Hello community,

here is the log from the commit of package scpm
checked in at Mon Oct 27 17:15:31 CET 2008.


--------

--- scpm/scpm.changes	2008-08-18 18:12:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/scpm/scpm.changes	2008-10-22 12:39:08.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Oct 22 12:36:00 CEST 2008 - helmut.schaa@gmail.com
+
+- update to 1.1.7 final
+  * added bash completion (bnc#400354)
+  * fix build with gcc 4.3
+- remove patch scpm-gcc43.diff
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  scpm-1.1.6.tar.bz2
  scpm-gcc43.diff

New:
----
  scpm-1.1.7.tar.bz2

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

Other differences:
------------------
++++++ scpm.spec ++++++
--- /var/tmp/diff_new_pack.RJ2384/_old	2008-10-27 17:15:12.000000000 +0100
+++ /var/tmp/diff_new_pack.RJ2384/_new	2008-10-27 17:15:12.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package scpm (Version 1.1.6)
+# spec file for package scpm (Version 1.1.7)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,13 +21,12 @@
 Name:           scpm
 BuildRequires:  doxygen gcc-c++ graphviz libjpeg-devel libpng-devel mhash-devel
 Summary:        System Configuration Profile Management
-Version:        1.1.6
-Release:        94
+Version:        1.1.7
+Release:        1
 Group:          System/Base
 License:        GPL v2 or later
 Source:         scpm-%{version}.tar.bz2
 Source1:        logrotate-scpm
-Patch0:         scpm-gcc43.diff
 Patch1:         fix_boot_script.patch
 Requires:       diffutils textutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -63,7 +62,6 @@
 
 %prep
 %setup scpm
-%patch0 -p1
 %patch1 -p0
 
 %build
@@ -111,6 +109,7 @@
 %config(noreplace) /etc/scpm.users
 %config /etc/init.d/boot.scpm
 /etc/logrotate.d/scpm
+/etc/bash_completion.d/scpm_completion.sh
 %{_sbindir}/scpm
 /sbin/conf.d/SuSEconfig.scpm
 %{_libdir}/libscpm.so*
@@ -137,6 +136,11 @@
 test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Oct 22 2008 helmut.schaa@gmail.com
+- update to 1.1.7 final
+  * added bash completion (bnc#400354)
+  * fix build with gcc 4.3
+- remove patch scpm-gcc43.diff
 * Mon Aug 18 2008 mrueckert@suse.de
 - remove outdated options in the fillup_and_insserv call
 - replace deprecated run_ldconfig

++++++ scpm-1.1.6.tar.bz2 -> scpm-1.1.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/CHANGES new/scpm-1.1.7/CHANGES
--- old/scpm-1.1.6/CHANGES	2007-09-14 17:57:40.000000000 +0200
+++ new/scpm-1.1.7/CHANGES	2008-10-22 12:13:32.000000000 +0200
@@ -1,3 +1,7 @@
+1.1.7
+	- added bash completion support
+	- fixed build with gcc 4.3
+
 1.1.6
 	- updated translations
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/include/tokenizer.h new/scpm-1.1.7/include/tokenizer.h
--- old/scpm-1.1.6/include/tokenizer.h	2005-05-11 11:03:12.000000000 +0200
+++ new/scpm-1.1.7/include/tokenizer.h	2008-10-22 12:12:41.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: tokenizer.h,v 1.1.1.1 2005/05/11 09:03:12 gleissner Exp $
+ * $Id: tokenizer.h,v 1.2 2008/10/22 10:12:41 hschaa Exp $
  *
  *
  * Project     :  SCPM (System Configuration Profile Management)
@@ -21,6 +21,7 @@
 #define _GNU_SOURCE
 #endif
 
+#include <cstdlib>
 #include <cstring>
 #include <string>
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/Makefile new/scpm-1.1.7/Makefile
--- old/scpm-1.1.6/Makefile	2005-07-23 15:08:13.000000000 +0200
+++ new/scpm-1.1.7/Makefile	2008-10-22 13:03:22.000000000 +0200
@@ -2,7 +2,7 @@
 
 include Makefile.vars
 
-SUBDIRS=include src lib doc po
+SUBDIRS=include src lib doc po scripts
 
 .PHONY: $(SUBDIRS)
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/Makefile.vars new/scpm-1.1.7/Makefile.vars
--- old/scpm-1.1.6/Makefile.vars	2007-09-14 17:57:40.000000000 +0200
+++ new/scpm-1.1.7/Makefile.vars	2008-10-22 12:09:28.000000000 +0200
@@ -1,4 +1,4 @@
-VERSION=1.1.6
+VERSION=1.1.7
 LIBVERSION=1.1
 APIVERSION=1
 VERSIONFLAGS=-DSCPM_VERSION=\"$(VERSION)\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/scripts/Makefile new/scpm-1.1.7/scripts/Makefile
--- old/scpm-1.1.6/scripts/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ new/scpm-1.1.7/scripts/Makefile	2008-10-22 13:02:22.000000000 +0200
@@ -0,0 +1,5 @@
+all:
+
+install:
+	mkdir -p $(PREFIX)/etc/bash_completion.d
+	install -m 644 scpm_completion.sh $(PREFIX)/etc/bash_completion.d/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/scripts/scpm_completion.sh new/scpm-1.1.7/scripts/scpm_completion.sh
--- old/scpm-1.1.6/scripts/scpm_completion.sh	1970-01-01 01:00:00.000000000 +0100
+++ new/scpm-1.1.7/scripts/scpm_completion.sh	2008-06-23 11:39:34.000000000 +0200
@@ -0,0 +1,40 @@
+# scpm completion v0.1 aplha 1 :-)
+# A gift from Marek Stopka <mstopka@opensuse.org>
+
+_scpm() {
+	SCPM_CMDLIST=()
+	SCPM=`which scpm`
+	local opts cur prev prevprev
+	if test ${#SCPM_CMDLIST[*]} = 0; then
+    for foo in $(LC_ALL=C $SCPM 2>&1 | sed -e "1,/command may be:/d" | egrep ^[a-z] | awk -F ' ' '{print $1}'); do
+      SCPM_CMDLIST="$SCPM_CMDLIST $foo"
+    done
+		SCPM_CMDLIST="$SCPM_CMDLIST"
+  fi
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+  if [[ ${#COMP_WORDS[@]} -ge 3 ]]; then
+    prevprev=${COMP_WORDS[COMP_CWORD-2]}
+  fi
+
+	case "$prev" in
+		scpm)
+			opts=$SCPM_CMDLIST
+			COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+		;;
+		switch)
+			opts=`$SCPM list`
+			COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+		;;
+		rename)
+			opts=`$SCPM list`
+			COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+		;;
+		delete)
+			opts=`$SCPM list`
+			COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+		;;
+	esac
+}
+
+complete -F _scpm -X -o default scpm
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/cli/db_commands.cc new/scpm-1.1.7/src/cli/db_commands.cc
--- old/scpm-1.1.6/src/cli/db_commands.cc	2005-07-28 16:46:51.000000000 +0200
+++ new/scpm-1.1.7/src/cli/db_commands.cc	2008-10-22 12:12:41.000000000 +0200
@@ -1,6 +1,6 @@
 
 /*
- * $Id: db_commands.cc,v 1.2 2005/07/28 14:46:51 gleissner Exp $
+ * $Id: db_commands.cc,v 1.3 2008/10/22 10:12:41 hschaa Exp $
  *
  *
  * Project		 :	SCPM (System Configuration Profile Management)
@@ -21,6 +21,7 @@
 #include <vector>
 #include <scdb.h>
 #include <scdb_util.h>
+#include <cstdlib>
 #include <iostream>
 #include <fstream>
 #include <libintl.h>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/main/executor.cc new/scpm-1.1.7/src/main/executor.cc
--- old/scpm-1.1.6/src/main/executor.cc	2006-02-06 13:25:48.000000000 +0100
+++ new/scpm-1.1.7/src/main/executor.cc	2008-10-22 12:12:41.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: executor.cc,v 1.2 2006/02/06 12:25:48 gleissner Exp $
+ * $Id: executor.cc,v 1.3 2008/10/22 10:12:41 hschaa Exp $
  *
  *
  * Project		 :	SCPM (System Configuration Profile Management)
@@ -21,6 +21,7 @@
 #include <sstream>
 #include <iostream>
 #include <fstream>
+#include <stdlib.h>
 #include <vector>
 #include <unistd.h>
 #include <fcntl.h>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/main/journal.cc new/scpm-1.1.7/src/main/journal.cc
--- old/scpm-1.1.6/src/main/journal.cc	2006-09-21 09:47:58.000000000 +0200
+++ new/scpm-1.1.7/src/main/journal.cc	2008-10-22 12:12:42.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: journal.cc,v 1.2 2006/09/21 07:47:58 hschaa Exp $
+ * $Id: journal.cc,v 1.3 2008/10/22 10:12:42 hschaa Exp $
  *
  *
  * Project		 :	SCPM (System Configuration Profile Management)
@@ -19,6 +19,7 @@
 #include "scpm_conf.hh"
 #include <sys/stat.h>
 #include <signal.h>
+#include <limits.h>
 #include <fstream>
 #include <sstream>
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/main/scpm_conf.cc new/scpm-1.1.7/src/main/scpm_conf.cc
--- old/scpm-1.1.6/src/main/scpm_conf.cc	2005-12-13 17:30:15.000000000 +0100
+++ new/scpm-1.1.7/src/main/scpm_conf.cc	2008-10-22 12:12:42.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: scpm_conf.cc,v 1.3 2005/12/13 16:30:15 gleissner Exp $
+ * $Id: scpm_conf.cc,v 1.4 2008/10/22 10:12:42 hschaa Exp $
  *
  *
  * Project		 :	SCPM (System Configuration Profile Management)
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 SCPM_conf::SCPM_conf( )
 {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/modules/file.cc new/scpm-1.1.7/src/modules/file.cc
--- old/scpm-1.1.6/src/modules/file.cc	2006-09-21 15:00:57.000000000 +0200
+++ new/scpm-1.1.7/src/modules/file.cc	2008-10-22 12:12:42.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: file.cc,v 1.11 2006/09/21 13:00:57 hschaa Exp $
+ * $Id: file.cc,v 1.12 2008/10/22 10:12:42 hschaa Exp $
  *
  *
  * Project		 :	SCPM (System Configuration Profile Management)
@@ -31,6 +31,7 @@
 #include <scdb.hh>
 #include <progress.hh>
 #include <executor.hh>
+#include <cstring>
 
 #define module_name "file"
 
@@ -748,7 +749,7 @@
 //		}
 //		return;
 //	}
-				int difffd = open( difffile, O_WRONLY|O_TRUNC|O_CREAT );
+				int difffd = open( difffile, O_WRONLY|O_TRUNC|O_CREAT, 0600 );
 				if (difffd == -1 ) {
 					LOGWARN( "executing diff command failed (could not open temp file)");
 					return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/scdb/scdb_file.hh new/scpm-1.1.7/src/scdb/scdb_file.hh
--- old/scpm-1.1.6/src/scdb/scdb_file.hh	2006-09-21 09:47:59.000000000 +0200
+++ new/scpm-1.1.7/src/scdb/scdb_file.hh	2008-10-22 12:12:42.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: scdb_file.hh,v 1.2 2006/09/21 07:47:59 hschaa Exp $
+ * $Id: scdb_file.hh,v 1.3 2008/10/22 10:12:42 hschaa Exp $
  *
  *
  * Project		 :	SCPM (System Configuration Profile Management)
@@ -18,6 +18,7 @@
 #define SCDB_FILE_H
 #include <iostream>
 #include <string>
+#include <cstdlib>
 #include <vector>
 #include <list>
 #include <utility>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/scdb/xml.cc new/scpm-1.1.7/src/scdb/xml.cc
--- old/scpm-1.1.6/src/scdb/xml.cc	2005-05-11 11:03:12.000000000 +0200
+++ new/scpm-1.1.7/src/scdb/xml.cc	2008-10-22 12:12:42.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * $Id: xml.cc,v 1.1.1.1 2005/05/11 09:03:12 gleissner Exp $
+ * $Id: xml.cc,v 1.2 2008/10/22 10:12:42 hschaa Exp $
  *
  *
  * Project		 :	SCPM (System Configuration Profile Management)
@@ -16,6 +16,7 @@
  */
 #include "xml.hh"
 #include <sstream>
+#include <cstring>
 
 XML::XML( )
 {


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



Remember to have fun...

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

    

commit scpm

root＠Hilbert.suse.de