[nss-util/f17: 24/24] Merge branch 'f18' into f17

[Elio Maldonado]

commit 91897c88d6d661b4e6df04988ed10ebb9ecc9716
Merge: c518adc 2aafdc5
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Nov 23 13:09:23 2012 -0800

    Merge branch 'f18' into f17
    
    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 986fe1e,b88727e..736ed8f
--- a/nss-util.spec
+++ b/nss-util.spec
@@@ -220,11 -223,19 +223,18 @@@ don
  %{_includedir}/nss3/utilrename.h
  
  %changelog
+ * Sat Oct 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-1
+ - 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
+ 
  * 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
 +- Part 2 of bootstrapping builds to provide a conflict-free update to 3.14 next
 +- nss-util-devel will provide sechash.t as nss-softoken-devel won't
 +- As of nss-softokn-3.13.6-2 nss-softokn-devel stopped installing hasht.t
 +- providing it to have the full set of installed headers
  
  * Fri Oct 05 2012 Kai Engert <kaie at redhat.com> - 3.13.6-1
  - Update to NSS_3_13_6_RTM