Attachment 314784 Details for Bug 426751 – ghc-X11.spec.patch-1

[patch] ghc-X11.spec.patch-1

ghc-X11.spec.patch-1 (text/plain), 5.05 KB, created by Jens Petersen on 2008-08-22 09:09:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2008-08-22 09:09:25 UTC

Size: 5.05 KB

patch

obsolete

>--- x11.spec	2008-07-04 18:40:41.000000000 +1000
>+++ ghc-X11.spec	2008-08-22 19:03:03.000000000 +1000
>@@ -1,29 +1,24 @@
> %define hsc_name ghc
>-%define hsc_version 6.8.2
>-#The first one might be upper case, the second one isn't.
>-%define h_pkg_name X11
>-%define f_pkg_name x11
>-%define pkg_libdir %{_libdir}/%{hsc_name}-%{hsc_version}/%{h_pkg_name}-%{version}
>-%define tar_dir %{_builddir}/%{?buildsubdir}
>+%define hsc_version 6.8.3
>+%define pkg_name X11
>+%define pkg_libdir %{_libdir}/%{hsc_name}-%{hsc_version}/%{pkg_name}-%{version}
> 
>+# Haskell compilers do not traditionally emit DWARF data.
> %define debug_package %{nil}
>-#Haskell compilers do not traditionally emit DWARF data.
> 
>-Name: %{hsc_name}-%{f_pkg_name}
>-Version: 1.4.1
>+Name: %{hsc_name}-%{pkg_name}
>+Version: 1.4.2
> Release: 1%{?dist}
> License: BSD
> Group: Development/Languages
>-URL: http://darcs.haskell.org/X11
>-Source: X11-1.4.1.tar.gz
>-Summary: A binding to the X11 graphics library
>+URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
>+Source: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
>+Summary: A Haskell binding to the X11 graphics library
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-BuildRequires: ghc = %{hsc_version}, haddock
>+BuildRequires: %{hsc_name} = %{hsc_version}, haddock
> BuildRequires: libX11-devel, libXinerama-devel, libXext-devel
>-BuildRequires: ghc682-prof
>-Requires: ghc = %{hsc_version}
>-Provides: %{h_pkg_name}-%{hsc_name}-%{hsc_version} = %{version}
>-
>+BuildRequires: %{hsc_name}-prof = %{hsc_version}
>+Requires: %{hsc_name} = %{hsc_version}
> 
> %description
> A Haskell binding to the X11 graphics library.
>@@ -33,14 +28,12 @@
> Manual", available online at <http://tronche.com/gui/x/xlib/>.
> 
> 
>-%package -n %{hsc_name}-%{f_pkg_name}-prof
>-Summary: Profiling libraries for %{hsc_name}-%{f_pkg_name}
>+%package -n %{name}-prof
>+Summary: Profiling libraries for %{name}
> Group: Development/Libraries
>-Requires: %{hsc_name}-%{f_pkg_name} = %{version}
>-Provides: %{h_pkg_name}-%{hsc_name}-%{hsc_version}-prof = %{version}
>-
>+Requires: %{name} = %{version}
> 
>-%description -n %{hsc_name}-%{f_pkg_name}-prof
>+%description -n %{name}-prof
> A Haskell binding to the X11 graphics library.
> 
> The binding is a direct translation of the C binding; for
>@@ -49,37 +42,38 @@
> 
> This package contains profiling libraries for %{hsc_name} %{hsc_version}.
> 
>+%define _cabal %{_bindir}/runghc Setup
> 
> %prep
>-%setup -q -n %{h_pkg_name}-%{version}
>+%setup -q -n %{pkg_name}-%{version}
> 
> 
> %build
>-if [ -f configure.ac -a ! -f configure ]; then autoreconf; fi
>-runghc Setup configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{hsc_name}-%{f_pkg_name}-%{version} --libsubdir='$compiler/$pkgid' --enable-library-profiling --ghc
>-if runghc Setup makefile -f cabal-rpm.mk
>+%{_cabal} configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --libsubdir='$compiler/$pkgid' --enable-library-profiling --ghc
>+if %{_cabal} makefile -f cabal-rpm.mk
> then
>     make -f cabal-rpm.mk %{_smp_mflags} || :
> fi
>-runghc Setup build
>-runghc Setup haddock || :
>-runghc Setup register --gen-script
>-runghc Setup unregister --gen-script
>+%{_cabal} build
>+%{_cabal} haddock || :
>+%{_cabal} register --gen-script
>+%{_cabal} unregister --gen-script
> 
> 
> %install
> rm -rf ${RPM_BUILD_ROOT}
>-runghc Setup copy --destdir=${RPM_BUILD_ROOT}
>+%{_cabal} copy --destdir=${RPM_BUILD_ROOT}
> install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir}
>+
> cd ${RPM_BUILD_ROOT}
>-echo '%defattr(-,root,root,-)' > %{tar_dir}/%{name}-files.prof
>-find .%{pkg_libdir} $ -name '*_p.a' -o -name '*.p_hi' $ | sed s/^.// >> %{tar_dir}/%{name}-files.prof
>-echo '%defattr(-,root,root,-)' > %{tar_dir}/%{name}-files
>-find .%{pkg_libdir} -type d | sed 's/^./%dir /' >> %{tar_dir}/%{name}-files
>-find .%{pkg_libdir} ! $ -type d -o -name '*_p.a' -o -name '*.p_hi' $ | sed s/^.// >> %{tar_dir}/%{name}-files
>-sed 's,^/,%exclude /,' %{tar_dir}/%{name}-files.prof >> %{tar_dir}/%{name}-files
>+echo '%defattr(-,root,root,-)' > ${RPM_SOURCE_DIR}/%{name}-prof.files
>+find .%{pkg_libdir} $ -name '*_p.a' -o -name '*.p_hi' $ | sed s/^.// >> ${RPM_SOURCE_DIR}/%{name}-prof.files
>+echo '%defattr(-,root,root,-)' > ${RPM_SOURCE_DIR}/%{name}.files
>+find .%{pkg_libdir} -type d | sed 's/^./%dir /' >> ${RPM_SOURCE_DIR}/%{name}.files
>+find .%{pkg_libdir} ! $ -type d -o -name '*_p.a' -o -name '*.p_hi' $ | sed s/^.// >> ${RPM_SOURCE_DIR}/%{name}.files
>+sed 's,^/,%exclude /,' ${RPM_SOURCE_DIR}/%{name}-prof.files >> ${RPM_SOURCE_DIR}/%{name}.files
> 
>-cd ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{hsc_name}-%{f_pkg_name}-%{version}
>+cd ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version}
> rm -rf doc LICENSE
> 
> 
>@@ -103,13 +97,15 @@
> [ "$1" = 1 ] && %{pkg_libdir}/register.sh >& /dev/null || :
> 
> 
>-%files  -f %{name}-files
>+%files -f %{name}.files
>+%defattr(-,root,root,-)
> %doc dist/doc/html
> %doc LICENSE
> 
> 
>-%files -n %{hsc_name}-%{f_pkg_name}-prof -f %{name}-files.prof
>-%%doc LICENSE
>+%files -n %{name}-prof -f %{name}-prof.files
>+%defattr(-,root,root,-)
>+%doc LICENSE
> 
> 
> %changelog

Actions: View | Diff

Attachments on bug 426751: 293024 | 314784 | 315171 | 315727 | 315734 | 315852 | 331958 | 333489 | 334452