commit yder for openSUSE:Factory

8 Jul 2019

Hello community,

here is the log from the commit of package yder for openSUSE:Factory checked in at 2019-07-08 15:11:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yder (Old)
 and      /work/SRC/openSUSE:Factory/.yder.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yder"

Mon Jul  8 15:11:42 2019 rev:4 rq:713851 version:1.4.6

Changes:
--------

--- /work/SRC/openSUSE:Factory/yder/yder.changes	2019-01-08 12:30:00.324172233 +0100
+++ /work/SRC/openSUSE:Factory/.yder.new.4615/yder.changes	2019-07-08 15:11:43.775385649 +0200
@@ -1,0 +2,7 @@
+Tue Jul  2 20:44:42 UTC 2019 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 1.4.6
+  * Fix package dependencies in cmake script
+  * Fix pkgconfig bugs
+
+-------------------------------------------------------------------

Old:
----
  yder-1.4.4.tar.gz

New:
----
  yder-1.4.6.tar.gz

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

Other differences:
------------------
++++++ yder.spec ++++++
--- /var/tmp/diff_new_pack.9wyOTZ/_old	2019-07-08 15:11:44.271386125 +0200
+++ /var/tmp/diff_new_pack.9wyOTZ/_new	2019-07-08 15:11:44.275386129 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package yder
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2018, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,13 +13,13 @@
 # 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define sover 1_4
 Name:           yder
-Version:        1.4.4
+Version:        1.4.6
 Release:        0
 Summary:        Logging library written in C
 License:        LGPL-2.1-or-later
@@ -30,7 +30,7 @@
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(liborcania)
+BuildRequires:  pkgconfig(liborcania) >= 2.0.0
 BuildRequires:  pkgconfig(libsystemd)
 
 %description

++++++ yder-1.4.4.tar.gz -> yder-1.4.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.4/.gitignore new/yder-1.4.6/.gitignore
--- old/yder-1.4.4/.gitignore	2018-10-27 20:34:43.000000000 +0200
+++ new/yder-1.4.6/.gitignore	2019-07-01 01:53:21.000000000 +0200
@@ -2,6 +2,7 @@
 *.so
 *.so.*.*
 *.a
+*.pc
 log_combined
 log_console
 log_file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.4/.travis.yml new/yder-1.4.6/.travis.yml
--- old/yder-1.4.4/.travis.yml	2018-10-27 20:34:43.000000000 +0200
+++ new/yder-1.4.6/.travis.yml	2019-07-01 01:53:21.000000000 +0200
@@ -21,5 +21,6 @@
   - cmake -DBUILD_YDER_TESTING=on -DWITH_JOURNALD=off ..
   - make test package
   - sudo make install
-  - cd ../src
+  - cd ../
   - make Y_DISABLE_JOURNALD=1
+  - make check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.4/CHANGELOG.md new/yder-1.4.6/CHANGELOG.md
--- old/yder-1.4.4/CHANGELOG.md	2018-10-27 20:34:43.000000000 +0200
+++ new/yder-1.4.6/CHANGELOG.md	2019-07-01 01:53:21.000000000 +0200
@@ -1,5 +1,16 @@
 # Yder Changelog
 
+## 1.4.6
+
+- Fix package dependencies in cmake script
+
+## 1.4.5
+
+- Install pkgconfig file when using Makefile
+- Update src/Makefile to show more information
+- Adapt for MSVC
+- Fix pkgconfig bugs
+
 ## 1.4.4
 
 - Improve build config file and install headers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.4/CMakeLists.txt new/yder-1.4.6/CMakeLists.txt
--- old/yder-1.4.4/CMakeLists.txt	2018-10-27 20:34:43.000000000 +0200
+++ new/yder-1.4.6/CMakeLists.txt	2019-07-01 01:53:21.000000000 +0200
@@ -19,7 +19,9 @@
 project(yder C)
 
 set(CMAKE_C_STANDARD 99)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
+if (NOT MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
+endif()
 
 # library info
 
@@ -28,12 +30,12 @@
 set(PROJECT_BUGREPORT_PATH "https://github.com/babelouest/yder/issues")
 set(LIBRARY_VERSION_MAJOR "1")
 set(LIBRARY_VERSION_MINOR "4")
-set(LIBRARY_VERSION_PATCH "4")
+set(LIBRARY_VERSION_PATCH "6")
 set(PROJECT_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
 
 set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
 set(LIBRARY_SOVERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}")
-set(ORCANIA_VERSION_DOWNLOAD "1.2.8")
+set(ORCANIA_VERSION_REQUIRED "2.0.0")
 
 # cmake modules
 
@@ -88,11 +90,13 @@
 # shared library
 
 add_library(yder SHARED ${LIB_SRC})
-set_target_properties(yder PROPERTIES
-        COMPILE_OPTIONS -Wextra
-        PUBLIC_HEADER "${INC_DIR}/yder.h;${PROJECT_BINARY_DIR}/yder-cfg.h"
-        VERSION "${LIBRARY_VERSION}"
-        SOVERSION "${LIBRARY_SOVERSION}")
+if (NOT MSVC)
+    set_target_properties(yder PROPERTIES
+            COMPILE_OPTIONS -Wextra
+            PUBLIC_HEADER "${INC_DIR}/yder.h;${PROJECT_BINARY_DIR}/yder-cfg.h"
+            VERSION "${LIBRARY_VERSION}"
+            SOVERSION "${LIBRARY_SOVERSION}")
+endif()
 if (WIN32)
     set_target_properties(yder PROPERTIES SUFFIX "-${LIBRARY_VERSION_MAJOR}.dll")
 endif ()
@@ -114,11 +118,11 @@
 if (SEARCH_ORCANIA)
     set(Orcania_FIND_QUIETLY ON) # force to find Orcania quietly
     include(FindOrcania)
-    find_package(Orcania 1.1 QUIET) # try to find orcania
+    find_package(Orcania ${ORCANIA_VERSION_REQUIRED} QUIET) # try to find orcania
     if (NOT ORCANIA_FOUND)
         include(DownloadProject)
         download_project(PROJ orcania # ... otherwise, download archive
-            URL "https://github.com/babelouest/orcania/archive/v${ORCANIA_VERSION_DOWNLOAD}.tar.gz"
+            URL "https://github.com/babelouest/orcania/archive/v${ORCANIA_VERSION_REQUIRED}.tar.gz"
             QUIET)
         add_subdirectory(${orcania_SOURCE_DIR} ${orcania_BINARY_DIR})
         include_directories(${orcania_SOURCE_DIR}/include)
@@ -135,7 +139,7 @@
 
 if (WITH_JOURNALD)
   set(PKGCONF_REQ "")
-  set(PKGCONF_REQ_PRIVATE "libsystemd, liborcania")
+  set(PKGCONF_REQ_PRIVATE "systemd, liborcania")
 else ()
   set(PKGCONF_REQ "")
   set(PKGCONF_REQ_PRIVATE "liborcania")
@@ -261,10 +265,18 @@
 endif ()
 
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "mail@babelouest.org")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.4), liborcania (>= 1.2)")
-if (WITH_SYSTEMD)
-  set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libsystemd0")
+
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.4), liborcania (>= ${ORCANIA_VERSION_REQUIRED})")
+if (INSTALL_HEADER)
+  if (WITH_SYSTEMD)
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libsystemd-dev")
+  endif ()
+else ()
+  if (WITH_SYSTEMD)
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libsystemd0")
+  endif ()
 endif ()
+
 set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_FILE_NAME})
 
 set(CPACK_SOURCE_GENERATOR "TGZ")
@@ -278,6 +290,6 @@
 
 message(STATUS "Journald support: ${WITH_JOURNALD}")
 message(STATUS "Build static library: ${BUILD_STATIC}")
-message(STATUS "Build testing tree: ${BUILD_ULFIUS_TESTING}")
+message(STATUS "Build testing tree: ${BUILD_YDER_TESTING}")
 message(STATUS "Install the header files: ${INSTALL_HEADER}")
 message(STATUS "Build RPM package: ${BUILD_RPM}") 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.4/Makefile new/yder-1.4.6/Makefile
--- old/yder-1.4.4/Makefile	2018-10-27 20:34:43.000000000 +0200
+++ new/yder-1.4.6/Makefile	2019-07-01 01:53:21.000000000 +0200
@@ -18,10 +18,10 @@
 EXAMPLE_LOCATION=./examples
 TEST_LOCATION=./test
 
-all: libyder.so
+all: release
 
 debug:
-	cd $(LIBYDER_LOCATION) && $(MAKE) debug
+	cd $(LIBYDER_LOCATION) && $(MAKE) debug $*
 
 install:
 	cd $(LIBYDER_LOCATION) && $(MAKE) install
@@ -31,10 +31,10 @@
 	cd $(EXAMPLE_LOCATION) && $(MAKE) clean
 	cd $(TEST_LOCATION) && $(MAKE) clean
 
-run_test:
+check:
 	cd $(TEST_LOCATION) && $(MAKE) test
 
-libyder.so:
+release:
 	cd $(LIBYDER_LOCATION) && $(MAKE)
 
 log_console:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.4/src/Makefile new/yder-1.4.6/src/Makefile
--- old/yder-1.4.4/src/Makefile	2018-10-27 20:34:43.000000000 +0200
+++ new/yder-1.4.6/src/Makefile	2019-07-01 01:53:21.000000000 +0200
@@ -18,15 +18,22 @@
 # You should have received a copy of the GNU General Public
 # License along with this library.	If not, see <http://www.gnu.org/licenses/>.
 #
+PROJECT_NAME=yder
+PROJECT_DESCRIPTION=Logging library for C applications
+PROJECT_BUGREPORT_PATH=https://github.com/babelouest/yder/issues
+PKGCONF_REQ=
+PKGCONF_REQ_PRIVATE=
 DESTDIR=/usr/local
 YDER_INCLUDE=../include
 CONFIG_TEMPLATE=$(YDER_INCLUDE)/yder-cfg.h.in
 CONFIG_FILE=$(YDER_INCLUDE)/yder-cfg.h
+PKGCONFIG_FILE=../libyder.pc
+PKGCONFIG_TEMPLATE=../libyder.pc.in
 CC=gcc
 CFLAGS+=-c -fPIC -Wall -D_REENTRANT -I$(YDER_INCLUDE) $(ADDITIONALFLAGS) $(CPPFLAGS)
 LIBS=-lc -lorcania $(ADDITIONALLIBS)
 OUTPUT=libyder.so
-VERSION=1.4.4
+VERSION=1.4.6
 
 ifndef Y_DISABLE_JOURNALD
 	DISABLE_JOURNALD=0
@@ -39,35 +46,52 @@
 
 $(CONFIG_FILE):
 	@cp $(CONFIG_TEMPLATE) $(CONFIG_FILE)
+	@echo Config file $(CONFIG_FILE) generated 
 	@sed -i -e 's/$${PROJECT_VERSION}/$(VERSION)/g' $(CONFIG_FILE)        
 	@if [ "$(DISABLE_JOURNALD)" = "1" ]; then \
+		echo "JOURNALD SUPPORT DISABLED"; \
 		sed -i -e 's/\#cmakedefine DISABLE_JOURNALD/\#define Y_DISABLE_JOURNALD/g' $(CONFIG_FILE); \
 	else \
+		echo "JOURNALD SUPPORT ENABLED"; \
 		sed -i -e 's/\#cmakedefine DISABLE_JOURNALD/\/* #undef Y_DISABLE_JOURNALD *\//g' $(CONFIG_FILE); \
 	fi
-	@echo Config file $(CONFIG_FILE) generated 
 
-libyder.so: $(CONFIG_FILE) yder.o
+$(PKGCONFIG_FILE):
+	@cp $(PKGCONFIG_TEMPLATE) $(PKGCONFIG_FILE)
+	@echo Pkgconfig file $(PKGCONFIG_FILE) generated
+	@sed -i -e 's#@CMAKE_INSTALL_PREFIX@#$(DESTDIR)#g' $(PKGCONFIG_FILE)
+	@sed -i -e 's/@CMAKE_INSTALL_LIBDIR@/lib/g' $(PKGCONFIG_FILE)
+	@sed -i -e 's/@CMAKE_INSTALL_INCLUDEDIR@/include/g' $(PKGCONFIG_FILE)
+	@sed -i -e 's/@PROJECT_NAME@/$(PROJECT_NAME)/g' $(PKGCONFIG_FILE)
+	@sed -i -e 's/@PROJECT_DESCRIPTION@/$(PROJECT_DESCRIPTION)/g' $(PKGCONFIG_FILE)
+	@sed -i -e 's|@PROJECT_BUGREPORT_PATH@|$(PROJECT_BUGREPORT_PATH)|g' $(PKGCONFIG_FILE)
+	@sed -i -e 's/@LIBRARY_VERSION@/$(VERSION)/g' $(PKGCONFIG_FILE)
+	@sed -i -e 's/@PKGCONF_REQ@/$(PKGCONF_REQ)/g' $(PKGCONFIG_FILE)
+	@sed -i -e 's/@PKGCONF_REQ_PRIVATE@/$(PKGCONF_REQ_PRIVATE)/g' $(PKGCONFIG_FILE)
+
+libyder.so: yder.o
 	$(CC) -shared -fPIC -Wl,-soname,$(OUTPUT) -o $(OUTPUT).$(VERSION) yder.o $(LIBS) $(LDFLAGS)
 	ln -sf $(OUTPUT).$(VERSION) $(OUTPUT)
 
-libyder.a: $(CONFIG_FILE) yder.o
+libyder.a: yder.o
 	ar rcs libyder.a yder.o
 
-yder.o: $(YDER_INCLUDE)/yder.h yder.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) yder.c
+yder.o: $(CONFIG_FILE) $(YDER_INCLUDE)/yder.h yder.c
+	$(CC) $(CFLAGS) yder.c
 
 clean:
-	rm -f *.o *.so *.a $(OUTPUT) $(OUTPUT).* $(YDER_INCLUDE)/yder-cfg.h
+	rm -f *.o *.so *.a $(OUTPUT) $(PKGCONFIG_FILE) $(OUTPUT).* $(YDER_INCLUDE)/yder-cfg.h
 
-install: all
+install: all $(PKGCONFIG_FILE)
 	install $(OUTPUT).$(VERSION) $(DESTDIR)/lib
+	install -m644 $(PKGCONFIG_FILE) $(DESTDIR)/lib/pkgconfig
 	install -m644 $(YDER_INCLUDE)/yder.h $(DESTDIR)/include
 	install -m644 $(CONFIG_FILE) $(DESTDIR)/include
 	-ldconfig
 
 static-install: static
 	install libyder.a $(DESTDIR)/lib
+	install -m644 $(PKGCONFIG_FILE) $(DESTDIR)/lib/pkgconfig
 	install -m644 $(YDER_INCLUDE)/yder.h $(DESTDIR)/include
 	install -m644 $(CONFIG_FILE) $(DESTDIR)/include
 
@@ -76,6 +100,7 @@
 	rm -f $(DESTDIR)/lib/$(OUTPUT).*
 	rm -f $(DESTDIR)/include/yder.h
 	rm -f $(DESTDIR)/include/yder-cfg.h
+	rm -f $(DESTDIR)/lib/pkgconfig/$(PKGCONFIG_FILE)
 
 debug: ADDITIONALFLAGS=-DDEBUG -g -O0
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.4/test/Makefile new/yder-1.4.6/test/Makefile
--- old/yder-1.4.4/test/Makefile	2018-10-27 20:34:43.000000000 +0200
+++ new/yder-1.4.6/test/Makefile	2019-07-01 01:53:21.000000000 +0200
@@ -20,7 +20,7 @@
 #
 
 CC=gcc
-CFLAGS=-Wall -D_REENTRANT -DDEBUG -g -O0 -I$(INCLUDE_LOCATION)
+CFLAGS+=-Wall -D_REENTRANT -DDEBUG -g -O0 -I$(INCLUDE_LOCATION) $(CPPFLAGS)
 YDER_LOCATION=../src
 INCLUDE_LOCATION=../include
 LIBS=-lc -lorcania -lyder -lcheck -lpthread -lm -lrt -lsubunit -L$(YDER_LOCATION)

    

root

tags

participants (1)