[nss-util/f18: 12/12] Merge branch 'master' into f18

[Elio Maldonado]

commit 2aafdc5c340f5ab90f0e658caa0439141ba8dd59
Merge: 4b84e56 4841e07
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Oct 27 19:36:52 2012 -0400

    Merge branch 'master' into f18
    
    - Update to NSS_3_14_RTM
    - Update the license to MPLv2.0
    - remove hasht.h which is now provided by nss-util-devel
    - added utilmodt.h, utilpars.h, and utilrename.h
    - update of the whole set of nss-{util|softokn|nss}-devel packages is required to prevent conflicts

 .gitignore                    |    3 +--
 add-relro-linker-option.patch |   16 ----------------
 nss-util.spec                 |   36 +++++++++++++++++++++++-------------
 sources                       |    2 +-
 4 files changed, 25 insertions(+), 32 deletions(-)
---
diff --cc nss-util.spec
index b41d90e,b636246..b88727e
--- a/nss-util.spec
+++ b/nss-util.spec
@@@ -2,9 -2,9 +2,9 @@@
  
  Summary:          Network Security Services Utilities Library
  Name:             nss-util
- Version:          3.13.6
- Release:          2%{?dist}
- License:          MPLv1.1 or GPLv2+ or LGPLv2+
+ Version:          3.14
 -Release:          2%{?dist}
++Release:          1%{?dist}
+ License:          MPLv2.0
  URL:              http://www.mozilla.org/projects/security/pki/nss/
  Group:            System Environment/Libraries
  Requires:         nspr >= %{nspr_version}
@@@ -56,6 -52,13 +52,16 @@@ Requires:         nss-util = %{version}
  Requires:         nspr-devel >= %{nspr_version}
  Requires:         pkgconfig
  
+ # Uncomment this if nededed to prevent install/update conflict with
+ # unstalled nss-softoken as nss-util-devel now provides hasht.h
+ # which prior to the update to 3.14 was provided by nss-softokn-devel.
 -#Conflicts:        nss-softokn-devel < 3.14
 -#Obsoletes:        nss-softokn-devel < 3.14
 -#Provides:         /usr/include/nss3/hasht.h
++Conflicts:        nss-util-devel <= 3.13.6-2
++Obsoletes:        nss-util-devel <= 3.13.6-2
++#Conflicts:        nss-softokn-devel <= 3.13.6-2
++#Obsoletes:        nss-softokn-devel <= 3.13.6-2
++
++Provides:         /usr/include/nss3/hasht.h
+ 
  %description devel
  Header and library files for doing development with Network Security Services.
  
@@@ -220,15 -220,15 +223,22 @@@ don
  %{_includedir}/nss3/utilrename.h
  
  %changelog
 -* Sat Oct 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-2
 -- Update the license to MPLv2.0
 -
 -* Mon Oct 22 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-1
++* Sat Oct 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-1
+ - Update to NSS_3_14_RTM
 -
 -* Fri Oct 19 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-0.1.rc1.1
 -- Update to NSS_3_14_RC1
 -- The hasht.h from now on is provided by nss-util-devel
++- Update the license to MPLv2.0
++- remove hasht.h which is now provided by nss-util-devel
++- added utilmodt.h, utilpars.h, and utilrename.h
++- update of the whole set of nss-{util|softokn|nss}-devel packages is required to prevent conflicts
++
 +* Fri Oct 26 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.6-2
 +- Second part of bootstrapping builds to provide a conflict-free update to 3.14 next
 +- nss-util-devel now provides sechash.t as nss-softoken-devel won't from now on
 +- As of nss-softokn-3.13.6-2 nss-softokn-devel stops installing hasht.t
 +- providing it here to preverse the full set of installed headers
 +- It's best to update to nss-util-3.13.6-2 and nss-softoken-3.13.6-2, and ther subpackages, together
 +
 +* Fri Oct 05 2012 Kai Engert <kaie at redhat.com> - 3.13.6-1
 +- Update to NSS_3_13_6_RTM
  
  * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13.5-4
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild