Attachment 314788 Details for Bug 426753 – xmonad.spec.patch-1

[patch] xmonad.spec.patch-1

xmonad.spec.patch-1 (text/plain), 6.42 KB, created by Jens Petersen on 2008-08-22 09:39:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2008-08-22 09:39:53 UTC

Size: 6.42 KB

patch

obsolete

>--- xmonad.spec.orig	2008-07-07 17:46:25.000000000 +1000
>+++ xmonad.spec	2008-08-22 19:38:37.000000000 +1000
>@@ -1,28 +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 xmonad
>-%define f_pkg_name xmonad
>-%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_libdir %{_libdir}/%{hsc_name}-%{hsc_version}/%{name}-%{version}
> 
> %define debug_package %{nil}
> #Haskell compilers do not traditionally emit DWARF data.
> 
>-Name: %{f_pkg_name}
>+Name: xmonad
> Version: 0.7
> Release: 1%{?dist}
> License: BSD
> Group: User Interface/X
>-URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/xmonad
>-Source: http://hackage.haskell.org/packages/archive/xmonad/%{version}/xmonad-%{version}.tar.gz
>+URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{name}
>+Source: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
> Summary: A tiling window manager
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-BuildRequires: ghc = %{hsc_version}, ghc682-prof, haddock
>+BuildRequires: %{hsc_name} = %{hsc_version}, %{hsc_name}-prof = %{hsc_version}, haddock
> BuildRequires: libXinerama-devel, libX11-devel, libXext-devel
>-BuildRequires: ghc-x11 = 1.4.1, ghc-x11-prof = 1.4.1
>-Requires: ghc = %{hsc_version}
>-Requires: ghc-x11 = 1.4.1
>+BuildRequires: ghc-X11 >= 1.4.1, ghc-X11-prof >= 1.4.1
>+Requires: %{hsc_name} = %{hsc_version}
>+Requires: ghc-X11 >= 1.4.1
> 
> %description
> xmonad is a tiling window manager for X. Windows are arranged
>@@ -36,14 +32,12 @@
> on several screens.
> 
> 
>-%package -n %{hsc_name}-%{f_pkg_name}
>+%package -n %{hsc_name}-%{name}
> Summary: A tiling window manager
> Group: Development/Libraries
> Requires: %{hsc_name} = %{hsc_version}
>-Provides: %{h_pkg_name}-%{hsc_name}-%{hsc_version} = %{version}
>-
> 
>-%description -n %{hsc_name}-%{f_pkg_name}
>+%description -n %{hsc_name}-%{name}
> xmonad is a tiling window manager for X. Windows are arranged
> automatically to tile the screen without gaps or overlap, maximising
> screen use. All features of the window manager are accessible from
>@@ -57,14 +51,14 @@
> This package contains libraries for %{hsc_name} %{hsc_version}.
> 
> 
>-%package -n %{hsc_name}-%{f_pkg_name}-prof
>-Summary: Profiling libraries for %{hsc_name}-%{f_pkg_name}
>+%package -n %{hsc_name}-%{name}-prof
>+Summary: Profiling libraries for %{hsc_name}-%{name}
> Group: Development/Libraries
>-Requires: %{hsc_name}-%{f_pkg_name} = %{version}
>-Provides: %{h_pkg_name}-%{hsc_name}-%{hsc_version}-prof = %{version}
>+Requires: %{hsc_name}-%{name} = %{version}
>+Provides: %{name}-%{hsc_name}-%{hsc_version}-prof = %{version}
> 
> 
>-%description -n %{hsc_name}-%{f_pkg_name}-prof
>+%description -n %{hsc_name}-%{name}-prof
> xmonad is a tiling window manager for X. Windows are arranged
> automatically to tile the screen without gaps or overlap, maximising
> screen use. All features of the window manager are accessible from
>@@ -78,36 +72,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
> 
> 
> %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}/%{hsc_name}-%{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/%{hsc_name}-%{name}-%{version}
> rm -rf doc LICENSE TODO README
> 
> 
>@@ -115,35 +111,38 @@
> rm -rf ${RPM_BUILD_ROOT}
> 
> 
>-%pre -n %{hsc_name}-%{f_pkg_name}
>+%pre -n %{hsc_name}-%{name}
> [ "$1" = 2 ] && %{pkg_libdir}/unregister.sh >&/dev/null || :
> 
> 
>-%post -n %{hsc_name}-%{f_pkg_name}
>+%post -n %{hsc_name}-%{name}
> %{pkg_libdir}/register.sh >&/dev/null
> 
> 
>-%preun -n %{hsc_name}-%{f_pkg_name}
>+%preun -n %{hsc_name}-%{name}
> %{pkg_libdir}/unregister.sh >&/dev/null
> 
> 
>-%postun -n %{hsc_name}-%{f_pkg_name}
>+%postun -n %{hsc_name}-%{name}
> [ "$1" = 1 ] && %{pkg_libdir}/register.sh >& /dev/null || :
> 
> 
>-%files -n %{hsc_name}-%{f_pkg_name} -f %{name}-files
>+%files -n %{hsc_name}-%{name} -f %{name}.files
>+%defattr(-,root,root,-)
> %doc dist/doc/html
> %doc LICENSE TODO README
> 
> 
>-%files -n %{hsc_name}-%{f_pkg_name}-prof -f %{name}-files.prof
>+%files -n %{hsc_name}-%{name}-prof -f %{name}-prof.files
>+%defattr(-,root,root,-)
> %%doc LICENSE
> 
> 
> %files
> %defattr(-,root,root,-)
>-%{_bindir}/xmonad
>+%defattr(-,root,root,-)
> %doc LICENSE
>+%{_bindir}/xmonad
> 
> 
> %changelog

Actions: View | Diff

Attachments on bug 426753: 314788 | 316173 | 333495 | 337244 | 342410