Attachment 147283 Details for Bug 225286 – spec file diff of doom. This has all the changes that need to be made to pass the merge review

[patch] spec file diff of doom. This has all the changes that need to be made to pass the merge review

aspell-spec.diff (text/plain), 2.33 KB, created by Jef Spaleta on 2007-02-03 21:46:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jef Spaleta

Created: 2007-02-03 21:46:59 UTC

Size: 2.33 KB

patch

obsolete

>--- rpmbuild/SPECS/aspell.spec	2007-01-22 04:58:50.000000000 -0900
>+++ aspell.spec	2007-02-03 12:28:36.000000000 -0900
>@@ -14,7 +14,8 @@
> Requires: aspell-en
> BuildRoot: %{_tmppath}/%{name}-%{version}-root
> BuildRequires: gettext, ncurses-devel, pkgconfig
>-Prereq: /sbin/install-info
>+Requires(pre): /sbin/install-info
>+Requires(preun): /sbin/install-info
> Provides: pspell
> Obsoletes: ispell, pspell, aspell-de < 0.50, aspell-fr < 0.50, aspell-ca < 0.50, aspell-da < 0.50, aspell-es < 0.50, aspell-it < 0.50, aspell-nl < 0.50, aspell-no < 0.50, aspell-sv < 0.50, aspell-pt_BR, aspell-config
> 
>@@ -29,9 +30,12 @@
> than one Aspell process is open at once.
> 
> %package	devel
>-Summary: Static libraries and header files for Aspell development.
>+Summary: Static libraries and header files for Aspell development
> Group: Development/Libraries
> Requires: aspell = %{epoch}:%{version}-%{release}
>+Requires: pkgconfig
>+Requires(pre): /sbin/install-info
>+Requires(preun): /sbin/install-info
> Provides: pspell-devel
> Obsoletes: pspell-devel
> 
>@@ -48,9 +52,10 @@
> 
> %build
> %configure
>-make
>+make %{?_smp_mflags}
> 
> %install
>+rm -rf $RPM_BUILD_ROOT
> %makeinstall
> 
> mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
>@@ -62,6 +67,8 @@
> rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la
> rm -f ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/*-filter.la
> 
>+%find_lang %{name}
>+
> %post   
> /sbin/ldconfig
> /sbin/install-info %{_infodir}/aspell.info.gz %{_infodir}/dir --entry="* Aspell: (aspell). "  || : 
>@@ -82,10 +89,11 @@
> exit 0
> 
> %postun -p /sbin/ldconfig
>+
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>-%files
>+%files -f %{name}.lang
> %defattr(-,root,root)
> %doc README TODO COPYING
> #%dir %{_datadir}/doc/aspell-%{version}
>@@ -177,7 +185,7 @@
> - add obsolete aspell-config
> 
> * Mon Aug 23 2004 Adrian Havill <havill@redhat.com> 12:0.50.5-2.fc3
>-- fix doc dir (#128140) (don't flag aspell doc stuff with the %doc
>+- fix doc dir (#128140) (don't flag aspell doc stuff with the doc macro
>   flag due to rpm badness)
> 
> * Mon Jun 21 2004 Warren Togami <wtogami@redhat.com> 12:0.50.5-1
>@@ -407,7 +415,7 @@
> 
> * Thu Jul 8 1999 Tim Powers <timp@redhat.com>
> - built for Powertools 6.1
>-- removed %serial definitions from spec file to make versioning
>+- removed serial macro definitions from spec file to make versioning
>   consistant with the other packages we ship.
> - changed build root path
> - general spec file cleanups

Actions: View | Diff

Attachments on bug 225286: 147283