rpms/nss-softokn/devel nss-softokn.spec,1.2,1.3
Elio Maldonado
emaldonado at fedoraproject.org
Thu Aug 20 19:20:44 UTC 2009
Author: emaldonado
Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5209
Modified Files:
nss-softokn.spec
Log Message:
Disabled building binary contents until nss-util conflicts with nss are resolved - bug 518460
Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nss-softokn.spec 20 Aug 2009 01:18:24 -0000 1.2
+++ nss-softokn.spec 20 Aug 2009 19:20:44 -0000 1.3
@@ -5,29 +5,32 @@
%global saved_files_dir %{_libdir}/nss/saved
# Produce .chk files for the final stripped binaries
-%define __spec_install_post \
- %{?__debug_package:%{__debug_install_post}} \
- %{__arch_install_post} \
- %{__os_install_post} \
- $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
- $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
- $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
-%{nil}
+# %define __spec_install_post \
+# %{?__debug_package:%{__debug_install_post}} \
+# %{__arch_install_post} \
+# %{__os_install_post} \
+# $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
+# $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+# $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
+#%{nil}
Summary: Network Security Services Soktoken Module
Name: nss-softokn
Version: 3.12.3.99.3
-Release: 8%{?dist}
+Release: 8.1%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
-Requires: nspr >= %{nspr_version}
-Requires: nss-softokn-freebl%{_isa} >= %{version}
-Requires: sqlite
-Requires: nss-util >= %{nssutil_version}
+# FIXME Commenting out all requires as part of disabling building
+# This package and nss-util cause conflicts with nss.
+#Requires: nspr >= %{nspr_version}
+#Requires: nss-util >= %{version}
+#Requires: nss-softokn-freebl%{_isa} >= %{version}
+#Requires: sqlite
+#Requires: nss-util >= %{nssutil_version}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version}
-BuildRequires: nss-util-devel >= %{nssutil_version}
+#BuildRequires: nss-util-devel >= %{nssutil_version}
BuildRequires: sqlite-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig
@@ -60,27 +63,28 @@ Patch2: nss-stubs-bug502133.pa
%description
Network Security Services Softoken Cryptographic Module
-%package freebl
-Summary: Freebl library for the Network Security Services
-Group: System Environment/Base
-Conflicts: nss < 3.12.2.99.3-5
-
-%description freebl
-Network Security Services Softoken Cryptographic Module Freelb Library.
-
-Install the nss-softokn-freebl package if you need the freebl
-library.
-
-%package devel
-Summary: Development libraries for Network Security Services
-Group: Development/Libraries
-Requires: nss-softokn = %{version}-%{release}
-Requires: nspr-devel >= %{nspr_version}
-Requires: nss-util-devel >= %{nsutil_version}
-Requires: pkgconfig
+#%package freebl
+#Summary: Freebl library for the Network Security Services
+#Group: System Environment/Base
+#Conflicts: nss < 3.12.2.99.3-5
-%description devel
-Header and Library files for doing development with Network Security Services.
+#%description freebl
+#Network Security Services Softoken Cryptographic Module Freelb Library.
+#
+#Install the nss-softokn-freebl package if you need the freebl
+#library.
+
+#%package devel
+#Summary: Development libraries for Network Security Services
+#Group: Development/Libraries
+#Obsoletes: nss-devel < 3.12.3.99.3-8
+#Requires: nss-softokn = %{version}-%{release}
+#Requires: nspr-devel >= %{nspr_version}-%{nssutil_release}
+#Requires: nss-util-devel >= %{nsutil_version}
+#Requires: pkgconfig
+
+#%description devel
+#Header and Library files for doing development with Network Security Services.
%prep
@@ -130,9 +134,9 @@ export USE_64
%endif
# Compile softkn plus needed support
-%{__make} -C ./mozilla/security/coreconf
-%{__make} -C ./mozilla/security/dbm
-%{__make} -C ./mozilla/security/nss
+#%{__make} -C ./mozilla/security/coreconf
+#%{__make} -C ./mozilla/security/dbm
+#%{__make} -C ./mozilla/security/nss
# Set up our package file
%{__mkdir_p} ./mozilla/dist/pkgconfig
@@ -190,39 +194,40 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
%{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
# Copy the binary libraries we want
-for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
-do
- %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
- ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
+# FIXME - restore when nss-util is fixed
+#for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
+#do
+# %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+# ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+#done
# Make sure chk files can be found in both places
-for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
-do
- ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
+#for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
+#do
+# ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+#done
# install our prelink configuration file
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
-%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
+#%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
# and stash a copy away in a safe place
-%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{saved_files_dir}/nss-softokn-prelink.conf
+#%{__install} -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{saved_files_dir}/nss-softokn-prelink.conf
# Copy the binaries we ship as unsupported
-for file in shlibsign
-do
- %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
-done
+#for file in shlibsign
+#do
+# %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+#done
# Copy the include files we want
-for file in mozilla/dist/public/nss/*.h
-do
- %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
-done
+#for file in mozilla/dist/public/nss/*.h
+#do
+# %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+#done
# Copy the package configuration files
-%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
-%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
+#%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
+#%{__install} -p ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -233,61 +238,61 @@ done
# This trigger scriptlet is run when:
# 1) nss-softokn is already installed, and prelink is installed or upgraded
# 2) prelink is already installed, and nss-softokn is installed or upgraded
-%triggerin -- prelink
-%{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
- %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#%triggerin -- prelink
+#%{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
+# %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
# This trigger scriptlet is run when:
# 1) prelink is installed, and nss-softokn removed
# 2) nss-softokn is installed, and prelink gets removed
-%triggerun -- prelink
-[ $2 = 0 ] || exit 0
-%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#%triggerun -- prelink
+#[ $2 = 0 ] || exit 0
+#%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
%post
-/sbin/ldconfig >/dev/null 2>/dev/null
+#/sbin/ldconfig >/dev/null 2>/dev/null
%postun
-/sbin/ldconfig >/dev/null 2>/dev/null
-[ $1 = 0 ] && rm -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#/sbin/ldconfig >/dev/null 2>/dev/null
+#[ $1 = 0 ] && rm -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
%files
-%defattr(-,root,root)
-/%{_lib}/libnssdbm3.so
-/%{_lib}/libnssdbm3.chk
-/%{_lib}/libsoftokn3.so
-/%{_lib}/libsoftokn3.chk
+#%defattr(-,root,root)
+#/%{_lib}/libnssdbm3.so
+#/%{_lib}/libnssdbm3.chk
+#/%{_lib}/libsoftokn3.so
+#/%{_lib}/libsoftokn3.chk
# shared with nss-tools
-%dir %{_libdir}/nss
-%dir %{saved_files_dir}
-%dir %{unsupported_tools_directory}
-%{unsupported_tools_directory}/shlibsign
-%{saved_files_dir}/nss-softokn-prelink.conf
+#%dir %{_libdir}/nss
+#%dir %{saved_files_dir}
+#%dir %{unsupported_tools_directory}
+#%{unsupported_tools_directory}/shlibsign
+#%{saved_files_dir}/nss-softokn-prelink.conf
# we don't own %{_sysconfdir}/prelink.conf.d and
# must rely on triggers to install and remove our
# configuration file
-%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+#%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
-%files freebl
-%defattr(-,root,root)
-/%{_lib}/libfreebl3.so
-/%{_lib}/libfreebl3.chk
-
-%files devel
-%defattr(-,root,root)
-%{_libdir}/libsoftokn3.so
-%{_libdir}/libsoftokn3.chk
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreebl3.chk
-%{_libdir}/libnssdbm3.so
-%{_libdir}/libnssdbm3.chk
-%{_libdir}/pkgconfig/nss-softokn.pc
-%{_bindir}/nss-softokn-config
+#%files freebl
+#%defattr(-,root,root)
+#/%{_lib}/libfreebl3.so
+#/%{_lib}/libfreebl3.chk
+
+#%files devel
+#%defattr(-,root,root)
+#%{_libdir}/libsoftokn3.so
+#%{_libdir}/libsoftokn3.chk
+#%{_libdir}/libfreebl3.so
+#%{_libdir}/libfreebl3.chk
+#%{_libdir}/libnssdbm3.so
+#%{_libdir}/libnssdbm3.chk
+#%{_libdir}/pkgconfig/nss-softokn.pc
+#%{_bindir}/nss-softokn-config
# co-owned with nss
-%dir %{_includedir}/nss3
+# %dir %{_includedir}/nss3
#
# The following headers are those exported public in
# mozilla/security/nss/lib/freebl/manifest.mn and
@@ -297,14 +302,16 @@ done
# the pkcs #11 ones, have been provided by nss-util-devel
# which installed them before us.
#
-%{_includedir}/nss3/blapit.h
-%{_includedir}/nss3/ecl-exp.h
-%{_includedir}/nss3/hasht.h
-%{_includedir}/nss3/sechash.h
-%{_includedir}/nss3/nsslowhash.h
-%{_includedir}/nss3/secmodt.h
-%{_includedir}/nss3/shsign.h
+#%{_includedir}/nss3/blapit.h
+#%{_includedir}/nss3/ecl-exp.h
+#%{_includedir}/nss3/hasht.h
+#%{_includedir}/nss3/sechash.h
+#%{_includedir}/nss3/nsslowhash.h
+#%{_includedir}/nss3/secmodt.h
+#%{_includedir}/nss3/shsign.h
%changelog
+* Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8.1
+- Disable installing until conflicts are relsoved
* Thu Aug 19 2009 Elio Maldonado <emaldona at redhat.com> 3.12.3.99.3-8
- Initial build
More information about the fedora-extras-commits
mailing list