Accepting request 78441 from devel:libraries:c_c++

- Remove pkgincludedir.diff and instead just use --includedir
  to %configure

OBS-URL: https://build.opensuse.org/request/show/78441
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libHX?expand=0&rev=32

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
 

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 <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 +100,10 @@ Authors:
 
 %prep
 %setup -q
-%patch -P 1 -p1
 
 %build
 ./autogen.sh
-%configure
+%configure --includedir=%_includedir/%name-%version
 make %{?_smp_mflags}
 
 %install

pkgincludedir.diff

@@ -1,54 +0,0 @@
-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