From 46769c47e0e12e648ded0e5b4e67bf00b496e43a8d935a7b5cd26634a3367250 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 6 Jun 2011 10:45:16 +0000
Subject: [PATCH] Accepting request 72756 from home:jengelh:dev

- Put the libHX directory into a versioned directory to detect
  unwanted omission of libHX_CFLAGS in dependent projects

OBS-URL: https://build.opensuse.org/request/show/72756
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=27
---
 libHX.changes      |  6 ++++++
 libHX.spec         |  8 +++----
 pkgincludedir.diff | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 pkgincludedir.diff

diff --git a/libHX.changes b/libHX.changes
index 4ab66bd..0dfea64 100644
--- a/libHX.changes
+++ b/libHX.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun  6 10:19:21 UTC 2011 - jengelh@medozas.de
+
+- Put the libHX directory into a versioned directory to detect
+  unwanted omission of libHX_CFLAGS in dependent projects
+
 -------------------------------------------------------------------
 Wed Apr  6 17:34:49 UTC 2011 - jengelh@medozas.de
 
diff --git a/libHX.spec b/libHX.spec
index d9c0e19..3ca1e06 100644
--- a/libHX.spec
+++ b/libHX.spec
@@ -29,6 +29,7 @@ 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:  pkg-config
 %define debug_package_requires %lname = %version-%release
@@ -53,8 +54,6 @@ Authors:
     Jan Engelhardt <jengelh [at] medozas de>
 
 %package -n %lname
-
-
 License:        LGPL v2+
 Summary:        Useful collection of routines for C and C++ programming
 Group:          System/Libraries
@@ -103,11 +102,10 @@ Authors:
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
-if [ ! -e configure ]; then
-	./autogen.sh
-fi
+./autogen.sh
 %configure
 make %{?_smp_mflags}
 
diff --git a/pkgincludedir.diff b/pkgincludedir.diff
new file mode 100644
index 0000000..59a2c07
--- /dev/null
+++ b/pkgincludedir.diff
@@ -0,0 +1,54 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+
+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