Bump spec rev to 3

Remove unneeded buildrequires perl, gawk, sed
Remove leading / from path macros
Remove provides for package name - done automatically
Move pkgconfig file stuff under install
Added LICENSE and README under docs

security/svrcore/build_svrcore-devel_rpm

@@ -81,7 +81,7 @@ export CVSROOT
 # define the remaining variables
 PACKAGE=svrcore-devel
 VERSION=4.0.2
-RELEASE=2
+RELEASE=3
 SVRCORE_TAG=SVRCORE_4_0_2_RTM
 SVRCORE_CORECONF_TAG=$SVRCORE_TAG
 PRJ=${PACKAGE}-${VERSION}

security/svrcore/svrcore-devel.spec

@@ -4,7 +4,7 @@
 Summary:          Svrcore - development files for secure PIN handling using NSS crypto
 Name:             svrcore-devel
 Version:          4.0.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/
 Group:            Development/Libraries
@@ -13,11 +13,7 @@ Requires:         nss-devel >= %{nss_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    nss-devel >= %{nss_version}
-BuildRequires:    gawk
-BuildRequires:    perl
-BuildRequires:    sed
 BuildRequires:    pkgconfig
-Provides:         svrcore-devel
 
 Source0:          ftp://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/4.0.2/%{name}-%{version}.tar.gz
 
@@ -33,28 +29,19 @@ uses the facilities provided by NSS.
 %build
 
 # Enable compiler optimizations and disable debugging code
-BUILD_OPT=1
-export BUILD_OPT
+export BUILD_OPT=1
 
 # Generate symbolic info for debuggers
-XCFLAGS=$RPM_OPT_FLAGS
-export XCFLAGS
+export XCFLAGS="$RPM_OPT_FLAGS"
 
-PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
-export PKG_CONFIG_ALLOW_SYSTEM_LIBS
-export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
-
-NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --variable=includedir nspr`
-export NSPR_INCLUDE_DIR
-
-NSS_INCLUDE_DIR=`/usr/bin/pkg-config --variable=includedir nss`
-export NSS_INCLUDE_DIR
+export NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --variable=includedir nspr`
+export NSS_INCLUDE_DIR=`/usr/bin/pkg-config --variable=includedir nss`
 
 %ifarch x86_64 ppc64 ia64 s390x
-USE_64=1
-export USE_64
+export USE_64=1
 %endif
 
 cd mozilla/security/svrcore
@@ -63,35 +50,36 @@ cd mozilla/security/svrcore
 # dependencies, etc.
 make EXPORTS="" RELEASE="" REQUIRES="" MODULE="" IMPORTS="" OBJDIR=. INSTALL=true
 
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+
 # Set up our package file
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-%{__cat} svrcore.pc.in | sed -e "s,%%libdir%%,%{_libdir},g" \
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+%{__cat} mozilla/security/svrcore/svrcore.pc.in | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
                           -e "s,%%exec_prefix%%,%{_prefix},g" \
                           -e "s,%%includedir%%,%{_includedir},g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                           -e "s,%%NSS_VERSION%%,%{nss_version},g" \
                           -e "s,%%SVRCORE_VERSION%%,%{version},g" > \
-                          $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/%{name}.pc
-
-%install
+                          $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
 # There is no make install target so we'll do it ourselves.
 
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_includedir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}
 
 cd mozilla/security/svrcore
 # Copy the binary libraries we want
 for file in libsvrcore.a
 do
-  %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_libdir}
+  %{__install} -m 644 $file $RPM_BUILD_ROOT%{_libdir}
 done
 
 # Copy the include files
 for file in svrcore.h
 do
-  %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_includedir}
+  %{__install} -m 644 $file $RPM_BUILD_ROOT%{_includedir}
 done
 
 
@@ -99,12 +87,21 @@ done
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root)
+%defattr(-,root,root,-)
+%doc mozilla/security/svrcore/LICENSE mozilla/security/svrcore/README
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/libsvrcore.a
 %{_includedir}/svrcore.h
 
 %changelog
+* Thu Jul 13 2006 Rich Megginson <rmeggins@redhat.com> - 4.0.2-3
+- Bump spec rev to 3
+- Remove unneeded buildrequires perl, gawk, sed
+- Remove leading / from path macros
+- Remove provides for package name - done automatically
+- Move pkgconfig file stuff under install
+- Added LICENSE and README under docs
+
 * Mon Jun 26 2006 Rich Megginson <rmeggins@redhat.com> - 4.0.2-2
 - Bump spec rev to 2 due to change of spec file name from svrcore
 - to svrcore-devel to comply with fedora packaging guidelines