pool/ghc-rpm-macros
SHA256
11
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 112972 from home:ptrommler:branches:devel:languages:haskell

Browse Source 
ghc-deps does not emit ghc-* = version depends anymore.

OBS-URL: https://build.opensuse.org/request/show/112972
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=5
This commit is contained in:
Peter Trommler
2012-04-08 08:35:26 +00:00
committed by Git OBS Bridge
parent 57d9e0e1d2
commit aed9181e3d
6 changed files with 65 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
buildService.patch
View File

@@ -1,59 +1,18 @@
diff -Nur 0.15.4.orig/ghc-deps.sh 0.15.4/ghc-deps.sh
--- 0.15.4.orig/ghc-deps.sh 2012-02-19 15:49:26.000000000 +0100
+++ 0.15.4/ghc-deps.sh 2012-02-19 16:02:03.000000000 +0100
@@ -41,10 +41,11 @@
if [ -d "$PKGCONFDIR" ]; then
META=""
SELF=""
+ POST=""
case $LIB_FILE in
*.so) META=ghc ;;
- *_p.a) META=ghc-prof SELF=ghc-devel ;;
- *.a) META=ghc-devel
+ *_p.a) META=ghc-prof POST=-prof SELF=ghc-devel ;;
+ *.a) META=ghc-devel POST=-devel
if [ "$SHARED" ]; then
SELF=ghc
fi
@@ -55,11 +56,18 @@
HASHS=$(${GHC_PKG} -f $PKGCONFDIR field $PKGVER $FIELD | sed -e "s/^$FIELD: \+//")
for i in $HASHS; do
case $i in
- *-*) echo $i | sed -e "s/\(.*\)-\(.*\)/$META(\1) = \2/" ;;
+ *-*) echo $i | sed -e "s/\(.*\)-\(.*\)/$META(\1) = \2/"
+ echo $i | sed -e "s/\(.*\)-\(.*\)-\(.*\)/ghc-\1$POST = \2/";;
*) ;;
esac
done
if [ "$MODE" = "--requires" -a "$SELF" ]; then
+ for i in $PKGVER; do
+ case $i in
+ *-*) echo $i | sed -e "s/\(.*\)-\(.*\)/ghc-\1 = \2/" ;;
+ *) ;;
+ esac
+ done
HASHS=$(${GHC_PKG} -f $PKGCONFDIR field $PKGVER id | sed -e "s/^id: \+//")
for i in $HASHS; do
echo $i | sed -e "s/\(.*\)-\(.*\)/$SELF(\1) = \2/"
@@ -69,8 +77,14 @@
diff -Nur 0.15.5/ghc-deps.sh 0.15.5-obs/ghc-deps.sh
--- 0.15.5/ghc-deps.sh 2012-02-23 10:10:50.000000000 +0100
+++ 0.15.5-obs/ghc-deps.sh 2012-03-19 19:56:38.000000000 +0100
@@ -69,7 +69,7 @@
fi
elif [ "$MODE" = "--requires" ]; then
if file $i | grep -q 'executable, .* dynamically linked'; then
- BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so =.*%\1%")
+ BIN_DEPS=$(ldd $i | grep libHS | grep -v libHSrts | grep -v libHSffi | sed -e "s%^\\tlibHS\(.*\)-ghc${GHCVERSION}.so =.*%\1%")
for p in ${BIN_DEPS}; do
+ # for build-service
+ case $p in
+ *-*) echo $p | sed -e "s/\(.*\)-\(.*\)/ghc-\1 = \2/" ;;
+ *) ;;
+ esac
+ # end buildservice
HASH=$(${GHC_PKG} --global field $p id | sed -e "s/^id: \+//")
echo $HASH | sed -e "s/\(.*\)-\(.*\)/ghc(\1) = \2/"
done
diff -Nur 0.15.4.orig/ghc-rpm-macros.ghc 0.15.4/ghc-rpm-macros.ghc
--- 0.15.4.orig/ghc-rpm-macros.ghc 2012-02-19 15:49:26.000000000 +0100
+++ 0.15.4/ghc-rpm-macros.ghc 2012-02-19 15:57:19.000000000 +0100
diff -Nur 0.15.5/ghc-rpm-macros.ghc 0.15.5-obs/ghc-rpm-macros.ghc
--- 0.15.5/ghc-rpm-macros.ghc 2012-02-23 10:10:50.000000000 +0100
+++ 0.15.5-obs/ghc-rpm-macros.ghc 2012-03-19 16:58:43.000000000 +0100
@@ -21,13 +21,14 @@
# configure
%cabal_configure\
@@ -71,7 +30,19 @@ diff -Nur 0.15.4.orig/ghc-rpm-macros.ghc 0.15.4/ghc-rpm-macros.ghc
# libraries doc dir
%ghclibdocdir %{ghcdocbasedir}/libraries
# top library dir
@@ -49,16 +50,16 @@
@@ -50,19 +51,19 @@
%endif\
%if 0%{!?1:1} && %{defined ghc_without_shared}\
if [ "%{name}" = "ghc-%{pkg_name}" ]; then\
- if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
- mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-devel-%{version}\
+ if [ -d "%{buildroot}%{_docdir}/%{name}" ]; then\
+ mv %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-devel\
%if %{undefined ghc_exclude_docdir}\
- echo "%{_docdir}/%{name}-devel-%{version}" >> %{basepkg}-devel.files\
+ echo "%{_docdir}/%{name}-devel" >> %{basepkg}-devel.files\
%endif\
fi\
fi\
%endif\
%if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\
@@ -85,16 +56,8 @@ diff -Nur 0.15.4.orig/ghc-rpm-macros.ghc 0.15.4/ghc-rpm-macros.ghc
+ echo "%{_docdir}/ghc-%{pkgname}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
fi\
%endif\
%if 0%{!?1:1} && %{defined ghc_without_shared}\
if [ "%{name}" = "ghc-%{pkg_name}" ]; then\
- if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
- mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-devel-%{version}\
+ if [ -d "%{buildroot}%{_docdir}/%{name}" ]; then\
+ mv %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-devel\
fi\
fi\
%endif\
@@ -102,6 +103,7 @@
echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\
@@ -105,6 +106,7 @@
%ghc_shared_files\
%if %{undefined ghc_without_shared}\
%files -n %{basepkg} -f %{basepkg}.files\
@@ -102,7 +65,7 @@ diff -Nur 0.15.4.orig/ghc-rpm-macros.ghc 0.15.4/ghc-rpm-macros.ghc
%{?base_doc_files:%doc %base_doc_files}\
%endif\
%{nil}
@@ -122,7 +124,7 @@
@@ -125,7 +127,7 @@
%define basepkg ghc-%{pkgname}\
%package -n %{basepkg}\
Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\
@@ -111,7 +74,7 @@ diff -Nur 0.15.4.orig/ghc-rpm-macros.ghc 0.15.4/ghc-rpm-macros.ghc
%{?1:Version: %{pkgver}}\
%{-l:License: %{-l*}}\
%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}
@@ -158,6 +160,7 @@
@@ -161,6 +163,7 @@
%ghc_devel_files\
%files -n %{basepkg}-devel -f %{basepkg}-devel.files\
@@ -119,7 +82,7 @@ diff -Nur 0.15.4.orig/ghc-rpm-macros.ghc 0.15.4/ghc-rpm-macros.ghc
%if %{defined ghc_without_shared}\
%{?base_doc_files:%doc %base_doc_files}\
%endif\
@@ -179,7 +182,7 @@
@@ -182,7 +185,7 @@
%define basepkg ghc-%{pkgname}\
%package -n %{basepkg}-devel\
Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\
@@ -128,7 +91,7 @@ diff -Nur 0.15.4.orig/ghc-rpm-macros.ghc 0.15.4/ghc-rpm-macros.ghc
%{?1:Version: %{pkgver}}\
%{-l:License: %{-l*}}\
%{?ghc_devel_requires}\
@@ -233,15 +236,17 @@
@@ -236,15 +239,17 @@
# ghc_bin_build
%ghc_bin_build\

11
ghc-rpm-macros.changes
View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Mar 19 18:58:47 UTC 2012 - peter.trommler@ohm-hochschule.de
- fix ghc-deps.sh (ignore builtin_ffi)
-------------------------------------------------------------------
Mon Mar 19 16:27:03 UTC 2012 - peter.trommler@ohm-hochschule.de
- upgrade to 0.15.5 from upstream
- undo patch for dependency generation (redundant provides)
-------------------------------------------------------------------
Thu Feb 23 07:38:02 UTC 2012 - peter.trommler@ohm-hochschule.de

37
ghc-rpm-macros.ghc
View File

@@ -48,6 +48,16 @@ echo "%dir %{pkgdir}" >> %{basepkg}.files\
echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >> %{basepkg}.files\
fi\
%endif\
%if 0%{!?1:1} && %{defined ghc_without_shared}\
if [ "%{name}" = "ghc-%{pkg_name}" ]; then\
if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-devel-%{version}\
%if %{undefined ghc_exclude_docdir}\
echo "%{_docdir}/%{name}-devel-%{version}" >> %{basepkg}-devel.files\
%endif\
fi\
fi\
%endif\
%if 0%{!?1:1} && %{undefined ghc_exclude_docdir}\
if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
@@ -55,13 +65,6 @@ elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\
echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\
fi\
%endif\
%if 0%{!?1:1} && %{defined ghc_without_shared}\
if [ "%{name}" = "ghc-%{pkg_name}" ]; then\
if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\
mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}-devel-%{version}\
fi\
fi\
%endif\
echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\
if [ -d "%{buildroot}%{pkgdir}" ]; then\
find %{buildroot}%{pkgdir} -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\
@@ -273,21 +276,17 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
%{!?1:%ghc_strip_dynlinked}\
%{nil}
# skip shared and prof libs, documentation, and testsuite
# - without_hscolour needs to be set locally in the spec file
%ghc_bootstrap\
%global ghc_without_shared 1\
%global ghc_without_dynamic 1\
%global without_prof 1\
%global without_haddock 1\
%global without_manual 1\
%global without_testsuite 1\
# needs to be set also in ghc.spec\
%global ghc_bootstrapping 1
# - without_hscolour, without_testsuite, and ghc_bootstrapping
# need to be set locally in the spec file
# skip prof libs, and documentation
# - without_hscolour needs to be set locally in the spec file
%ghc_test\
%global without_prof 1\
%global without_haddock 1\
%global without_manual 1
# skip shared and prof libs, documentation, and testsuite
%ghc_bootstrap\
%global ghc_without_shared 1\
%global ghc_without_dynamic 1\
%ghc_test

333
ghc-rpm-macros.spec
View File

@@ -16,7 +16,7 @@
%global macros_file %{_sysconfdir}/rpm/macros.ghc
Name: ghc-rpm-macros
Version: 0.15.4
Version: 0.15.5
Release: 1
Summary: Macros for building packages for GHC
@@ -88,334 +88,3 @@ EOF
%{_prefix}/lib/rpm/magic
%changelog
* Fri Dec 2 2011 Jens Petersen <petersen@redhat.com> - 0.14.3-1
- do not use ghc user config by default when compiling Setup
- do not setup hscolour if without_hscolour defined
* Thu Nov 17 2011 Jens Petersen <petersen@redhat.com> - 0.14.2-1
- test for HsColour directly when running "cabal haddock" instead of
check hscolour is available (reported by Giam Teck Choon, #753833)
* Sat Nov 12 2011 Jens Petersen <petersen@redhat.com> - 0.14.1-1
- fix double listing of docdir in base lib package
* Tue Nov 1 2011 Jens Petersen <petersen@redhat.com> - 0.14-1
- replace devel ghc requires with ghc-compiler
- disable testsuite in ghc_bootstrap
* Mon Oct 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.13-1
- add ghc_bootstrapping to ghc_bootstrap for packages other than ghc
- make ghc-deps.sh also work when bootstrapping a new ghc version
* Sat Oct 15 2011 Jens Petersen <petersen@redhat.com> - 0.13.12-1
- add ghc_exclude_docdir to exclude docdir from filelists
* Fri Sep 30 2011 Jens Petersen <petersen@redhat.com> - 0.13.11-1
- fix devel subpackage's prof and doc obsoletes and provides versions
for multiple lib packages like ghc (reported by Henrik Nordström)
* Tue Sep 13 2011 Jens Petersen <petersen@redhat.com> - 0.13.10-1
- do not setup ghc-deps.sh when ghc_bootstrapping
- add ghc_test build config
* Wed Aug 3 2011 Jens Petersen <petersen@redhat.com> - 0.13.9-1
- drop without_testsuite from ghc_bootstrap since it breaks koji
* Fri Jul 1 2011 Jens Petersen <petersen@redhat.com> - 0.13.8-1
- drop redundant defattr from filelists
- move dependency generator setup from ghc_package_devel to ghc_lib_install
in line with ghc_bin_install
* Mon Jun 27 2011 Jens Petersen <petersen@redhat.com> - 0.13.7-1
- add requires for redhat-rpm-config for ghc_arches
- drop ghc_bootstrapping from ghc_bootstrap: doesn't work for koji
* Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.6-1
- also set ghc_without_dynamic for ghc_bootstrap
- drop without_hscolour from ghc_bootstrap: doesn't work for koji
* Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.5-1
- ghc_bootstrap is now a macro which sets ghc_bootstrapping,
ghc_without_shared, without_prof, without_haddock, without_hscolour,
without_manual, without_testsuite
- tweaks to ghc_check_bootstrap
* Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 0.13.4-1
- add ghc_check_bootstrap
* Thu Jun 2 2011 Jens Petersen <petersen@redhat.com> - 0.13.3-1
- rename macros.ghc-pkg back to macros.ghc
- move the devel summary prefix back to a suffix
* Sat May 28 2011 Jens Petersen <petersen@redhat.com> - 0.13.2-1
- macros need to live in /etc/rpm
- use macro_file for macros.ghc filepath
* Sat May 28 2011 Jens Petersen <petersen@redhat.com> - 0.13.1-1
- move macros.ghc to /usr/lib/rpm to avoid conflict with redhat-rpm-config
* Wed May 11 2011 Jens Petersen <petersen@redhat.com> - 0.13-1
- merge prof subpackages into devel to simplify packaging
* Mon May 9 2011 Jens Petersen <petersen@redhat.com> - 0.12.1-1
- include ghc_pkg_c_deps even when -c option used
* Sat May 7 2011 Jens Petersen <petersen@redhat.com> - 0.12.0-1
- drop ghc_pkg_deps from ghc_package_devel and ghc_package_prof since
ghc-deps.sh generates better inter-package dependencies already
- condition --htmldir on pkg_name
* Fri Apr 1 2011 Jens Petersen <petersen@redhat.com> - 0.11.14-1
- provides ghc-*-doc still needed for current lib templates
* Mon Mar 28 2011 Jens Petersen <petersen@redhat.com> - 0.11.13-1
- ghc-deps.sh: check PKGBASEDIR exists to avoid warning for bin package
- abort cabal_configure if ghc is not self-bootstrapped
- make ghc_reindex_haddock a safe no-op
- no longer provide ghc-*-doc
- no longer run ghc_reindex_haddock in ghc-*-devel scripts
* Thu Mar 10 2011 Jens Petersen <petersen@redhat.com> - 0.11.12-1
- add ghc_pkg_obsoletes to binlib base lib package too
* Wed Mar 9 2011 Jens Petersen <petersen@redhat.com> - 0.11.11-1
- add docdir when subpackaging packages too
* Sun Feb 13 2011 Jens Petersen <petersen@redhat.com> - 0.11.10-1
- this package is now arch-dependent
- rename without_shared to ghc_without_shared and without_dynamic
to ghc_without_dynamic so that they can be globally defined for
secondary archs without shared libs
- use %%undefined macro
- disable debug_package in ghc_bin_build and ghc_lib_build
- set ghc_without_shared and ghc_without_dynamic on secondary
(ie non main intel) archs
- disable debuginfo for self
* Fri Feb 11 2011 Jens Petersen <petersen@redhat.com> - 0.11.9-1
- revert "set without_shared and without_dynamic by default on secondary archs
in cabal_bin_build and cabal_lib_build" change, since happening for all archs
* Thu Feb 10 2011 Jens Petersen <petersen@redhat.com> - 0.11.8-1
- only link Setup dynamically if without_shared and without_dynamic not set
- set without_shared and without_dynamic by default on secondary archs
in cabal_bin_build and cabal_lib_build
- add cabal_configure_options to pass extra options to cabal_configure
* Thu Feb 10 2011 Jens Petersen <petersen@redhat.com> - 0.11.7-1
- fix ghc-deps.sh for without_shared libraries
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Jan 29 2011 Jens Petersen <petersen@redhat.com> - 0.11.6-1
- simplify adding shared subpackage license file
- own ghc-deps.sh not /usr/lib/rpm
* Sun Jan 23 2011 Jens Petersen <petersen@redhat.com> - 0.11.5-1
- add rpm hash requires for dynamic executables in ghc-deps.sh
- compile Setup in cabal macro
- use _rpmconfigdir
* Sat Jan 22 2011 Jens Petersen <petersen@redhat.com> - 0.11.4-1
- drop deprecated ghcdocdir and ghcpkgdir
- new ghclibdocdir
- replace some missed RPM_BUILD_ROOT's
- bring back ghc requires in ghc_devel_requires
- improve prof summary and description
- add without_prof and without_haddock option macros
* Fri Jan 21 2011 Jens Petersen <petersen@redhat.com> - 0.11.3-1
- compile Setup to help speed up builds
* Thu Jan 20 2011 Jens Petersen <petersen@redhat.com> - 0.11.2-1
- put docdir (license) also into shared lib subpackage
- add ghc_binlib_package option to exclude package from ghc_packages_list
- condition lib base package additional description for srpm
* Mon Jan 3 2011 Jens Petersen <petersen@redhat.com> - 0.11.1-1
- use buildroot instead of RPM_BUILD_ROOT
- rename ghcpkgbasedir to ghclibdir
- split "[name-version]" args into "[name] [version]" args
- move remaining name and version macro options (-n and -v) to args
- drop deprecated -o options
* Thu Dec 30 2010 Jens Petersen <petersen@redhat.com> - 0.11.0-1
- add support for subpackaging ghc's libraries:
- deprecate ghcpkgdir and ghcdocdir from now on
- ghc_gen_filelists optional arg is now name-version
- ghc_lib_build, ghc_lib_install, cabal_pkg_conf now take optional
name-version arg
* Mon Dec 20 2010 Jens Petersen <petersen@redhat.com> - 0.10.3-1
- revert disabling debug_package, since with redhat-rpm-config installed
the behaviour depended on the position of ghc_lib_package in the spec file
(reported by narasim)
* Fri Nov 26 2010 Jens Petersen <petersen@redhat.com>
- drop with_devhelp since --html-help option gone from haddock-2.8.0
* Tue Nov 23 2010 Jens Petersen <petersen@redhat.com> - 0.10.2-1
- ignore ghc's builtin pseudo-libs
* Tue Nov 23 2010 Jens Petersen <petersen@redhat.com> - 0.10.1-1
- bring back the explicit n-v-r internal package requires for devel and prof packages
* Mon Nov 22 2010 Jens Petersen <petersen@redhat.com> - 0.10.0-1
- turn on pkg hash metadata (for ghc-7 builds)
- ghc-deps.sh now requires an extra buildroot/ghcpkgbasedir arg
- automatic internal package deps from prof to devel to base
- rename ghc_requires to ghc_devel_requires
- drop ghc_doc_requires
- ghc_reindex_haddock is deprecated and now a no-op
* Thu Sep 30 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-1
- fix without_shared build so it actually works
* Thu Sep 30 2010 Jens Petersen <petersen@redhat.com> - 0.9.0-1
- add rpm provides and requires script ghc-deps.sh for package hash metadata
- turn on hash provides and disable debuginfo by default
- make shared and hscolour default
- use without_shared and without_hscolour to disable them
- add ghc_pkg_obsoletes for obsoleting old packages
- use ghcpkgbasedir
- always obsolete -doc packages, but keep -o for now for backward compatibility
* Fri Jul 16 2010 Jens Petersen <petersen@redhat.com> - 0.8.1-1
- fix ghc_strip_dynlinked when no dynlinked files
- devel should provide doc also when not obsoleting
* Fri Jul 16 2010 Jens Petersen <petersen@redhat.com> - 0.8.0-1
- merge -doc into -devel and provide -o obsoletes doc subpackage option
* Mon Jun 28 2010 Jens Petersen <petersen@redhat.com> - 0.7.1-1
- support hscolour'ing of src from haddock
- really remove redundant summary and description option flags
* Sat Jun 26 2010 Jens Petersen <petersen@redhat.com> - 0.7.0-1
- new ghc_bin_build, ghc_bin_install, ghc_lib_build, ghc_lib_install
* Thu Jun 24 2010 Jens Petersen <petersen@redhat.com> - 0.6.2-1
- a couple more fallback summary tweaks
* Thu Jun 24 2010 Jens Petersen <petersen@redhat.com> - 0.6.1-1
- drop the summary -s and description -d package options since rpm does not
seem to allow white\ space in macro option args anyway
* Wed Jun 23 2010 Jens Petersen <petersen@redhat.com> - 0.6.0-1
- make ghc_strip_dynlinked conditional on no debug_package
* Wed Jun 23 2010 Jens Petersen <petersen@redhat.com> - 0.5.9-1
- replace ghc_strip_shared with ghc_strip_dynlinked
* Sun Jun 20 2010 Jens Petersen <petersen@redhat.com> - 0.5.8-1
- add ghc_strip_shared to strip shared libraries
* Sun Jun 20 2010 Jens Petersen <petersen@redhat.com> - 0.5.7-1
- add comments over macros
- drop unused cabal_makefile
* Mon Apr 12 2010 Jens Petersen <petersen@redhat.com> - 0.5.6-1
- drop unused ghc_pkg_ver macro
- add ghc_pkg_recache macro
* Fri Jan 15 2010 Jens Petersen <petersen@redhat.com> - 0.5.5-1
- drop optional 2nd version arg from ghcdocdir, ghcpkgdir, and
ghc_gen_filelists: multiversion subpackages are not supported
- add ghcpkgbasedir
- bring back some shared conditions which were dropped temporarily
- test for ghcpkgdir and ghcdocdir in ghc_gen_filelists
- allow optional pkgname arg for cabal_pkg_conf
- can now package gtk2hs
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 0.5.4-1
- use -v in ghc_requires and ghc_prof_requires for version
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 0.5.3-1
- drop "Library for" from base lib summary
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 0.5.2-1
- use -n in ghc_requires and ghc_prof_requires for when no pkg_name
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 0.5.1-1
- add ghcdocbasedir
- revert ghcdocdir to match upstream ghc
- ghcdocdir and ghcpkgdir now take optional name version args
- update ghc_gen_filelists to new optional name version args
- handle docdir in ghc_gen_filelists
- ghc_reindex_haddock uses ghcdocbasedir
- summary and description options to ghc_binlib_package, ghc_package_devel,
ghc_package_doc, and ghc_package_prof
* Sun Jan 10 2010 Jens Petersen <petersen@redhat.com> - 0.5.0-1
- pkg_name must be set now for binlib packages too
- new ghc_lib_package and ghc_binlib_package macros make packaging too easy
- ghc_package_devel, ghc_package_doc, and ghc_package_prof helper macros
- ghc_gen_filelists now defaults to ghc-%%{pkg_name}
- add dynamic bcond to cabal_configure instead of cabal_configure_dynamic
* Thu Dec 24 2009 Jens Petersen <petersen@redhat.com> - 0.4.0-1
- add cabal_configure_dynamic
- add ghc_requires, ghc_doc_requires, ghc_prof_requires
* Tue Dec 15 2009 Jens Petersen <petersen@redhat.com> - 0.3.1-1
- use ghc_version_override to override ghc_version
- fix pkg .conf filelist match
* Sat Dec 12 2009 Jens Petersen <petersen@redhat.com> - 0.3.0-1
- major updates for ghc-6.12, package.conf.d, and shared libraries
- add shared support to cabal_configure, ghc_gen_filelists
- version ghcdocdir
- replace ghc_gen_scripts, ghc_install_scripts, ghc_register_pkg, ghc_unregister_pkg
with cabal_pkg_conf
- allow (ghc to) override ghc_version
* Mon Nov 16 2009 Jens Petersen <petersen@redhat.com> - 0.2.5-1
- make ghc_pkg_ver only return pkg version
* Mon Nov 16 2009 Jens Petersen <petersen@redhat.com> - 0.2.4-1
- change GHCRequires to ghc_pkg_ver
* Mon Nov 16 2009 Jens Petersen <petersen@redhat.com> - 0.2.3-1
- use the latest installed pkg version for %%GHCRequires
* Mon Nov 16 2009 Jens Petersen <petersen@redhat.com> - 0.2.2-1
- add %%GHCRequires for automatically versioned library deps
* Tue Sep 22 2009 Jens Petersen <petersen@redhat.com> - 0.2.1-2
- no, revert versioned ghcdocdir again!
* Tue Sep 22 2009 Jens Petersen <petersen@redhat.com> - 0.2.1-1
- version ghcdocdir to allow multiple doc versions like ghcpkgdir
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Tue Jun 9 2009 Jens Petersen <petersen@redhat.com> - 0.2-1
- drop version from ghcdocdir since it breaks haddock indexing
* Wed May 13 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.1-7
- specifies the macros file as a %%conf
* Sat May 9 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.1-6
- removes archs and replaces with noarch
- bumps to avoid conflicts with jens
* Fri May 8 2009 Jens Petersen <petersen@redhat.com> - 0.1-5
- make it arch specific to fedora ghc archs
- setup a build dir so it can build from the current working dir
* Wed May 6 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.1-4
- renamed license file
- removed some extraneous comments needed only at review time
* Wed May 6 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.1-3
- updated license to GPLv3
- added AUTHORS file
* Tue May 5 2009 Yaakov M. Nemoy <ghc@hexago.nl> - 0.1-2
- moved copying license from %%build to %%prep
* Mon May 4 2009 Yaakov M. Nemoy <ghc@hexago.nl> - 0.1-1
- creation of package

1
rpmlintrc Normal file
View File

@@ -0,0 +1 @@
addFilter("no-binary")

16
sle-sp1-rpmdeps.patch
View File

@@ -1,6 +1,6 @@
diff -Nur 0.15.4/ghc-deps.sh 0.15.4.sle11-sp1/ghc-deps.sh
--- 0.15.4/ghc-deps.sh 2012-02-19 16:02:03.000000000 +0100
+++ 0.15.4.sle11-sp1/ghc-deps.sh 2012-02-19 16:05:14.000000000 +0100
diff -Nur 0.15.5-obs/ghc-deps.sh 0.15.5-sle/ghc-deps.sh
--- 0.15.5-obs/ghc-deps.sh 2012-03-19 17:03:57.000000000 +0100
+++ 0.15.5-sle/ghc-deps.sh 2012-03-19 17:05:16.000000000 +0100
@@ -20,8 +20,8 @@
fi
@@ -12,16 +12,16 @@ diff -Nur 0.15.4/ghc-deps.sh 0.15.4.sle11-sp1/ghc-deps.sh
*) echo "`basename $0`: Need --provides or --requires" ; exit 1
esac
@@ -92,4 +92,4 @@
@@ -78,4 +78,4 @@
fi
done
-echo $files | tr [:blank:] '\n' | /usr/lib/rpm/rpmdeps $MODE
+echo $files | tr [:blank:] '\n' | /usr/lib/rpm/find$FINDMODE
diff -Nur 0.15.4/ghc-rpm-macros.ghc 0.15.4.sle11-sp1/ghc-rpm-macros.ghc
--- 0.15.4/ghc-rpm-macros.ghc 2012-02-19 15:57:19.000000000 +0100
+++ 0.15.4.sle11-sp1/ghc-rpm-macros.ghc 2012-02-23 08:35:48.000000000 +0100
@@ -254,6 +254,9 @@
diff -Nur 0.15.5-obs/ghc-rpm-macros.ghc 0.15.5-sle/ghc-rpm-macros.ghc
--- 0.15.5-obs/ghc-rpm-macros.ghc 2012-03-19 16:58:43.000000000 +0100
+++ 0.15.5-sle/ghc-rpm-macros.ghc 2012-03-19 17:05:16.000000000 +0100
@@ -257,6 +257,9 @@
%{?1:cd -}\
%{nil}