Attachment 155815 Details for Bug 236521 – nspluginwrapper.spec patch

[patch] nspluginwrapper.spec patch

P (text/plain), 2.78 KB, created by Jakub Jelinek on 2007-05-31 13:40:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelinek

Created: 2007-05-31 13:40:40 UTC

Size: 2.78 KB

patch

obsolete

>--- nspluginwrapper.spec.jj	2007-05-31 14:17:48.000000000 +0200
>+++ nspluginwrapper.spec	2007-05-31 15:22:23.000000000 +0200
>@@ -2,9 +2,19 @@
> %ifarch x86_64
> %define target_arch i386
> %endif
>+%ifarch ppc
>+%define target_arch ppc64
>+%endif
> %ifarch ppc64
> %define target_arch ppc
> %endif
>+%ifarch sparc
>+%define target_arch sparc64
>+%endif
>+%ifarch sparc64
>+%define target_arch sparc
>+%endif
>+%define primary_arches x86_64 ppc ppc64 sparc sparc64
> 
> # Force nspluginwrapper _libdir to be /usr/lib
> %define nslibdir %{_exec_prefix}/lib
>@@ -19,9 +29,13 @@ URL:		http://gwenole.beauchesne.info/pro
> Source0:	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/nspluginwrapper-%{version}.tar.bz2
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> Provides:	%{name}-%{_arch} = %{version}-%{release}
>-%ifarch ppc64 || x86_64
>+%ifarch %{primary_arches}
>+%ifnarch ppc sparc
>+# Don't require a 64-bit package from 32-bit rpm - otherwise
>+# the package wouldn't be usable on 32-bit CPUs.
> Requires:	%{name}-%{target_arch} = %{version}-%{release}
> %endif
>+%endif
> 
> BuildRequires:	pkgconfig
> BuildRequires:	gtk2-devel
>@@ -36,43 +50,49 @@ e.g. x86_64.
> %setup -q
> 
> %build
>-%configure --without-biarch --pkglibdir=%{nslibdir}/%{name}
>+%configure --without-biarch --pkglibdir=%{nslibdir}/%{name} --with-viewer \
>+%ifarch %{primary_arches}
>+  --target-cpu=%{target_arch}
>+%endif
>+
> make %{?_smp_mflags}
> 
> %install
> rm -rf %{buildroot}
>-make install DESTDIR=%{buildroot}
>+make install DESTDIR=%{buildroot} DONT_STRIP=yes
> 
>-%ifarch ppc64 || x86_64
>-mkdir -p %{buildroot}%{nslibdir}/mozilla/plugins
>-cd %{buildroot}%{nslibdir}/%{name}/%{_arch}/%{_os}
>-ln -s npwrapper.so %{buildroot}%{nslibdir}/mozilla/plugins/npwrapper.so
>+%ifarch %{primary_arches}
>+mkdir -p %{buildroot}%{_exec_prefix}/%{_lib}/mozilla/plugins
>+ln -s ../../../lib/%{name}/%{_arch}/%{_os}/npwrapper.so \
>+  %{buildroot}%{_exec_prefix}/%{_lib}/mozilla/plugins/npwrapper.so
>+rm -f %{buildroot}%{_bindir}/%{name}
> %endif
> 
> %clean
> rm -rf %{buildroot}
> 
>-%ifarch ppc64 || x86_64
>+%ifarch %{primary_arches}
> %post
> if [ $1 == 1 ]; then
>-  %{_bindir}/%{name} -v -a -i
>+  %{_nslibdir}/%{name}/%{arch}/%{_os}/npconfig -v -a -i
> else
>-  %{_bindir}/%{name} -v -a -u
>+  %{_nslibdir}/%{name}/%{arch}/%{_os}/npconfig -v -a -u
> fi
> 
> %preun
> if [ $1 == 0 ]; then
>-  %{_bindir}/%{name} -v -a -r
>+  %{_nslibdir}/%{name}/%{arch}/%{_os}/npconfig -v -a -r
> fi
> %endif
> 
> %files
> %defattr(-,root,root,-)
> %{nslibdir}/%{name}/
>-%ifarch ppc64 || x86_64
>+%ifarch %{primary_arches}
> %doc ChangeLog COPYING NEWS README
>-%{_bindir}/%{name}
>-%{nslibdir}/mozilla/plugins/*
>+%dir %{_exec_prefix}/%{_lib}/mozilla
>+%dir %{_exec_prefix}/%{_lib}/mozilla/plugins
>+%{_exec_prefix}/%{_lib}/mozilla/plugins/*
> %else
> %exclude %{_bindir}/%{name}
> %exclude %{nslibdir}/%{name}/*/*/npwrapper.so

Actions: View | Diff

Attachments on bug 236521: 155815