Author: glen Date: Sun Jan 27 13:04:30 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - no need to bcond preambles - standard macro - cleanups
---- Files affected: SPECS: emacsen-gnus-pkg.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/emacsen-gnus-pkg.spec diff -u SPECS/emacsen-gnus-pkg.spec:1.9 SPECS/emacsen-gnus-pkg.spec:1.10 --- SPECS/emacsen-gnus-pkg.spec:1.9 Mon Feb 12 22:23:54 2007 +++ SPECS/emacsen-gnus-pkg.spec Sun Jan 27 14:04:25 2008 @@ -7,7 +7,7 @@ Summary(pl.UTF-8): Czytnik grup dyskusyjnych i klient poczty dla Emacsa/XEmacsa Name: emacsen-gnus-pkg Version: 5.10.6 -Release: 3 +Release: 5 License: GPL Group: Applications/Networking Source0: http://www.gnus.org/dist/%{_the_name}-%{version}.tar.gz @@ -56,16 +56,13 @@ Ten pakiet zawiera pliki Gnusa wspólne dla GNU Emacsa i XEmacsa. -%define version_of() %{expand:%%(rpm -q %1 --queryformat '%%%%{version}-%%%%{release}')} - -%if %{with emacs} %package emacs Summary: Gnus elisp files for GNU Emacs Summary(pl.UTF-8): Kod elisp Gnusa dla GNU Emacsa Group: Applications/Networking Requires: %{name} = %{version}-%{release} -Requires: emacs = %{version_of emacs} Provides: gnus-elisp-code = %{version}-%{release} +%requires_eq emacs %description emacs This package contains compiled elisp files needed to run Gnus on GNU Emacs @@ -84,16 +81,12 @@ %description emacs-el -l pl.UTF-8 Pakiet zawiera źródłowe pliki elisp z kodem Gnusa dla GNU Emacsa. -%endif - -%if %{with xemacs} %package xemacs Summary: Gnus elisp files for XEmacs Summary(pl.UTF-8): Kod elisp Gnusa dla XEmacsa Group: Applications/Networking Requires: %{name} = %{version}-%{release} -Requires: xemacs = %{version_of xemacs} Requires: xemacs-mail-lib-pkg Requires: xemacs-eterm-pkg Requires: xemacs-sh-script-pkg @@ -103,6 +96,7 @@ Requires: xemacs-mailcrypt-pkg Requires: xemacs-fsf-compat-pkg Provides: gnus-elisp-code = %{version}-%{release} +%requires_eq emacs %description xemacs This package contains compiled elisp files needed to run Gnus on XEmacs @@ -121,10 +115,7 @@ %description xemacs-el -l pl.UTF-8 Pakiet zawiera pliki źródłowe elisp z kodem Gnusa dla XEmacsa. -%endif - -%if %{with pdf_doc} %package pdf-doc Summary: PDF documentation for Gnus Summary(pl.UTF-8): Dokumentacja Gnusa w formacie PDF @@ -135,36 +126,30 @@ %description pdf-doc -l pl.UTF-8 Dokumentacja Gnusa w formacie PDF -%endif - %prep %setup -q -n %{_the_name}-%{version} %patch0 -p1 - %build mkdir DUMMY %if %{with xemacs} - %configure \ --with-xemacs \ --with-lispdir=%{_datadir}/xemacs-packages/lisp/%{_the_name} \ --with-etcdir=%{_datadir}/%{_the_name} %{__make} -%if !%{with emacs} && %{with pdf_doc} +%if %{without emacs} && %{with pdf_doc} %{__make} -C texi pdf %endif -%{__make} DESTDIR=`pwd`/DUMMY install +%{__make} DESTDIR=$(pwd)/DUMMY install %{__make} distclean - %endif %if %{with emacs} - %configure \ --with-emacs \ --with-lispdir=%{_emacs_lispdir}/%{_the_name} \ @@ -175,22 +160,21 @@ %{__make} -C texi pdf %endif -%{__make} DESTDIR=`pwd`/DUMMY install - +%{__make} DESTDIR=$(pwd)/DUMMY install %endif %install rm -rf $RPM_BUILD_ROOT cp -R ./DUMMY $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/etc -ln -s ../../gnus $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/etc/ +ln -s ../../gnus $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/etc %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog GNUS-NEWS README todo contrib/ +%doc ChangeLog GNUS-NEWS README todo contrib %{_datadir}/%{_the_name} %{_infodir}/* @@ -229,6 +213,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.10 2008-01-27 13:04:25 glen +- no need to bcond preambles +- standard macro +- cleanups + Revision 1.9 2007-02-12 21:23:54 glen - tabs in preamble @@ -253,4 +242,4 @@ - spaces -> tabs, standarized Revision 1.1 2004/04/27 22:13:25 japhy -New spec file. +- New spec file. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/emacsen-gnus-pkg.spec?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
