Split emacs-libidn subpackage to avoid *.elc arch conflicts (#709136).

This commit is contained in:
Ville Skyttä 2011-05-31 21:27:28 +03:00
parent 97cb5d881f
commit a86e7952ce

View File

@ -1,14 +1,13 @@
Summary: Internationalized Domain Name support library Summary: Internationalized Domain Name support library
Name: libidn Name: libidn
Version: 1.22 Version: 1.22
Release: 2%{?dist} Release: 3%{?dist}
URL: http://www.gnu.org/software/libidn/ URL: http://www.gnu.org/software/libidn/
License: LGPLv2+ and GPLv3+ and GFDL License: LGPLv2+ and GPLv3+ and GFDL
Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz
Group: System Environment/Libraries Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig, gettext, emacs BuildRequires: pkgconfig, gettext
Requires: emacs-filesystem
Requires(post): /sbin/install-info /sbin/ldconfig Requires(post): /sbin/install-info /sbin/ldconfig
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
Requires(postun): /sbin/ldconfig Requires(postun): /sbin/ldconfig
@ -29,6 +28,17 @@ Requires: pkgconfig
This package includes header files and libraries necessary for This package includes header files and libraries necessary for
developing programs which use the GNU libidn library. developing programs which use the GNU libidn library.
%package -n emacs-%{name}
Summary: GNU Emacs libidn support files
License: GPLv3+
BuildRequires: emacs
Requires: %{name} = %{version}-%{release}
Requires: emacs(bin) >= %{_emacs_version}
BuildArch: noarch
%description -n emacs-%{name}
This package includes libidn support files for GNU Emacs.
%prep %prep
%setup -q %setup -q
@ -39,7 +49,7 @@ iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp
mv iconv.tmp doc/libidn.info mv iconv.tmp doc/libidn.info
%build %build
%configure --disable-csharp --disable-static --libdir=/%{_lib} %configure --disable-csharp --disable-static --libdir=/%{_lib} --with-lispdir=%{_emacs_sitelispdir}/%{name}
make %{?_smp_mflags} make %{?_smp_mflags}
%check %check
@ -72,7 +82,7 @@ ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libidn.so
sed -i 's,^libdir=.*$,libdir=%{_libdir},' \ sed -i 's,^libdir=.*$,libdir=%{_libdir},' \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/libidn.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libidn.pc
%{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el %{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/*.el
%find_lang %{name} %find_lang %{name}
@ -95,8 +105,6 @@ rm -rf %{buildroot}
%doc AUTHORS NEWS FAQ README THANKS COPYING* %doc AUTHORS NEWS FAQ README THANKS COPYING*
%{_bindir}/idn %{_bindir}/idn
%{_mandir}/man1/idn.1* %{_mandir}/man1/idn.1*
%{_emacs_sitelispdir}/*.el
%{_emacs_sitelispdir}/*.elc
/%{_lib}/libidn.so.* /%{_lib}/libidn.so.*
%{_infodir}/%{name}.info.gz %{_infodir}/%{name}.info.gz
@ -108,7 +116,15 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/* %{_mandir}/man3/*
%files -n emacs-%{name}
%defattr(-,root,root)
%{_emacs_sitelispdir}/%{name}
%changelog %changelog
* Tue May 31 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.22-3
- Split emacs-libidn subpackage to avoid *.elc arch conflicts (#709136).
* Sun May 29 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.22-2 * Sun May 29 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.22-2
- Byte compile Emacs lisp files, require emacs-filesystem for dir ownership. - Byte compile Emacs lisp files, require emacs-filesystem for dir ownership.