smani pushed to mingw-poppler (f22). "Fix includes listed multiple times, add --enable-xpdf-headers"

[notifications at fedoraproject.org]

From 11b8e58177be2d32f74f28a905f8f92f0161a151 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Mon, 11 May 2015 19:34:01 +0200
Subject: Fix includes listed multiple times, add --enable-xpdf-headers


diff --git a/mingw-poppler.spec b/mingw-poppler.spec
index 2b92aec..5a7a85f 100644
--- a/mingw-poppler.spec
+++ b/mingw-poppler.spec
@@ -4,7 +4,7 @@
 
 Name:          mingw-%{pkgname}
 Version:       0.30.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       MinGW Windows Poppler library
 
 License:       (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
@@ -231,6 +231,7 @@ autoreconf -if
     --enable-libopenjpeg=openjpeg1 \
     --enable-poppler-qt4 \
     --enable-poppler-qt5 \
+    --enable-xpdf-headers \
     --disable-zlib
 
 %mingw_make %{?_smp_mflags} V=1
@@ -252,9 +253,14 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe
 
 
 %files -n mingw32-%{pkgname}
-%doc COPYING README
+%license COPYING
+%doc README
 %{mingw32_bindir}/libpoppler-49.dll
 %{mingw32_includedir}/poppler/
+%exclude %{mingw32_includedir}/poppler/cpp/
+%exclude %{mingw32_includedir}/poppler/glib/
+%exclude %{mingw32_includedir}/poppler/qt4/
+%exclude %{mingw32_includedir}/poppler/qt5/
 %{mingw32_libdir}/libpoppler.dll.a
 %{mingw32_libdir}/pkgconfig/poppler.pc
 %{mingw32_libdir}/pkgconfig/poppler-splash.pc
@@ -300,9 +306,14 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe
 %{mingw32_libdir}/libpoppler-cpp.a
 
 %files -n mingw64-%{pkgname}
-%doc COPYING README
+%license COPYING
+%doc README
 %{mingw64_bindir}/libpoppler-49.dll
 %{mingw64_includedir}/poppler/
+%exclude %{mingw64_includedir}/poppler/cpp/
+%exclude %{mingw64_includedir}/poppler/glib/
+%exclude %{mingw64_includedir}/poppler/qt4/
+%exclude %{mingw64_includedir}/poppler/qt5/
 %{mingw64_libdir}/libpoppler.dll.a
 %{mingw64_libdir}/pkgconfig/poppler.pc
 %{mingw64_libdir}/pkgconfig/poppler-splash.pc
@@ -349,6 +360,10 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe
 
 
 %changelog
+* Mon May 11 2015 Sandro Mani <manisandro at gmail.com> - 0.30.0-3
+- Fix includes listed multiple times
+- --enable-xpdf-headers
+
 * Tue Jan 27 2015 Sandro Mani <manisandro at gmail.com> - 0.30.0-2
 - Re-enable openjpeg support
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-poppler.git/commit/?h=f22&id=11b8e58177be2d32f74f28a905f8f92f0161a151