From 846c69b15f2b5298cb53ff58dde47b23d7c4f092d19cdf7c2ba2f59c255b58c6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 25 Jul 2011 15:25:57 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libHX revision 31.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=7e64d9d8a5e72a791dc5bc4a9e35b25f --- libHX.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libHX.spec b/libHX.spec index 28cb8b6..d619570 100644 --- a/libHX.spec +++ b/libHX.spec @@ -30,7 +30,7 @@ Source3: http://downloads.sf.net/libhx/libHX-%version.tar.xz.asc Source2: baselibs.conf Patch1: pkgincludedir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++, pkg-config, xz +BuildRequires: gcc-c++ pkg-config xz %define debug_package_requires %lname = %version-%release Url: http://libhx.sf.net/ @@ -54,6 +54,7 @@ Authors: %package -n %lname + License: LGPL v2+ Summary: Useful collection of routines for C and C++ programming Group: System/Libraries From da52e88cb518efde2c11b45feac4a7fcb61e64a77be3aed4be67a441db742b92 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 10 Aug 2011 10:38:22 +0000 Subject: [PATCH 2/2] Remove pkgincludedir.diff OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=32 --- libHX.changes | 6 ++++++ libHX.spec | 6 +----- pkgincludedir.diff | 54 ---------------------------------------------- 3 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 pkgincludedir.diff diff --git a/libHX.changes b/libHX.changes index 446c472..2b42a16 100644 --- a/libHX.changes +++ b/libHX.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 10 10:26:37 UTC 2011 - jengelh@medozas.de + +- Remove pkgincludedir.diff and instead just use --includedir + to %configure + ------------------------------------------------------------------- Mon Jul 25 12:11:22 UTC 2011 - jengelh@medozas.de diff --git a/libHX.spec b/libHX.spec index d619570..8f9d0e0 100644 --- a/libHX.spec +++ b/libHX.spec @@ -28,7 +28,6 @@ Group: System/Libraries Source: http://downloads.sf.net/libhx/libHX-%version.tar.xz Source3: http://downloads.sf.net/libhx/libHX-%version.tar.xz.asc Source2: baselibs.conf -Patch1: pkgincludedir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ pkg-config xz %define debug_package_requires %lname = %version-%release @@ -53,8 +52,6 @@ Authors: Jan Engelhardt %package -n %lname - - License: LGPL v2+ Summary: Useful collection of routines for C and C++ programming Group: System/Libraries @@ -103,11 +100,10 @@ Authors: %prep %setup -q -%patch -P 1 -p1 %build ./autogen.sh -%configure +%configure --includedir=%_includedir/%name-%version make %{?_smp_mflags} %install diff --git a/pkgincludedir.diff b/pkgincludedir.diff deleted file mode 100644 index 59a2c07..0000000 --- a/pkgincludedir.diff +++ /dev/null @@ -1,54 +0,0 @@ -From: Jan Engelhardt - -Put libHX into a versioned directory to detect omission of -"pkg-config libHX --cflags" in dependent projects. - ---- - configure.ac | 3 +++ - include/Makefile.am | 2 +- - libHX.pc.in | 3 ++- - 3 files changed, 6 insertions(+), 2 deletions(-) - -Index: libHX-3.10.1/configure.ac -=================================================================== ---- libHX-3.10.1.orig/configure.ac -+++ libHX-3.10.1/configure.ac -@@ -88,6 +88,9 @@ AC_CHECK_FUNCS([fork execv execvp pipe], - AC_CHECK_FUNCS([clock_gettime getegid geteuid getpid getppid]) - AM_CONDITIONAL([B_PROC], [test "$b_proc" = 1]) - -+pkgincludedir='${includedir}'/"$PACKAGE_NAME-$PACKAGE_VERSION"; -+AC_SUBST([pkgincludedir]) -+ - regular_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT" - regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ - -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ -Index: libHX-3.10.1/include/Makefile.am -=================================================================== ---- libHX-3.10.1.orig/include/Makefile.am -+++ libHX-3.10.1/include/Makefile.am -@@ -1,6 +1,6 @@ - # -*- Makefile -*- - --nobase_include_HEADERS = libHX.h \ -+nobase_pkginclude_HEADERS = libHX.h \ - libHX/ctype_helper.h libHX/defs.h libHX/deque.h libHX/init.h \ - libHX/io.h libHX/list.h \ - libHX/map.h libHX/misc.h libHX/option.h libHX/proc.h libHX/string.h \ -Index: libHX-3.10.1/libHX.pc.in -=================================================================== ---- libHX-3.10.1.orig/libHX.pc.in -+++ libHX-3.10.1/libHX.pc.in -@@ -3,10 +3,11 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ -+pkgincludedir=@pkgincludedir@ - - Name: libHX - Description: Useful collection of routines for C and C++ programming - Version: @PACKAGE_VERSION@ --Cflags: -I${includedir} -+Cflags: -I${pkgincludedir} - Libs: -L${libdir} -lHX - Libs.private: -ldl -lpthread -lrt