X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=nss%2Fnss.nm;h=af0a2cfef424393813097a278b74d69571a1ebfc;hb=20df70587f962aa6fb972267c14f164508f97887;hp=b12c34dc79d2fe0d2d9ecacb139d0d1b95803ff7;hpb=79300a9f4a8645369f32c163c4d4e914d72f5346;p=people%2Fms%2Fipfire-3.x.git

diff --git a/nss/nss.nm b/nss/nss.nm
index b12c34dc7..af0a2cfef 100644
--- a/nss/nss.nm
+++ b/nss/nss.nm
@@ -4,9 +4,13 @@
 ###############################################################################
 
 name       = nss
-version    = 3.13.1
-release    = 1
+ver_major  = 3
+ver_minor  = 13
+ver_patch  = 1
+version    = %{ver_major}.%{ver_minor}.%{ver_patch}
+release    = 4
 
+maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Libraries
 url        = http://www.mozilla.org/projects/security/pki/nss/
 license    = MPLv1.1 or GPLv2+ or LGPLv2+
@@ -23,6 +27,8 @@ end
 sources += \
 	%{name}-pem-20100809.tar.bz2
 
+source_dl  = ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_%{ver_major}_%{ver_minor}_%{ver_patch}_RTM/src/
+
 build
 	requires
 		chrpath
@@ -140,29 +146,33 @@ build
 		install -p -v -m 755 mozilla/dist/*.OBJ/bin/vfychain %{BUILDROOT}%{libdir}/nss/unsupported-tools
 		chrpath --delete %{BUILDROOT}%{libdir}/nss/unsupported-tools/*
 
-		sed -e "s,@libdir@,%{libdir},g" \
-			-e "s,@prefix@,/usr,g" \
-			-e "s,@exec_prefix@,/usr,g" \
-			-e "s,@includedir@,/usr/include/nss3,g" \
-			-e "s,@MOD_MAJOR_VERSION@,$(grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
-			-e "s,@MOD_MINOR_VERSION@,$(grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
-			-e "s,@MOD_PATCH_VERSION@,$(grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
-			< %{DIR_SOURCE}/nss-config.in \
-			> %{BUILDROOT}/usr/bin/nss-config
-		chmod -v 755 %{BUILDROOT}/usr/bin/nss-config
+		for file in nss-config nss-util-config; do
+			sed -e "s,@libdir@,%{libdir},g" \
+				-e "s,@prefix@,/usr,g" \
+				-e "s,@exec_prefix@,/usr,g" \
+				-e "s,@includedir@,/usr/include/nss3,g" \
+				-e "s,@MOD_MAJOR_VERSION@,$(grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
+				-e "s,@MOD_MINOR_VERSION@,$(grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
+				-e "s,@MOD_PATCH_VERSION@,$(grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
+				< %{DIR_SOURCE}/${file}.in \
+				> %{BUILDROOT}/usr/bin/${file}
+			chmod -v 755 %{BUILDROOT}/usr/bin/${file}
+		done
 
 		install -p -v -m 755 %{DIR_SOURCE}/setup-nsssysinit.sh %{BUILDROOT}/usr/bin
 
 		# Generate file for pkg-config.
-		sed \
-			-e "s,%libdir%,%{libdir},g" \
-			-e "s,%prefix%,/usr,g" \
-			-e "s,%exec_prefix%,/usr,g" \
-			-e "s,%includedir%,/usr/include/nss3,g" \
-			-e "s,%NSS_VERSION%,%{version},g" \
-			-e "s,%NSPR_VERSION%,$(nspr-config --version),g" \
-			< %{DIR_SOURCE}/nss.pc.in \
-			> %{BUILDROOT}%{libdir}/pkgconfig/nss.pc
+		for file in nss.pc nss-util.pc; do
+			sed \
+				-e "s,%libdir%,%{libdir},g" \
+				-e "s,%prefix%,/usr,g" \
+				-e "s,%exec_prefix%,/usr,g" \
+				-e "s,%includedir%,/usr/include/nss3,g" \
+				-e "s,%NSS_VERSION%,%{version},g" \
+				-e "s,%NSPR_VERSION%,$(nspr-config --version),g" \
+				< %{DIR_SOURCE}/${file}.in \
+				> %{BUILDROOT}%{libdir}/pkgconfig/${file}
+		done
 
 		# Copy the include files we want
 		cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3
@@ -177,6 +187,11 @@ packages
 	package %{name}-libs
 		template LIBS
 
+		requires
+			nss-softokn=%{thisver}
+			nss-softokn-freebl=%{thisver}
+		end
+
 		files
 			%{libdir}/*.so
 		end
@@ -190,6 +205,10 @@ packages
 			nss=%{thisver}
 		end
 
+		provides
+			nss-util-devel = %{thisver}
+		end
+
 		# Mozilla does no versioning :(
 		files
 			/usr/bin/*-config