Re: Cross Distro Spec Files

Le mercredi 15 juin 2005 =C3=A0 07:06 +0100, James Ogley a =C3=A9crit :
> Here's a patch against gucharmap HEAD to add this facility
> --=20

Thanks for the efforts here. I would like to be involved as much as time
permits. Anything to get CVS more testing will be great.

Cheers.

-Gary

>=20
>=20
>=20
>=20
>=20
>=20
> pi=C3=A8ce jointe
> diff=C3=A9rences entre
> fichiers
> (gucharmap-gpp.patch)
>=20
> diff -ruN gucharmap.orig/gucharmap.spec.in gucharmap/gucharmap.spec.in
> --- gucharmap.orig/gucharmap.spec.in    2003-05-04 00:15:38.000000000
> +0100
> +++ gucharmap/gucharmap.spec.in 2005-06-15 06:58:16.000000000 +0100
> @@ -1,5 +1,23 @@
>  # DarContact: Noah Levitt <nlevitt =C3=90=C2=B0t columbia.edu>
> =20
> +%{?_with_suse:%define suse 1}
> +%{!?_with_suse:%define suse 0}
> +%if %{suse}
> +%define prefix      /opt/gnome
> +%define sysconfdir  /etc%{prefix}
> +%define bindir      %{prefix}/bin
> +%define datadir     %{prefix}/share
> +%define libdir      %{prefix}/lib
I think you'll need:
%define libdir        %{prefix}/%{_lib} for bi-arch packages.

I think we need to include packages for x86 and x86_64 don't we?

Hopefully we'll get this problem resolved soon, and move GNOME to /usr/
rather than /opt/gnome although it won't happen in the next 6 months,
and even when we do, we'll still need to support this for a while.

> +%define includedir  %{prefix}/include
> +%else
> +%define prefix      %{_prefix}
> +%define sysconfdir  %{_sysconfdir}
> +%define bindir      %{_bindir}
> +%define datadir     %{_datadir}
> +%define libdir      %{_libdir}
> +%define includedir  %{_includedir}
> +%endif
> +
>  Summary: A featureful Unicode character map.=20
>  Name: gucharmap
>  Version: @VERSION@
> @@ -13,7 +31,7 @@
> =20
>  Source:
> http://ftp.gnome.org/pub/gnome/sources/gucharmap/0.6/%{name}-%{version}=
.tar.bz2
>  BuildRoot: %{_tmppath}/root-%{name}-%{version}
> -Prefix: %{_prefix}
> +Prefix: %{prefix}
> =20
>  %description
>  gucharmap is a featureful Unicode character map and font viewer.
> @@ -31,7 +49,7 @@
>  %setup
> =20
>  %build
> -%configure
> +./configure --prefix=3D%prefix --sysconfdir=3D%sysconfdir
>  %{__make} %{?_smp_mflags}
> =20
>  %install
> @@ -54,21 +72,24 @@
>  %defattr(-, root, root, 0755)
>  %doc ChangeLog COPYING* README TODO
>  %config %{_sysconfdir}/gucharmap/
> -%{_bindir}/*
> -%{_libdir}/*.so.*
> -%{_libdir}/gucharmap/immodules/im-gucharmap.so
> -%{_datadir}/pixmaps/*
> -%{_datadir}/applications/*
> +%{bindir}/*
> +%{libdir}/*.so.*
> +%{libdir}/gucharmap/immodules/im-gucharmap.so
> +%{datadir}/pixmaps/*
> +%{datadir}/applications/*
> =20
>  %files devel
>  %defattr(-, root, root, 0755)
> -%{_libdir}/*.a
> -%{_libdir}/*.so
> -%{_libdir}/pkgconfig/*
> -%{_includedir}/%{name}/
> -#exclude %{_libdir}/*.la
> +%{libdir}/*.a
> +%{libdir}/*.so
> +%{libdir}/pkgconfig/*
> +%{includedir}/%{name}/
> +#exclude %{libdir}/*.la
> =20
>  %changelog
> +* Wed Jun 15 2005 James Ogley <[email protected]>
> +- Add GPP rpm-fu allowing --with suse to be specified.
> +
>  * Fri May 02 2003 Dag Wieers <[email protected]> - 0.6.0-0
>  - Updated to release 0.6.0.