Hello community,
here is the log from the commit of package libcli for openSUSE:Factory checked
in at 2017-10-13 14:17:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcli (Old)
and /work/SRC/openSUSE:Factory/.libcli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcli"
Fri Oct 13 14:17:44 2017 rev:2 rq:533177 version:1.9.7+git.20161026
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcli/libcli.changes 2017-08-24
18:34:53.345389757 +0200
+++ /work/SRC/openSUSE:Factory/.libcli.new/libcli.changes 2017-10-13
14:17:53.107486594 +0200
@@ -1,0 +2,18 @@
+Thu Jul 6 09:17:14 UTC 2017 - jeng...@inai.de
+
+- Fix RPM groups
+
+-------------------------------------------------------------------
+Wed Jul 05 06:44:41 UTC 2017 - mar...@gmx.de
+
+- Use stable version 1.9.7+git.20161026
+- Adapted URL
+- Use _service files
+- Run spec-cleaner
+- removed patch
+- Adapt patch:
+ - libcli-Makefile-lib64.diff
+- Remove patch:
+ - libcli-fix-utf8garbage.diff (not needed)
+
+-------------------------------------------------------------------
Old:
----
libcli-71e6c71.tar.bz2
libcli-fix-utf8garbage.diff
New:
----
_service
_servicedata
libcli-1.9.7+git.20161026.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcli.spec ++++++
--- /var/tmp/diff_new_pack.P1lxjC/_old 2017-10-13 14:17:54.723415544 +0200
+++ /var/tmp/diff_new_pack.P1lxjC/_new 2017-10-13 14:17:54.727415368 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libcli
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,19 +16,17 @@
#
-%define soname 2_0
+%define sover 1_9
+%define libname %{name}%{sover}
Name: libcli
-Version: 71e6c71
+Version: 1.9.7+git.20161026
Release: 0
Summary: Cisco-like telnet command-line library
License: LGPL-2.1
Group: Development/Libraries/C and C++
-Url: http://code.google.com/p/libcli
-Source: %{name}-%{version}.tar.bz2
-# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch0: libcli-fix-utf8garbage.diff
-# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch1: libcli-Makefile-lib64.diff
+Url: https://github.com/dparrish/libcli
+Source: %{name}-%{version}.tar.xz
+Patch0: libcli-Makefile-lib64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -37,58 +35,49 @@
command-line editing, history, authentication and callbacks for a
user-definable function tree.
-Author: David Parrish <da...@dparrish.com>
-
-%package -n %{name}%{soname}
+%package -n %{libname}
Summary: Cisco-like telnet command-line library
-Group: Development/Libraries/C and C++
+Group: System/Libraries
-%description -n %{name}%{soname}
+%description -n %{libname}
libcli provides a shared library for including a Cisco-like command-line
interface into other software. It's a telnet interface which supports
command-line editing, history, authentication and callbacks for a
user-definable function tree.
-Author: David Parrish <da...@dparrish.com>
-
-%package -n %{name}-devel
+%package devel
Summary: Cisco-like telnet command-line library
-Group: Development/Libraries/C¿and¿C++
-Requires: %{name}%{soname} = %{version}
+Group: Development/Libraries/C and C++
+Requires: %{libname} = %{version}
-%description -n %{name}-devel
+%description devel
libcli provides a shared library for including a Cisco-like command-line
interface into other software. It's a telnet interface which supports
command-line editing, history, authentication and callbacks for a
user-definable function tree.
-Author: David Parrish <da...@dparrish.com>
-
%prep
-%setup -n %{name}-%{version}
+%setup -q
%patch0 -p1
-%patch1 -p1
%build
-make PREFIX=/usr LIBDIR=%{_libdir} CFLAGS="$RPM_BUILD_FLAGS"
+make %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir} CFLAGS="%{optflags}"
%install
-make DESTDIR=%{buildroot} PREFIX=/usr LIBDIR=%{_libdir} install
-rpm -qa --queryformat='%%{name}/%%{version}/%%{release}/%%{arch}\n'| sort |
bzip2 -9 > USEDFORBUILD.bz2
-cp *.h %{buildroot}%{_includedir}/
-
-%post -n %{name}%{soname} -p /sbin/ldconfig
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} install
+rm %{buildroot}%{_libdir}/libcli.a
-%postun -n %{name}%{soname} -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
-%files -n %{name}%{soname}
+%files -n %{libname}
%defattr(-, root, root)
-%doc USEDFORBUILD.bz2 COPYING README
+%doc COPYING README
%{_libdir}/libcli.so.*
-%files -n %{name}-devel
+%files devel
%defattr(-,root,root)
%{_libdir}/libcli.so
-%{_includedir}/*.h
+%{_includedir}/libcli.h
%changelog
++++++ _service ++++++
<services>
<service mode="disabled" name="tar_scm">
<param name="url">https://github.com/dparrish/libcli.git</param>
<param name="revision">stable</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">libcli</param>
<param name="versionformat">1.9.7+git.%cd</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service mode="disabled" name="set_version"/>
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/dparrish/libcli.git</param>
<param
name="changesrevision">9d78d7bc04c3aa971ac33448fdd28fb5462eb2ac</param></service></servicedata>++++++
libcli-Makefile-lib64.diff ++++++
--- /var/tmp/diff_new_pack.P1lxjC/_old 2017-10-13 14:17:54.799412203 +0200
+++ /var/tmp/diff_new_pack.P1lxjC/_new 2017-10-13 14:17:54.799412203 +0200
@@ -1,23 +1,31 @@
-diff -Nurb libcli-71e6c71.ori/Makefile libcli-71e6c71/Makefile
---- libcli-71e6c71.ori/Makefile 2010-06-21 02:50:38.000000000 +0200
-+++ libcli-71e6c71/Makefile 2010-11-26 14:59:05.688030172 +0100
-@@ -1,4 +1,5 @@
+diff --git a/Makefile b/Makefile
+index 3062635..4639be8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,6 +7,7 @@ TESTS ?= 1
+
+ UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
DESTDIR =
+LIBDIR = /usr/lib
PREFIX = /usr/local
- MAJOR = 2
-@@ -41,10 +42,10 @@
- rm -f *.o $(LIB)* clitest
+ MAJOR = 1
+@@ -64,14 +65,14 @@ clean:
+ rm -f *.o $(LIB)* $(LIB_STATIC) clitest
- install: $(LIB)
+ install: $(TARGET_LIBS)
- install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib
-+ install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)/$(LIBDIR)
++ install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(LIBDIR)
install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include
+ ifeq (1,$(STATIC_LIB))
+- install -m 0644 $(LIB_STATIC) $(DESTDIR)$(PREFIX)/lib
++ install -m 0644 $(LIB_STATIC) $(DESTDIR)$(LIBDIR)
+ endif
+ ifeq (1,$(DYNAMIC_LIB))
- install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION)
$(DESTDIR)$(PREFIX)/lib
- cd $(DESTDIR)$(PREFIX)/lib && \
-+ install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION)
$(DESTDIR)/$(LIBDIR)
-+ cd $(DESTDIR)/$(LIBDIR) && \
- ln -s $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR)
&& \
- ln -s $(LIB).$(MAJOR).$(MINOR) $(LIB)
-
++ install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(LIBDIR)
++ cd $(DESTDIR)$(LIBDIR) && \
+ ln -fs $(LIB).$(MAJOR).$(MINOR).$(REVISION)
$(LIB).$(MAJOR).$(MINOR) && \
+ ln -fs $(LIB).$(MAJOR).$(MINOR) $(LIB)
+ endif
