Hello community,
here is the log from the commit of package cetcd for openSUSE:Factory checked in at 2017-01-25 23:28:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cetcd (Old)
and /work/SRC/openSUSE:Factory/.cetcd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cetcd"
Changes:
--------
New Changes file:
--- /dev/null 2016-12-08 12:47:06.134691974 +0100
+++ /work/SRC/openSUSE:Factory/.cetcd.new/cetcd.changes 2017-01-25 23:28:56.852011658 +0100
@@ -0,0 +1,47 @@
+-------------------------------------------------------------------
+Thu Jan 19 10:27:09 UTC 2017 - jengelh@inai.de
+
+- Fix RPM group, trim filler words from description.
+
+-------------------------------------------------------------------
+Thu Jan 19 10:06:03 CET 2017 - kukuk@suse.de
+
+- Add LICENSE and README.md
+
+-------------------------------------------------------------------
+Thu Jan 12 11:58:49 CET 2017 - kukuk@suse.de
+
+- Fix .so symlink
+
+-------------------------------------------------------------------
+Thu Jan 5 13:37:50 UTC 2017 - kukuk@suse.com
+
+- Merge patches to one single one from github branch
+ (cetcd-SUSE.diff)
+- Fix usage of RPM_OPT_FLAGS
+
+-------------------------------------------------------------------
+Thu Jan 5 12:47:29 UTC 2017 - kukuk@suse.de
+
+- Fix order of linking
+
+-------------------------------------------------------------------
+Thu Jan 5 12:03:20 UTC 2017 - kukuk@suse.de
+
+- Don't install sds header
+
+-------------------------------------------------------------------
+Thu Jan 5 11:24:16 UTC 2017 - kukuk@suse.de
+
+- Don't export sds header
+
+-------------------------------------------------------------------
+Tue Dec 27 11:14:50 CET 2016 - kukuk@suse.de
+
+- Add curl-devel requirementx
+
+-------------------------------------------------------------------
+Wed Dec 21 15:33:12 CET 2016 - kukuk@suse.de
+
+- Initial version
+
New:
----
cetcd-SUSE.diff
cetcd-master.zip
cetcd.changes
cetcd.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cetcd.spec ++++++
#
# spec file for package cetcd
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: cetcd
Version: 0.0.5_b79a7a2
Release: 0
Summary: C client library for etcd
License: Apache-2.0 and BSD-2-Clause
Group: Development/Libraries/C and C++
Url: http://github.com/shafreeck/cetcd
Source: cetcd-master.zip
Patch0: cetcd-SUSE.diff
BuildRequires: libcurl-devel
BuildRequires: libyajl-devel
BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Cetcd is a C client library for etcd.
%package -n libcetcd0
Summary: C client library for etcd
Group: System/Libraries
%description -n libcetcd0
Cetcd is a C client library for etcd.
This package contains the runtime library.
%package devel
Summary: Development package for cetcd
Group: Development/Libraries/C and C++
Requires: curl-devel
Requires: libcetcd0 = %{version}
%description devel
Cetcd is a C client library for etcd.
This package contains all files to develop and link against libcetcd.
%prep
%setup -q -n cetcd-master
%patch0 -p1
%build
make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"
%install
make install prefix=%{buildroot}/%{_prefix}
%if "%{_lib}" == "lib64"
mkdir -p %{buildroot}/%{_libdir}
mv -v %{buildroot}/%{_prefix}/lib/libcetcd.* %{buildroot}/%{_libdir}
%endif
# Fix .so symlink
ln -sf libcetcd.so.0 %{buildroot}/%{_libdir}/libcetcd.so
%post -n libcetcd0 -p /sbin/ldconfig
%postun -n libcetcd0 -p /sbin/ldconfig
%files -n libcetcd0
%defattr(-,root,root)
%{_libdir}/libcetcd.so.0
%files devel
%defattr(-,root,root)
%doc LICENSE README.md
%{_libdir}/libcetcd.so
%{_includedir}/cetcd.h
%{_includedir}/cetcd_array.h
%changelog
++++++ cetcd-SUSE.diff ++++++
diff --git a/.gitignore b/.gitignore
index 7624ce3..d0e39d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ sds-test
*.swp
*.so
*.a
+*.so.0
third-party
diff --git a/Makefile b/Makefile
index c1766b6..75f8006 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-CFLAGS= -Wall -Wextra -fPIC -I third-party/build/include
-LDFLAGS=-lcurl -lpthread
+CFLAGS= -Wall -Wextra -fPIC
+LDFLAGS=-lyajl -lcurl -lpthread
prefix=/usr/local
release:CFLAGS += -O3
@@ -14,16 +14,17 @@ clean:
distclean:
rm -rf libcetcd.so *.o sds/*.o third-party/*
install:all
- install -D libcetcd.so $(prefix)/lib/libcetcd.so
- install -D cetcd.h $(prefix)/include/cetcd.h
- install -D cetcd_array.h $(prefix)/include/cetcd_array.h
- install -D sds/sds.h $(prefix)/include/sds/sds.h
+ install -D -m 644 libcetcd.so $(prefix)/lib/libcetcd.so
+ install -D -m 755 libcetcd.so.0 $(prefix)/lib/libcetcd.so.0
+ install -D -m 644 cetcd.h $(prefix)/include/cetcd.h
+ install -D -m 644 cetcd_array.h $(prefix)/include/cetcd_array.h
libcetcd.so: cetcd_array.o sds/sds.o cetcd.o
- $(CC) $(LDFLAGS) -shared -o libcetcd.so cetcd_array.o sds/sds.o cetcd.o third-party/build/*.o
+ $(CC) -shared -Wl,-soname,libcetcd.so.0 -o libcetcd.so.0 cetcd_array.o sds/sds.o cetcd.o $(LDFLAGS)
+ ln -sf libcetcd.so.0 libcetcd.so
sds/sds.o:sds/sds.c sds/sds.h
cetcd_array.o:cetcd_array.c cetcd_array.h
-cetcd.o:cetcd.c cetcd.h cetcd_json_parser.h third-party/build/include/yajl/*.h third-party/build/*.o
+cetcd.o:cetcd.c cetcd.h cetcd_json_parser.h
# Processing third-party projects
third-party:third-party/yajl-2.1.0
diff --git a/cetcd.c b/cetcd.c
index 71264f9..bceb403 100644
--- a/cetcd.c
+++ b/cetcd.c
@@ -1,4 +1,6 @@
#include "cetcd.h"
+#include "sds/sds.h"
+typedef sds cetcd_string;
#include "cetcd_json_parser.h"
#include