From 7ffe2d3de6dc14037def7cd80f37dbe5e4bed147b98a8c206da995510e188a6c Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 17 Feb 2012 19:22:36 +0000
Subject: [PATCH] Accepting request 105634 from
 home:vuntz:branches:devel:libraries:c_c++

Install headers in the right location

OBS-URL: https://build.opensuse.org/request/show/105634
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/miniupnpc?expand=0&rev=5
---
 miniupnpc.changes |  7 +++++++
 miniupnpc.spec    | 13 +++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/miniupnpc.changes b/miniupnpc.changes
index 38c134e..8480a79 100644
--- a/miniupnpc.changes
+++ b/miniupnpc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 17 09:03:59 UTC 2012 - vuntz@opensuse.org
+
+- Install the headers in /usr/include/miniupnpc/ instead of
+  /usr/include/: this is cleaner, and this is what users of the
+  library expect.
+
 -------------------------------------------------------------------
 Sat Jan  7 22:08:25 UTC 2012 - joop.boonen@opensuse.org
 
diff --git a/miniupnpc.spec b/miniupnpc.spec
index b57546a..368b10a 100644
--- a/miniupnpc.spec
+++ b/miniupnpc.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           miniupnpc
 Version:        1.6
 Release:        0.0
@@ -79,7 +80,7 @@ make %{?_smp_mflags} \
 %install
 %__make \
      INSTALLPREFIX="%{buildroot}%{_prefix}" \
-     INSTALLDIRINC="%{buildroot}%{_includedir}" \
+     INSTALLDIRINC="%{buildroot}%{_includedir}/miniupnpc" \
      INSTALLDIRLIB="%{buildroot}%{_libdir}" \
      INSTALLDIRBIN="%{buildroot}%{_bindir}" \
      INSTALL="%__install" \
@@ -106,15 +107,7 @@ make %{?_smp_mflags} \
 
 %files -n libminiupnpc-devel
 %defattr(-,root,root)
-%{_includedir}/declspec.h
-%{_includedir}/igd_desc_parse.h
-%{_includedir}/miniupnpc.h
-%{_includedir}/miniupnpctypes.h
-%{_includedir}/miniwget.h
-%{_includedir}/portlistingparse.h
-%{_includedir}/upnpcommands.h
-%{_includedir}/upnperrors.h
-%{_includedir}/upnpreplyparse.h
+%{_includedir}/miniupnpc/
 %{_libdir}/libminiupnpc.a
 %{_libdir}/libminiupnpc.so