From 28d3b3d83c48707d180d133c20163828dd45c2b0 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Sep 29 2013 12:05:42 +0000
Subject: Move headers to default location.


---

diff --git a/libtomcrypt-pkgconfig.patch b/libtomcrypt-pkgconfig.patch
index 0a50634..d6ec814 100644
--- a/libtomcrypt-pkgconfig.patch
+++ b/libtomcrypt-pkgconfig.patch
@@ -25,7 +25,7 @@
 +prefix=/usr
 +exec_prefix=${prefix}
 +libdir=${exec_prefix}/lib
-+includedir=${prefix}/include/tomcrypt
++includedir=${prefix}/include
 +
 +Name: LibTomCrypt
 +Description: public domain open source cryptographic toolkit
diff --git a/libtomcrypt.spec b/libtomcrypt.spec
index 13c7e12..0c9667e 100644
--- a/libtomcrypt.spec
+++ b/libtomcrypt.spec
@@ -1,6 +1,6 @@
 Name:           libtomcrypt
 Version:        1.17
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        A comprehensive, portable cryptographic toolkit
 
 License:        Public Domain
@@ -10,7 +10,7 @@ Patch0:         %{name}-makefile.patch
 Patch1:         %{name}-pkgconfig.patch
 
 BuildRequires:  ghostscript
-BuildRequires:  libtommath-devel >= 0.42.0
+BuildRequires:  libtommath-devel >= 0.42.0-3
 BuildRequires:  libtool
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -58,15 +58,14 @@ The %{name}-doc package contains documentation for use with %{name}.
 %patch1 -p1 -b .pkgconfig
 
 %build
-# no configure script ships with libtomcrypt.  Its only requirement is
-# ANSI C. And libtommath.  Explicitly force it to be built against libtommath
-export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -I%{_includedir}/tommath"
-
+# No configure script ships with libtomcrypt. Its only requirement is ANSI C and
+# libtommath. Explicitly force it to be built against libtommath.
+export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC"
 make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared 
 make %{?_smp_mflags} LIBPATH=%{_libdir} -f makefile docs
 
 %check
-export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM -I%{_includedir}/tommath"
+export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM"
 make %{?_smp_mflags} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" test
 ./test
 
@@ -78,12 +77,12 @@ export INSTALL_USER=$(id -un)
 export INSTALL_GROUP=$(id -gn)
 export CFLAGS="$RPM_OPT_FLAGS -DLTM_DESC -DUSE_LTM"
 
-make install INCPATH=%{_includedir}/tomcrypt DESTDIR=%{buildroot} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared
+make install DESTDIR=%{buildroot} LIBPATH=%{_libdir} EXTRALIBS="-ltommath" -f makefile.shared
 find %{buildroot} -name '*.h' -exec chmod 644 {} \;
 find %{buildroot} -name '*.c' -exec chmod 644 {} \;
 chmod 644 LICENSE
 
-# remove unneeded files
+# Remove unneeded files
 find %{buildroot} -name '*.la' -delete
 find %{buildroot} -name '*.a' -delete
 find %{buildroot} -name 'libtomcrypt_prof*' -delete
@@ -97,8 +96,7 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete
 %{_libdir}/*.so.*
 
 %files devel
-%doc LICENSE
-%{_includedir}/tomcrypt
+%{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libtomcrypt.pc
 
@@ -106,6 +104,9 @@ find %{buildroot} -name 'libtomcrypt_prof*' -delete
 %doc LICENSE doc/crypt.pdf
 
 %changelog
+* Sun Sep 29 2013 Simone Caronni <negativo17@gmail.com> - 1.17-21
+- Move headers to default location.
+
 * Thu Aug 08 2013 Simone Caronni <negativo17@gmail.com> - 1.17-20
 - Make doc package noarch.
 - Remove executable bits from LICENSE file and source files.