Hello community,
here is the log from the commit of package snipl for openSUSE:Factory checked
in at 2014-01-20 20:46:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/snipl (Old)
and /work/SRC/openSUSE:Factory/.snipl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snipl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/snipl/snipl.changes 2014-01-16
15:15:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.snipl.new/snipl.changes 2014-01-23
15:56:45.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Jan 17 18:48:47 UTC 2014 - mp...@suse.com
+
+- Changed spec file to use dos2unix instead of sed, since the OBS
+ seems to be removing the Control-M from the sed command string.
+
+-------------------------------------------------------------------
+Thu Jan 16 18:58:24 UTC 2014 - mp...@suse.com
+
+- New IBM version of the tarball incorporating Makefile fixes
+ (bnc#855242 and bnc#856178)
+ - Reworked snipl-0.2.3.1-hwmcaapidir.patch to match new version.
+ - Removed snipl-makefile-fixes.patch since it's no longer needed.
+
+-------------------------------------------------------------------
Old:
----
snipl-makefile-fixes.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snipl.spec ++++++
--- /var/tmp/diff_new_pack.WK2M07/_old 2014-01-23 15:56:45.000000000 +0100
+++ /var/tmp/diff_new_pack.WK2M07/_new 2014-01-23 15:56:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package snipl
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009-2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,7 @@
Summary: Simple Network IPL
License: CPL-1.0
Group: System/Management
+BuildRequires: dos2unix
BuildRequires: glib2-devel
BuildRequires: libglue-devel
BuildRequires: libnet
@@ -41,7 +42,6 @@
Source6: hwmcaapi.x86_64.zip
Patch1: snipl-0.2.3.1-hwmcaapidir.patch
Patch2: snipl-enable-x86_64-arch.patch
-Patch3: snipl-makefile-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -60,7 +60,6 @@
%setup
%patch1 -p1
%patch2 -p1
-%patch3 -p1
cp -p %SOURCE5 .
( mkdir hwmcaapi
@@ -81,7 +80,7 @@
%endif
)
-/usr/bin/sed -i -e 's/
$//' README.snipl
+dos2unix -o README.snipl
%build
CFLAGS="$RPM_OPT_FLAGS" make DMSVSMA_DIR=$RPM_SOURCE_DIR
HWMCAAPI_DIR=$(pwd)/hwmcaapi
++++++ snipl-0.2.3.1-hwmcaapidir.patch ++++++
--- /var/tmp/diff_new_pack.WK2M07/_old 2014-01-23 15:56:45.000000000 +0100
+++ /var/tmp/diff_new_pack.WK2M07/_new 2014-01-23 15:56:45.000000000 +0100
@@ -1,5 +1,5 @@
---- snipl-0.2.3.1/Makefile 2014-01-08 11:06:41.000000000 -0500
-+++ snipl-0.2.3.1/Makefile 2014-01-14 10:52:08.000000000 -0500
+--- snipl-0.2.3.1/Makefile 2014-01-16 07:23:34.000000000 -0500
++++ snipl-0.2.3.1/Makefile 2014-01-16 13:41:12.000000000 -0500
@@ -42,7 +42,7 @@
GROUP = $(shell id -gn)
@@ -25,8 +25,8 @@
all_sniplapi: libsniplapi.so
libsniplapi.so: sniplapi.o
-- $(LINK.c) -o $@ -shared -lhwmcaapi sniplapi.o
-+ $(LINK.c) -o $@ -shared -L$(HWMCAAPI_DIR)/usr/${LIB_STRING} -lhwmcaapi
sniplapi.o
+- $(LINK.c) -o $@ -shared sniplapi.o -lhwmcaapi
++ $(LINK.c) -o $@ -shared -L$(HWMCAAPI_DIR)/usr/${LIB_STRING} sniplapi.o
-lhwmcaapi
sniplapi.o: sniplapi.c snipl.h
$(CC) $(CFLAGS) -c -fPIC sniplapi.c
@@ -40,8 +40,8 @@
all_sncap: sncap.o sncapjob.o sncaputil.o sncapconf.o sncapdsm.o sncapapi.o \
sncaptcr.o sncapcpc.o
-- $(LINK.c) -o sncap -lhwmcaapi sncap.o sncapjob.o \
-+ $(LINK.c) -o sncap -L$(HWMCAAPI_DIR)/usr/${LIB_STRING} -lhwmcaapi
sncap.o sncapjob.o \
+- $(LINK.c) -o sncap sncap.o sncapjob.o \
++ $(LINK.c) -o sncap -L$(HWMCAAPI_DIR)/usr/${LIB_STRING} sncap.o
sncapjob.o \
sncaputil.o sncapconf.o sncapdsm.o sncapapi.o sncaptcr.o \
- sncapcpc.o
+ sncapcpc.o -lhwmcaapi
++++++ snipl-0.2.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/Makefile new/snipl-0.2.3.1/Makefile
--- old/snipl-0.2.3.1/Makefile 2014-01-08 17:06:41.000000000 +0100
+++ new/snipl-0.2.3.1/Makefile 2014-01-17 09:25:33.000000000 +0100
@@ -68,7 +68,7 @@
$(CC) $(CFLAGS) -c -fPIC snconfig.c
libsnconfig.so: snconfig.o
- $(LINK.c) -o $@ -shared -ldl snconfig.o
+ $(LINK.c) -o $@ -shared snconfig.o -ldl
install_snconfig:
install $(INSTALL_FLAGS) libsnconfig.so $(LIBDIR)
@@ -84,7 +84,7 @@
all_sniplapi: libsniplapi.so
libsniplapi.so: sniplapi.o
- $(LINK.c) -o $@ -shared -lhwmcaapi sniplapi.o
+ $(LINK.c) -o $@ -shared sniplapi.o -lhwmcaapi
sniplapi.o: sniplapi.c snipl.h
$(CC) $(CFLAGS) -c -fPIC sniplapi.c
@@ -124,7 +124,7 @@
all_vmsmapi: libvmsmapi.so libvmsmapi6.so
$(TARGETS): $(DMSVSMA_DIR)/dmsvsma.x
- cp $(DMSVSMA_DIR)/dmsvsma.x .
+ cp -vp $(DMSVSMA_DIR)/dmsvsma.x .
rpcgen dmsvsma.x
$(OBJECTS_CAPI) : snipl.h vmsmapi.h $(TARGETS_CLNT.c)
@@ -133,9 +133,9 @@
$(CC) $(CFLAGS) -c -fPIC -Wno-unused -fno-strict-aliasing vmsmapi6.c
libvmsmapi.so: dmsvsma_clnt.o dmsvsma_xdr.o vmsmapi.o
- $(LINK.c) -shared -o $@ -lnsl dmsvsma_clnt.o dmsvsma_xdr.o vmsmapi.o
+ $(LINK.c) -shared -o $@ dmsvsma_clnt.o dmsvsma_xdr.o vmsmapi.o -lnsl
libvmsmapi6.so: vmsmapi6.o
- $(LINK.c) -shared -o $@ -lnsl vmsmapi6.o
+ $(LINK.c) -shared -o $@ vmsmapi6.o -lnsl
install_vmsmapi:
@@ -156,7 +156,7 @@
$(CC) $(CFLAGS) -c -fPIC -Wno-unused -fno-strict-aliasing vmsmapi6.c
libvmsmapi6.so: vmsmapi6.o
- $(LINK.c) -shared -o $@ -lnsl vmsmapi6.o
+ $(LINK.c) -shared -o $@ vmsmapi6.o -lnsl
install_vmsmapi:
install $(INSTALL_FLAGS) libvmsmapi6.so $(LIBDIR)
@@ -165,7 +165,7 @@
all_snipl: snipl.o prepare.o $(OBJ_VM) $(OBJ_LPAR)
- $(LINK.c) -o snipl -L. -L${LIBDIR} -lnsl -ldl $(LIB_VM) $(LIB_ZVM)
$(LIB_LPAR) -lsnconfig snipl.o prepare.o
+ $(LINK.c) -o snipl -L. -L${LIBDIR} snipl.o prepare.o -lnsl -ldl
-lsnconfig $(LIB_VM) $(LIB_ZVM) $(LIB_LPAR)
snipl.o: snipl.h snipl.c
$(CC) $(CFLAGS) $(LPAR_INCLUDED) $(VM_INCLUDED) -c snipl.c
@@ -225,9 +225,9 @@
all_sncap: sncap.o sncapjob.o sncaputil.o sncapconf.o sncapdsm.o sncapapi.o \
sncaptcr.o sncapcpc.o
- $(LINK.c) -o sncap -lhwmcaapi sncap.o sncapjob.o \
+ $(LINK.c) -o sncap sncap.o sncapjob.o \
sncaputil.o sncapconf.o sncapdsm.o sncapapi.o sncaptcr.o \
- sncapcpc.o
+ sncapcpc.o -lhwmcaapi
sncap.o: sncap.c sncap.h sncaputil.h sncapjob.h
$(CC) $(CFLAGS) -c sncap.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/README.snipl
new/snipl-0.2.3.1/README.snipl
--- old/snipl-0.2.3.1/README.snipl 2014-01-08 17:06:41.000000000 +0100
+++ new/snipl-0.2.3.1/README.snipl 2014-01-17 09:25:33.000000000 +0100
@@ -84,6 +84,7 @@
Changes:
- rename config.c into snconfig.c and libconfig.so into libsnconfig.so
to avoid name clash with other package
+ - Makefile adaptions for gcc-4.8
2.3.0
Changes:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snipl-0.2.3.1/sncapconf.c
new/snipl-0.2.3.1/sncapconf.c
--- old/snipl-0.2.3.1/sncapconf.c 2014-01-08 17:06:41.000000000 +0100
+++ new/snipl-0.2.3.1/sncapconf.c 2014-01-17 09:25:33.000000000 +0100
@@ -304,7 +304,7 @@
regmatch_t pmatch[3];
char *key;
char *value;
- struct config_property *new_property;
+ struct config_property *new_property = NULL;
int ret = 0;
if (regexec(re, buffer, 3, pmatch, 0) == REG_NOMATCH
@@ -314,6 +314,7 @@
return FATAL;
}
+ *problem = "";
key = buffer + pmatch[1].rm_so;
buffer[pmatch[1].rm_eo] = '\0';
value = buffer + pmatch[2].rm_so;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
