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

[Elio Maldonado]

commit a7b6702dc3ff8952863a6369037cebf1d37f6bfb
Merge: 2aafdc5 c9499ce
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Dec 22 19:14:40 2012 -0800

    Merge branch 'master' into f18

 .gitignore                |    2 +-
 build-nss-util-only.patch |   96 +++++++++++++++++++++++++++++++++++++++++++++
 nss-split-util.sh         |    8 +++-
 nss-util.spec             |   15 ++++++-
 sources                   |    2 +-
 5 files changed, 117 insertions(+), 6 deletions(-)
---
diff --cc nss-util.spec
index b88727e,79dac18..4109ae1
--- a/nss-util.spec
+++ b/nss-util.spec
@@@ -53,14 -55,11 +55,14 @@@ Requires:         nspr-devel >= %{nspr_
  Requires:         pkgconfig
  
  # Uncomment this if nededed to prevent install/update conflict with
- # unstalled nss-softoken as nss-util-devel now provides hasht.h
+ # installed 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.
@@@ -223,22 -226,18 +229,25 @@@ don
  %{_includedir}/nss3/utilrename.h
  
  %changelog
+ * Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-1
+ - Update to NSS_3_14_1_RTM
+ 
 -* 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