mooninite pushed to mingw-p11-kit (epel7). "Merge branch 'epel7' of ssh://pkgs.fedoraproject.org/mingw-p11-kit into epel7 (..more)"

[notifications at fedoraproject.org]

>From 7925a58f39f0b826edf7e886f4bb752b38e18642 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike at cchtml.com>
Date: Tue, 30 Jul 2013 00:11:42 -0500
Subject: New upstream release


diff --git a/.gitignore b/.gitignore
index e9639a3..d514bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /p11-kit-0.18.1.tar.gz
 /p11-kit-0.18.2.tar.gz
 /p11-kit-0.18.4.tar.gz
+/p11-kit-0.18.5.tar.gz
diff --git a/mingw-p11-kit.spec b/mingw-p11-kit.spec
index ac66484..bf996de 100644
--- a/mingw-p11-kit.spec
+++ b/mingw-p11-kit.spec
@@ -1,10 +1,7 @@
 %?mingw_package_header
 
-%global mingw_build_win32 1
-%global mingw_build_win64 1
-
 Name:           mingw-p11-kit
-Version:        0.18.4
+Version:        0.18.5
 Release:        1%{?dist}
 Summary:        MinGW Library for loading and sharing PKCS#11 modules
 
@@ -98,14 +95,10 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 %{mingw32_bindir}/p11-kit.exe
 %{mingw32_libdir}/libp11-kit.dll.a
 %{mingw32_libdir}/p11-kit
-%{mingw32_libdir}/p11-kit/p11-kit-extract-trust
 %{mingw32_libdir}/pkcs11
-%{mingw32_libdir}/pkcs11/p11-kit-trust.dll
-%{mingw32_libdir}/pkcs11/p11-kit-trust.dll.a
 %{mingw32_libdir}/pkgconfig/p11-kit-1.pc
 %{mingw32_includedir}/p11-kit-1/
 %{mingw32_datadir}/p11-kit
-%{mingw32_datadir}/p11-kit/modules/p11-kit-trust.module
 %{mingw32_sysconfdir}/pkcs11
 
 %files -n mingw64-p11-kit
@@ -114,18 +107,17 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 %{mingw64_bindir}/p11-kit.exe
 %{mingw64_libdir}/libp11-kit.dll.a
 %{mingw64_libdir}/p11-kit
-%{mingw64_libdir}/p11-kit/p11-kit-extract-trust
 %{mingw64_libdir}/pkcs11
-%{mingw64_libdir}/pkcs11/p11-kit-trust.dll
-%{mingw64_libdir}/pkcs11/p11-kit-trust.dll.a
 %{mingw64_libdir}/pkgconfig/p11-kit-1.pc
 %{mingw64_includedir}/p11-kit-1/
 %{mingw64_datadir}/p11-kit
-%{mingw64_datadir}/p11-kit/modules/p11-kit-trust.module
 %{mingw64_sysconfdir}/pkcs11
 
 
 %changelog
+* Mon Jul 30 2013 Michael Cronenworth <mike at cchtml.com> - 0.18.5-1
+- New upstream release.
+
 * Mon Jul 08 2013 Michael Cronenworth <mike at cchtml.com> - 0.18.4-1
 - New upstream release.
 
diff --git a/sources b/sources
index 47454c6..937eea6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9535c4e5b9c2ef5f5cd0755115ba098b  p11-kit-0.18.4.tar.gz
+2727bf68b2fd2f67515a51914202a518  p11-kit-0.18.5.tar.gz
-- 
cgit v0.10.2


>From a4888abc5ee1cb97076649cbe5aa50700de41862 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike at cchtml.com>
Date: Tue, 30 Jul 2013 00:43:09 -0500
Subject: Fix changelog date


diff --git a/mingw-p11-kit.spec b/mingw-p11-kit.spec
index bf996de..bdaa313 100644
--- a/mingw-p11-kit.spec
+++ b/mingw-p11-kit.spec
@@ -115,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 
 
 %changelog
-* Mon Jul 30 2013 Michael Cronenworth <mike at cchtml.com> - 0.18.5-1
+* Mon Jul 29 2013 Michael Cronenworth <mike at cchtml.com> - 0.18.5-1
 - New upstream release.
 
 * Mon Jul 08 2013 Michael Cronenworth <mike at cchtml.com> - 0.18.4-1
-- 
cgit v0.10.2


>From 6118ccf1b302f8f5bed57028d8ad6faeff5e5023 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun, 13 Apr 2014 19:51:48 +0200
Subject: Don't carry .debug files in main packages


diff --git a/mingw-p11-kit.spec b/mingw-p11-kit.spec
index 3b08a62..8ccc978 100644
--- a/mingw-p11-kit.spec
+++ b/mingw-p11-kit.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-p11-kit
 Version:        0.20.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Library for loading and sharing PKCS#11 modules
 
 License:        BSD
@@ -100,7 +100,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 %{mingw32_bindir}/trust.exe
 %{mingw32_libdir}/libp11-kit.dll.a
 %{mingw32_libdir}/p11-kit
-%{mingw32_libdir}/pkcs11
+%dir %{mingw32_libdir}/pkcs11
+%{mingw32_libdir}/pkcs11/p11-kit-trust.dll
+%{mingw32_libdir}/pkcs11/p11-kit-trust.dll.a
 %{mingw32_libdir}/pkgconfig/p11-kit-1.pc
 %{mingw32_includedir}/p11-kit-1/
 %{mingw32_datadir}/p11-kit
@@ -113,7 +115,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 %{mingw64_bindir}/trust.exe
 %{mingw64_libdir}/libp11-kit.dll.a
 %{mingw64_libdir}/p11-kit
-%{mingw64_libdir}/pkcs11
+%dir %{mingw64_libdir}/pkcs11
+%{mingw64_libdir}/pkcs11/p11-kit-trust.dll
+%{mingw64_libdir}/pkcs11/p11-kit-trust.dll.a
 %{mingw64_libdir}/pkgconfig/p11-kit-1.pc
 %{mingw64_includedir}/p11-kit-1/
 %{mingw64_datadir}/p11-kit
@@ -121,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 
 
 %changelog
+* Sun Apr 13 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.20.2-3
+- Don't carry .debug files in main packages
+
 * Sun Mar 30 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.20.2-2
 - Rebuild against latest mingw-crt to fix Windows XP compatibility issue
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-p11-kit.git/commit/?h=epel7&id=123c7ea6d645109d52414e77a5380e014f7885f5