nss: add nss-util

qt4, thunderbird: new upstream release
uim: rebuild

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6811 ec354946-7b23-47d6-9f5a-488ba84defc7

n/nss/nss-vl.spec

@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.13.6
-Release:          1%{?_dist_release}
+Release:          2%{?_dist_release}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -18,6 +18,8 @@ Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
 Source12:         %{name}-pem-20091210.tar.bz2
+Source101:	  nss-util.pc.in
+Source102:	  nss-util-config.in
 
 Patch1:           nss-no-rpath.patch
 Patch6:           nss-enable-pem.patch
@@ -151,7 +153,8 @@ export NSS_USE_SYSTEM_SQLITE
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-                          -e "s,%%NSS_VERSION%%,%{version},g" > \
+                          -e "s,%%NSS_VERSION%%,%{version},g" \
+                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" > \
                           $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
 
 NSS_VMAJOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
@@ -174,6 +177,32 @@ export NSS_VPATCH
 
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config
 
+%{__cat} %{SOURCE101} | sed -e "s,%%libdir%%,%{_libdir},g" \
+                          -e "s,%%prefix%%,%{_prefix},g" \
+                          -e "s,%%exec_prefix%%,%{_prefix},g" \
+                          -e "s,%%includedir%%,%{_includedir}/nss3,g" \
+                          -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
+                          -e "s,%%NSSUTIL_VERSION%%,%{version},g" > \
+                          $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc
+
+NSSUTIL_VMAJOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'`
+NSSUTIL_VMINOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'`
+NSSUTIL_VPATCH=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'`
+
+export NSSUTIL_VMAJOR 
+export NSSUTIL_VMINOR 
+export NSSUTIL_VPATCH
+
+%{__cat} %{SOURCE102} | sed -e "s,@libdir@,%{_libdir},g" \
+                          -e "s,@prefix@,%{_prefix},g" \
+                          -e "s,@exec_prefix@,%{_prefix},g" \
+                          -e "s,@includedir@,%{_includedir}/nss3,g" \
+                          -e "s,@MOD_MAJOR_VERSION@,$NSSUTIL_VMAJOR,g" \
+                          -e "s,@MOD_MINOR_VERSION@,$NSSUTIL_VMINOR,g" \
+                          -e "s,@MOD_PATCH_VERSION@,$NSSUTIL_VPATCH,g" \
+                          > $RPM_BUILD_ROOT/%{_bindir}/nss-util-config
+
+chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-util-config
 
 %install
 
@@ -286,7 +315,9 @@ done
 %defattr(-,root,root)
 %{_libdir}/libcrmf.a
 %{_libdir}/pkgconfig/nss.pc
+%{_libdir}/pkgconfig/nss-util.pc
 %{_bindir}/nss-config
+%{_bindir}/nss-util-config
 
 %dir %{_includedir}/nss3
 %{_includedir}/nss3/base64.h
@@ -401,6 +432,10 @@ done
 
 
 %changelog
+* Sat Sep 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.13.6-2
+- add Source101 (nss-util.pc.in)
+- add Source102 (nss-util-config.in)
+
 * Mon Sep 03 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.13.6-1
 - new upstream release 
 

q/qt4/qt4-vl.spec

@@ -7,7 +7,7 @@
 Summary: Qt toolkit
 Summary(ja): Qt ツールキット
 Name: qt4
-Version: 4.8.2
+Version: 4.8.3
 Release: 1%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@@ -82,10 +82,6 @@ Patch70: qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch
 # Buttons in Qt applications not clickable when run under gnome-shell (#742658, QTBUG-21900)
 Patch71:  qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch
 
-# QtWebKit wtf library: GMutex is a union rather than a struct in GLib >= 2.31
-# fixes FTBFS: https://bugs.webkit.org/show_bug.cgi?id=69840
-Patch73: qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch
-
 # workaround
 # sql/drivers/tds/qsql_tds.cpp:341:49: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
 Patch74: qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch
@@ -410,9 +406,6 @@ popd
 %patch69 -p1 -b .QTBUG-22037
 %patch70 -p1 -b .QTBUG-14724
 %patch71 -p1 -b .QTBUG-21900
-# This quick fix works ONLY with GLib >= 2.31. It's harder to fix this portably.
-# See https://bugs.webkit.org/show_bug.cgi?id=69840 for the gory details.
-%patch73 -p1 -b .qtwebkit-glib231
 %patch74 -p1 -b .tds_no_strict_aliasing
 %patch75 -p1 -b .ppc64-crash
 %patch76 -p1 -b .s390-atomic
@@ -1089,6 +1082,11 @@ fi
 %endif
 
 %changelog
+* Sat Sep 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.3-1
+- new upstream release
+- update Patch68 (webkit-qtwebkit-2.2-no_Werror.patch)
+- remove Patch73: qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch
+
 * Sat Sep 01 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.2-1
 - new upstream release
 - update Patch68 (webkit-qtwebkit-2.2-no_Werror.patch)

t/thunderbird/thunderbird-vl.spec

@@ -1,5 +1,5 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%define tbmajor 15.0
+%define tbmajor 15.0.1
 #%define tbversion %{tbmajor}.10
 %define tbversion %{tbmajor}
 %define tbrelease 1%{?_dist_release}
@@ -344,6 +344,9 @@ fi
 #===============================================================================
 
 %changelog
+* Sun Sep 09 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 15.0.1-1
+- new upstream release
+
 * Wed Aug 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 15.0-1
 - new upstream release
 - add BuildRequires: python-devel (Vine6 only)

u/uim/uim-vl.spec

@@ -10,7 +10,7 @@
 %define with_canna	0
 
 %define qt3_ver 3.3.8
-%define qt4_ver 4.8.2
+%define qt4_ver 4.8.3
 # Qt3 version auto-detection -- inagaki
 %define _qt3_version %(pkg-config --modversion --silence-errors qt-mt 2>/dev/null || echo %{qt3_ver})
 %define _qt3_prefix  %{_libdir}/qt-%{_qt3_version}
@@ -29,7 +29,7 @@ Name: uim
 Summary: Uim an input method library
 Summary(ja): 入力メソッドライブラリ
 Version: 1.7.1
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 
 License: LGPLv2/BSD
 Group: System Environment/Libraries
@@ -794,6 +794,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Sep 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.1-4
+- rebuild with qt4-4.8.3
+
 * Tue Sep 04 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.1-3
 - rebuild with qt4-4.8.2