- some spec file cleanup

- override the build time detection and use the last change time
  instead to incorporate into the build

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nspr?expand=0&rev=35
This commit is contained in:
Wolfgang Rosenauer
2011-09-21 09:09:51 +00:00
committed by Git OBS Bridge
parent 59983aea34
commit bf8c4861ab
2 changed files with 30 additions and 18 deletions

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 21 09:01:27 UTC 2011 - wr@rosenauer.org
- some spec file cleanup
- override the build time detection and use the last change time
instead to incorporate into the build
-------------------------------------------------------------------
Fri Aug 12 20:26:21 UTC 2011 - wr@rosenauer.org

View File

@@ -16,16 +16,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: mozilla-nspr
BuildRequires: gcc-c++ pkg-config
License: MPLv1.1 or GPLv2+ or LGPLv2.1+
Version: 4.8.9
Release: 1
License: MPLv1.1 or GPLv2+ or LGPLv2.1+
Summary: Netscape Portable Runtime
Url: http://www.mozilla.org/projects/nspr/
BuildRequires: gcc-c++
BuildRequires: pkg-config
# bug437293
%ifarch ppc64
Obsoletes: mozilla-nspr-64bit
@@ -34,7 +34,7 @@ Obsoletes: mozilla-nspr-64bit
Group: System/Libraries
Source: ftp://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar.bz2
Source1: baselibs.conf
Patch3: pkgconfig.patch
Patch: pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -65,11 +65,16 @@ memory management (malloc and free), and shared library linking.
%prep
%setup -n nspr-%{version} -q
cd mozilla
%patch3 -p2
%patch -p2
%build
# set buildtime to "last-modification-time"
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
BUILD_STRING="$(date -u -d "${modified}" "+%%F %%T")"
BUILD_TIME="$(date -u -d "${modified}" "+%%s000000")"
#
cd mozilla/nsprpub
export CFLAGS="$RPM_OPT_FLAGS"
export CFLAGS="%{optflags}"
./configure --enable-optimize="$CFLAGS" \
--disable-debug \
%ifarch x86_64
@@ -78,23 +83,23 @@ export CFLAGS="$RPM_OPT_FLAGS"
--libdir=%{_libdir} \
--includedir=%{_includedir}/nspr4 \
--prefix=%{_prefix}
make %{?jobs:-j%jobs}
make SH_DATE="$BUILD_STRING" SH_NOW="$BUILD_TIME" %{?_smp_mflags}
%install
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/nspr
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
mkdir -p $RPM_BUILD_ROOT%{_includedir}/nspr4
cp mozilla/nsprpub/config/nspr-config $RPM_BUILD_ROOT%{_bindir}/
cp mozilla/nsprpub/config/nspr.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
cp -L mozilla/nsprpub/dist/lib/*.so $RPM_BUILD_ROOT/%{_libdir}
cp -L mozilla/nsprpub/dist/lib/*.a $RPM_BUILD_ROOT/%{_libdir}/nspr/
cp -rL mozilla/nsprpub/dist/include/nspr/* $RPM_BUILD_ROOT/%{_includedir}/nspr4/
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_libdir}/nspr
mkdir -p %{buildroot}%{_libdir}/pkgconfig
mkdir -p %{buildroot}%{_includedir}/nspr4
cp mozilla/nsprpub/config/nspr-config %{buildroot}%{_bindir}/
cp mozilla/nsprpub/config/nspr.pc %{buildroot}%{_libdir}/pkgconfig
cp -L mozilla/nsprpub/dist/lib/*.so %{buildroot}%{_libdir}
cp -L mozilla/nsprpub/dist/lib/*.a %{buildroot}%{_libdir}/nspr/
cp -rL mozilla/nsprpub/dist/include/nspr/* %{buildroot}%{_includedir}/nspr4/
# #31667
chmod -x $RPM_BUILD_ROOT/%{_includedir}/nspr4/prvrsion.h
chmod -x %{buildroot}%{_includedir}/nspr4/prvrsion.h
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{buildroot}
%post -p /sbin/ldconfig