[rpms/lcmaps] epel10.2: update specfile to 1.6.5, merge changelogs

[rpms/lcmaps] epel10.2: update specfile to 1.6.5, merge changelogs

[Dennis van Dok]

A new commit has been pushed.

Repo   : rpms/lcmaps
Branch : epel10.2
Commit : f87160f6162f15dc596c71f4615ee179eef5c26d
Author : Dennis van Dok <dennisvd@nikhef.nl>
Date   : 2014-09-17T16:15:55+02:00
Stats  : +36/-17 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/lcmaps/c/f87160f6162f15dc596c71f4615ee179eef5c26d?branch=epel10.2

Log:
update specfile to 1.6.5, merge changelogs

---
diff --git a/lcmaps.spec b/lcmaps.spec
index f8e1e05..f45c8b5 100644
--- a/lcmaps.spec
+++ b/lcmaps.spec
@@ -17,15 +17,12 @@
 
 Summary: Grid (X.509) and VOMS credentials to local account mapping service
 Name: lcmaps
-Version: 1.6.1
-Release: 9%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://wiki.nikhef.nl/grid/LCMAPS
 Source0: http://software.nikhef.nl/security/lcmaps/lcmaps-%{version}.tar.gz
-# Remove the architecture specific element from the example db file
-# https://bugzilla.nikhef.nl/show_bug.cgi?id=18
-Patch0: lcmaps-1.6.1-dbfile-path.patch
 # BuildRoot is still required for EPEL5
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: globus-core
@@ -81,7 +78,7 @@ Provides: %{name}-interface = %{version}-%{release}
 Obsoletes: %{name}-interface < 1.4.31-1
 # the pkgconfig requirement is only necessary for EPEL5 and below;
 # it's automatic for Fedora and EPEL6.
-%if %{?rhel}%{!?rhel:0} <= 5
+%if %{?rhel}%{!?rhel:6} <= 5
 Requires: pkgconfig
 %endif
 
@@ -107,7 +104,7 @@ Provides: %{name}-basic-interface = %{version}-%{release}
 Obsoletes: %{name}-basic-interface < 1.6.1-4
 # the pkgconfig requirement is only necessary for EPEL5 and below;
 # it's automatic for Fedora and EPEL6.
-%if %{?rhel}%{!?rhel:0} <= 5
+%if %{?rhel}%{!?rhel:6} <= 5
 Requires: pkgconfig
 %endif
 
@@ -128,7 +125,7 @@ Requires: %{name}-without-gsi%{?_isa} = %{version}-%{release}
 Requires: %{name}-common-devel%{?_isa} = %{version}-%{release}
 # the pkgconfig requirement is only necessary for EPEL5 and below;
 # it's automatic for Fedora and EPEL6.
-%if %{?rhel}%{!?rhel:0} <= 5
+%if %{?rhel}%{!?rhel:6} <= 5
 Requires: pkgconfig
 %endif
 
@@ -149,7 +146,6 @@ without the GSI protocol.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
@@ -191,12 +187,13 @@ make DESTDIR=$RPM_BUILD_ROOT install
 cd ..
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+# create empty lcmaps.db directory
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/lcmaps
+# create empty plugin directory
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/lcmaps
 
 # clean up installed files
 rm -rf ${RPM_BUILD_ROOT}%{_docdir}
-rm ${RPM_BUILD_ROOT}%{_libdir}/lcmaps/lcmaps_plugin_example*.mod
-rm ${RPM_BUILD_ROOT}%{_libdir}/lcmaps/liblcmaps_plugin_example*.so
 
 # Retain the clean section for EPEL5
 %clean
@@ -228,11 +225,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/liblcmaps_verify_account_from_pem.so
 %{_libdir}/liblcmaps_verify_account_from_pem.so.0
 %{_libdir}/liblcmaps_verify_account_from_pem.so.0.0.0
-%{_datadir}/man/man3/lcmaps.3*
+%{_mandir}/man3/lcmaps.3*
 %dir %{_libdir}/lcmaps
 %dir %{_sysconfdir}/lcmaps
-%doc BUGS AUTHORS doc/INSTALL_WITH_WORKSPACE_SERVICE LICENSE
-%doc README README.NO_LDAP
+%doc BUGS AUTHORS LICENSE README README.NO_LDAP NEWS
 %doc build/etc/lcmaps.db build/etc/groupmapfile build/etc/vomapfile
 
 %files without-gsi
@@ -246,11 +242,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/liblcmaps_gss_assist_gridmap_without_gsi.so
 %{_libdir}/liblcmaps_gss_assist_gridmap_without_gsi.so.0
 %{_libdir}/liblcmaps_gss_assist_gridmap_without_gsi.so.0.0.0
-%{_datadir}/man/man3/lcmaps.3*
+%{_mandir}/man3/lcmaps.3*
 %dir %{_libdir}/lcmaps
 %dir %{_sysconfdir}/lcmaps
-%doc BUGS AUTHORS doc/INSTALL_WITH_WORKSPACE_SERVICE LICENSE
-%doc README README.NO_LDAP
+%doc BUGS AUTHORS LICENSE README README.NO_LDAP NEWS
 %doc build-without-gsi/etc/lcmaps.db
 %doc build-without-gsi/etc/groupmapfile
 %doc build-without-gsi/etc/vomapfile
@@ -294,6 +289,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/lcmaps/lcmaps_verify_account_from_pem.h
 %{_includedir}/lcmaps/lcmaps_vo_data.h
 %{_includedir}/lcmaps/lcmaps_return_poolindex_without_gsi.h
+%{_includedir}/lcmaps/lcmaps_plugin_typedefs.h
+%{_includedir}/lcmaps/lcmaps_plugin_prototypes.h
 %{_datadir}/pkgconfig/lcmaps-basic-interface.pc
 %doc LICENSE
 
@@ -311,6 +308,28 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
+* Tue Mar  4 2014 Mischa Salle <msalle@nikhef.nl> 1.6.5-1
+- updated version
+- do not install very old doc/INSTALL_WITH_WORKSPACE_SERVICE
+- install NEWS file
+
+* Fri Feb 28 2014 Mischa Salle <msalle@nikhef.nl> 1.6.4-1
+- updated version
+- do not install very old doc/INSTALL_WITH_WORKSPACE_SERVICE
+
+* Sun Feb 16 2014 Mischa Salle <msalle@nikhef.nl> 1.6.3-2
+- fix macro expansion for pkgconfig to include only rhel not fedora
+
+* Thu Feb 13 2014 Mischa Salle <msalle@nikhef.nl> 1.6.3-1
+- updated version
+
+* Fri Feb  7 2014 Mischa Salle <msalle@nikhef.nl> 1.6.2-1
+- Add new interface files
+- Remove unused patch
+- Create empty plugin directory
+- Do not remove lcmaps_plugin_example related files, as they are not installed
+- updated version
+
 * Mon Nov 25 2013 Dennis van Dok <dennisvd@nikhef.nl> 1.6.1-7
 - Patch the example DB file so it doesn't contain an
   architecture-specific path. Fixes bug #1034019.