Author: baggins Date: Wed Nov 25 00:28:39 2009 GMT Module: packages Tag: HEAD ---- Log message: - use DESTDIR or we'll get buildroot all over the installed package
---- Files affected: packages/ghc: ghc.spec (1.88 -> 1.89) ---- Diffs: ================================================================ Index: packages/ghc/ghc.spec diff -u packages/ghc/ghc.spec:1.88 packages/ghc/ghc.spec:1.89 --- packages/ghc/ghc.spec:1.88 Wed Nov 25 00:59:10 2009 +++ packages/ghc/ghc.spec Wed Nov 25 01:28:33 2009 @@ -19,7 +19,7 @@ Summary(pl.UTF-8): System kompilacji Glasgow Haskell Name: ghc Version: 6.10.4 -Release: 0.3 +Release: 0.4 License: BSD-like w/o adv. clause Group: Development/Languages Source0: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2 @@ -48,6 +48,7 @@ BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: rpmbuild(macros) >= 1.213 +BuildRequires: sed >= 4.0 %if %{with doc} BuildRequires: docbook-dtd42-xml BuildRequires: docbook-style-xsl @@ -211,21 +212,22 @@ %install rm -rf $RPM_BUILD_ROOT +rm -rf docs-root %{__make} install \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - datadir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \ - libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \ - docdir=$(pwd)/docs-root + DESTDIR=$RPM_BUILD_ROOT %if %{with doc} -rm -rf html %{__make} install-docs \ - datadir=$(pwd) \ - mandir=RPM_BUILD_ROOT%{_mandir} \ - docdir=$(pwd)/docs-root + DESTDIR=$RPM_BUILD_ROOT %endif +cp -a $RPM_BUILD_ROOT%{_datadir}/doc/%{name} docs-root +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name} + +# fix paths to docs in package list +sed -i -e "s|%{_datadir}/doc/%{name}|%{_defaultdocdir}/%{name}-%{version}|g" $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/package.conf + %clean rm -rf $RPM_BUILD_ROOT @@ -260,6 +262,7 @@ %{_libdir}/ghc-%{version}/hsc2hs-* %{_libdir}/ghc-%{version}/html %{_libdir}/ghc-%{version}/package.conf +%{_mandir}/man1/ghc.1* %dir %{_libdir}/ghc-%{version}/array-* %dir %{_libdir}/ghc-%{version}/array-*/Data @@ -869,6 +872,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.89 2009/11/25 00:28:33 baggins +- use DESTDIR or we'll get buildroot all over the installed package + Revision 1.88 2009/11/24 23:59:10 baggins - files cleaned up ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc/ghc.spec?r1=1.88&r2=1.89&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
