Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2013-12-19 12:09:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes 2013-10-13 12:15:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2013-12-19 12:09:01.000000000 +0100 @@ -1,0 +2,43 @@ +Mon Dec 16 15:26:01 UTC 2013 - [email protected] + +- add requires prelink + * need execstack to fix ghc generated binaries + +------------------------------------------------------------------- +Fri Dec 13 21:56:16 UTC 2013 - [email protected] + +- fix suse-docdir.patch +* define _pkgdocdir macro + +------------------------------------------------------------------- +Wed Dec 11 19:40:34 UTC 2013 - [email protected] + +- refresh sle-sp1-rpmdeps.patch + +------------------------------------------------------------------- +Tue Oct 29 21:01:53 UTC 2013 - [email protected] + +- disable colorized documentation for ppc bootstrap + +------------------------------------------------------------------- +Sat Oct 26 18:34:10 UTC 2013 - [email protected] + +- fix typo in email address for patch 2 + +------------------------------------------------------------------- +Sat Oct 26 18:32:22 UTC 2013 - [email protected] + +- refresh suse-disable-debug-packages.patch +- refresh add-group.patch +- refresh files-defattr.patch + +------------------------------------------------------------------- +Sat Oct 26 18:26:21 UTC 2013 - [email protected] + +- update to 1.2 from upstream +* update for ghc 7.7 and later +* fixes for bootstrapping new ghc +- drop buildService.patch +* docdirs are unversioned now + +------------------------------------------------------------------- Old: ---- buildService.patch ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.tar.bz2 New: ---- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.tar.bz2 suse-docdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.OgXNGY/_old 2013-12-19 12:09:03.000000000 +0100 +++ /var/tmp/diff_new_pack.OgXNGY/_new 2013-12-19 12:09:03.000000000 +0100 @@ -16,14 +16,14 @@ # -%global git_hash 237337a6c6b3299bc6a437446c7f17136fc67ffa +%global git_hash 4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52 %global macros_dir %{_sysconfdir}/rpm -#%%global without_hscolour 1 +%global without_hscolour 1 Name: ghc-rpm-macros -Version: 0.99 +Version: 1.2 Release: 0 Summary: RPM Macros for building packages for GHC License: GPL-3.0 @@ -33,17 +33,19 @@ Source0: http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.bz2 Source4: macros.ghc-suse -# PATCH-FIX-OPENSUSE buildService .patch [email protected] -- openSUSE packaging Haskell guidelines -Patch: buildService.patch # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch [email protected] -- openSUSE way to disable debug packages Patch1: suse-disable-debug-packages.patch -# PATCH-FIX-OPENSUSE add-group.patch [email protected] -- Make sure a Group: tag is generated in subpackages; [email protected]: also puts libraries in System/Libraries, see package group guidelines +# PATCH-FIX-OPENSUSE add-group.patch [email protected] -- Make sure a Group: tag is generated in subpackages; [email protected]: also puts libraries in System/Libraries, see package group guidelines Patch2: add-group.patch # PATCH-FIX-OPENSUSE files-defattr.patch [email protected] -- Make sure defattr macro used in files sections; [email protected]: see also specfile guidelines, files section, permissions Patch3: files-defattr.patch +# PATCH-FIX-OPENSUSE suse-docdir.patch [email protected] -- fix location of docdir +Patch4: suse-docdir.patch # PATCH-FIX-SLE sle-sp1-rpmdeps.patch [email protected] -- SLE's RPM is too old in 11 SP1 and SP2 Patch100: sle-sp1-rpmdeps.patch +# for execstack +Requires: prelink Requires: rpm %if %{undefined without_hscolour} Requires: hscolour @@ -66,10 +68,10 @@ %prep %setup -q -n %{name}-%{git_hash} -%patch -p1 -b .obs %patch1 -p1 -b .debug %patch2 -p1 %patch3 -p1 +%patch4 -p1 %if 0%{?sles_version} %patch -P 100 -p1 %endif ++++++ add-group.patch ++++++ --- /var/tmp/diff_new_pack.OgXNGY/_old 2013-12-19 12:09:03.000000000 +0100 +++ /var/tmp/diff_new_pack.OgXNGY/_new 2013-12-19 12:09:03.000000000 +0100 @@ -1,19 +1,20 @@ -diff -Nrup a/ghc-rpm-macros.ghc-extra b/ghc-rpm-macros.ghc-extra ---- a/ghc-rpm-macros.ghc-extra 2013-04-24 09:08:41.000000000 +0200 -+++ b/ghc-rpm-macros.ghc-extra 2013-10-08 13:42:47.232096618 +0200 -@@ -21,6 +21,7 @@ +Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra +=================================================================== +--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc-extra ++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra +@@ -9,6 +9,7 @@ %define basepkg ghc-%{pkgname}\ %package -n %{basepkg}\ - Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\ + Summary: Haskell %{pkgname} library\ +Group: System/Libraries\ %{?1:Version: %{pkgver}}\ %{-l:License: %{-l*}}\ - %{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")} -@@ -72,6 +73,7 @@ Summary: %{?common_summary}%{!?co - %define basepkg ghc-%{pkgname}\ + %{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}\ +@@ -18,6 +19,7 @@ This package provides the Haskell %{pkgn + \ %package -n %{basepkg}-devel\ - Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\ + Summary: Haskell %{pkgname} library development files\ +Group: Development/Languages/Other\ %{?1:Version: %{pkgver}}\ %{-l:License: %{-l*}}\ - %{?ghc_devel_requires}\ + Requires(post): ghc-compiler = %{ghc_version}\ ++++++ files-defattr.patch ++++++ --- /var/tmp/diff_new_pack.OgXNGY/_old 2013-12-19 12:09:03.000000000 +0100 +++ /var/tmp/diff_new_pack.OgXNGY/_new 2013-12-19 12:09:03.000000000 +0100 @@ -1,19 +1,15 @@ -diff -Nrup a/ghc-rpm-macros.ghc-extra b/ghc-rpm-macros.ghc-extra ---- a/ghc-rpm-macros.ghc-extra 2013-10-08 15:35:46.955154547 +0200 -+++ b/ghc-rpm-macros.ghc-extra 2013-10-08 15:33:12.000000000 +0200 -@@ -2,6 +2,7 @@ - - %ghc_shared_files\ +Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra +=================================================================== +--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc-extra ++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra +@@ -39,8 +39,10 @@ This package provides the Haskell %{pkgn + %ghc_pkg_recache\ + \ %files -n %{basepkg} -f %{basepkg}.files\ +%defattr(-,root,root,-)\ %{?base_doc_files:%doc %base_doc_files}\ - %{nil} - -@@ -54,6 +55,7 @@ Group: System/Libraries\ - - %ghc_devel_files\ + \ %files -n %{basepkg}-devel -f %{basepkg}-devel.files\ +%defattr(-,root,root,-)\ %{?devel_doc_files:%doc %devel_doc_files}\ %{nil} - ++++++ ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.tar.bz2 -> ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-deps.sh new/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-deps.sh --- old/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-deps.sh 2013-04-24 09:08:41.000000000 +0200 +++ new/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-deps.sh 2013-10-15 11:08:08.000000000 +0200 @@ -8,15 +8,20 @@ [ $# -ne 2 ] && echo "Usage: `basename $0` [--provides|--requires] %{buildroot}%{ghclibdir}" && exit 1 +set +x + MODE=$1 PKGBASEDIR=$2 PKGCONFDIR=$PKGBASEDIR/package.conf.d GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//) -if [ ! -x "/usr/bin/ghc-pkg-${GHC_VER}" -a -x "$PKGBASEDIR/ghc-pkg" ]; then +if [ -x "$PKGBASEDIR/bin/ghc-pkg" ]; then + # ghc-7.7 + GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR" +elif [ -x "$PKGBASEDIR/ghc-pkg" ]; then GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR" else - GHC_PKG="/usr/bin/ghc-pkg" + GHC_PKG="/usr/bin/ghc-pkg-${GHC_VER}" fi case $MODE in @@ -29,14 +34,10 @@ SHARED=$(find $PKGBASEDIR -type f -name '*.so') fi -GHCVERSION=$(ghc --numeric-version) - files=$(cat) -#set -x - for i in $files; do - LIB_FILE=$(echo $i | grep /libHS | egrep -v "$PKGBASEDIR/libHS") + LIB_FILE=$(echo $i | grep /libHS | egrep -v "/libHSrts") if [ "$LIB_FILE" ]; then if [ -d "$PKGCONFDIR" ]; then META="" @@ -68,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=$(objdump -p $i | grep NEEDED | grep libHS | grep -v libHSrts | sed -e "s%^ *NEEDED *libHS\(.*\)-ghc${GHC_VER}.so%\1%") if [ -d "$PKGCONFDIR" ]; then PACKAGE_CONF_OPT="--package-conf=$PKGCONFDIR" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc new/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc --- old/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc 2013-04-24 09:08:41.000000000 +0200 +++ new/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc 2013-10-15 11:08:08.000000000 +0200 @@ -21,7 +21,7 @@ # configure %cabal_configure\ %ghc_check_bootstrap\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_pkgdocdir} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options # install %cabal_install %cabal copy --destdir=%{buildroot} -v @@ -30,6 +30,8 @@ %ghcdocbasedir %{_docdir}/ghc/html # libraries doc dir %ghclibdocdir %{ghcdocbasedir}/libraries +# pkg doc dir +%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name} # top library dir %ghclibdir %{_libdir}/ghc-%{ghc_version} @@ -40,7 +42,7 @@ %define pkgnamever %{pkgname}-%{pkgver}\ %define basepkg ghc-%{pkgname}\ %define pkgdir %{ghclibdir}/%{pkgnamever}\ -%define docdir %{ghclibdocdir}/%{pkgnamever}\ +%define docdir %{ghclibdocdir}/%{pkgname}\ rm -f %{basepkg}.files %{basepkg}-devel.files\ if [ -d "%{buildroot}%{pkgdir}" ]; then\ echo "%dir %{pkgdir}" >> %{basepkg}.files\ @@ -73,24 +75,9 @@ %define pkgver %{?2}%{!?2:%{version}}\ %define pkgnamever %{pkgname}-%{pkgver}\ %cabal register --gen-pkg-config\ -mkdir -p %{buildroot}%{ghclibdir}/package.conf.d\ -install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\ +install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}.conf\ %{nil} -# devel pkg basic requires -%ghc_devel_requires Requires: ghc-compiler = %{ghc_version}\ -Requires(post): ghc-compiler = %{ghc_version}\ -Requires(postun): ghc-compiler = %{ghc_version}\ -Requires: ghc-%{?pkg_name}%{!?pkg_name:%{pkgname}} = %{?pkgver}%{!?pkgver:%{version}}-%{release} - -%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-db || : - -# ghc_strip_dynlinked -%ghc_strip_dynlinked\ -%if %{undefined __debug_package}\ -find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\ -%endif - # ghc_bin_build %ghc_bin_build\ %global debug_package %{nil}\ @@ -100,7 +87,7 @@ # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ %global debug_package %{nil}\ -%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ +%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\ %cabal build\ %{nil} @@ -112,12 +99,25 @@ %endif\ %{nil} +# ghc_strip_dynlinked +%ghc_strip_dynlinked\ +%if %{undefined __debug_package}\ +find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\ +%endif + +# ghc_clear_execstack +%ghc_clear_execstack\ +if [ -d "%{buildroot}%{_bindir}" ]; then\ +find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec execstack -c "{}" \\;\ +fi + # install bin package %ghc_bin_install()\ %global _use_internal_dependency_generator 0\ %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\ %cabal_install\ %{!?1:%ghc_strip_dynlinked}\ +%{!?1:%ghc_clear_execstack}\ %{nil} # ghc_lib_install [name] [version] @@ -129,6 +129,7 @@ %cabal_pkg_conf\ %ghc_gen_filelists\ %{!?1:%ghc_strip_dynlinked}\ +%{!?1:%ghc_clear_execstack}\ %{nil} # ghc_fix_dynamic_rpath prog ... @@ -139,7 +140,7 @@ PROG=%{buildroot}%{_bindir}/$i\ RPATH=$(chrpath $PROG| sed -e "s@^$PROG: RPATH=@@")\ case $RPATH in\ - $PDIR*)\ + *$PDIR*)\ NEWRPATH=$(echo $RPATH | sed -e "s@$PDIR@%{ghclibdir}@g" -e "s@/dist/build@@g")\ chrpath -r $NEWRPATH $PROG\ ;;\ @@ -148,6 +149,8 @@ %endif\ %{nil} +%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-db || : + # - without_hscolour, without_testsuite, and ghc_bootstrapping # need to be set locally in the spec file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc-extra new/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra --- old/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc-extra 2013-04-24 09:08:41.000000000 +0200 +++ new/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc-extra 2013-10-15 11:08:08.000000000 +0200 @@ -1,120 +1,44 @@ # RPM Macros for packaging Haskell packages with multiple libs -*-rpm-spec-*- -%ghc_shared_files\ -%files -n %{basepkg} -f %{basepkg}.files\ -%{?base_doc_files:%doc %base_doc_files}\ -%{nil} - -# ghc_lib_package [-c cdepslist] [-h pkgdepslist] -%ghc_lib_package(c:h:)\ -%define pkgname %{?1}%{!?1:%{pkg_name}}\ -%define basepkg ghc-%{pkgname}\ -%ghc_shared_files\ -\ -%ghc_package_devel\ -%{nil} - -# ghc_package [-l licensetag] [name] [version] -%ghc_package(l:)\ +# ghc_lib_subpackage [-c cdepslist] [-l licensetag] [-x] [name] [version] +%ghc_lib_subpackage(c:l:x)\ %define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgver %{?2}%{!?2:%{version}}\ +%define pkgnamever %{pkgname}-%{pkgver}\ +%{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgnamever}}}\ %define basepkg ghc-%{pkgname}\ %package -n %{basepkg}\ -Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\ +Summary: Haskell %{pkgname} library\ %{?1:Version: %{pkgver}}\ %{-l:License: %{-l*}}\ -%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")} - -# ghc_description [name] [version] -%ghc_description()\ -%define pkgname %{?1}%{!?1:%{pkg_name}}\ -%define basepkg ghc-%{pkgname}\ -%description -n %{basepkg}\ -%{?common_description}%{!?common_description:Haskell %{pkgname} library.} - -# ghc_lib_subpackage [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-x] [name] [version] -%ghc_lib_subpackage(c:h:l:x)\ -%define pkgname %{?1}%{!?1:%{pkg_name}}\ -%define pkgver %{?2}%{!?2:%{version}}\ -%define pkgnamever %{pkgname}-%{pkgver}\ -%{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgnamever}}}\ -%define basepkg ghc-%{pkgname}\ -%ghc_package\ -\ -%ghc_description\ +%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")}\ \ -%ghc_lib_package\ -%{nil} - -%ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-conf || : - -# (deprecated) for docs post and postun -%ghc_reindex_haddock : - -%ghc_devel_files\ -%files -n %{basepkg}-devel -f %{basepkg}-devel.files\ -%{?devel_doc_files:%doc %devel_doc_files}\ -%{nil} - -%ghc_files()\ -%{?1:%define base_doc_files %*}\ -%define basepkg ghc-%{pkg_name}\ -%ghc_shared_files\ +%description -n %{basepkg}\ +This package provides the Haskell %{pkgname} library.\ \ -%ghc_devel_files\ -%{nil} - -# ghc_devel_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-m] [name] [version] -# -m : meta-package -%ghc_devel_package(c:h:l:m)\ -%define pkgname %{?1}%{!?1:%{pkg_name}}\ -%define pkgver %{?2}%{!?2:%{version}}\ -%define basepkg ghc-%{pkgname}\ %package -n %{basepkg}-devel\ -Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\ +Summary: Haskell %{pkgname} library development files\ %{?1:Version: %{pkgver}}\ %{-l:License: %{-l*}}\ -%{?ghc_devel_requires}\ -%{-h:Requires: %{-h*}}\ +Requires(post): ghc-compiler = %{ghc_version}\ +Requires(postun): ghc-compiler = %{ghc_version}\ +Requires: ghc-%{pkgname}%{?_isa} = %{pkgver}-%{release}\ %{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}\ %{-c:Requires: %{-c*}}\ %{?ghc_pkg_obsoletes:Obsoletes: %{ghc_pkg_obsoletes}}\ -%{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-doc/g")}\ -Obsoletes: %{basepkg}-doc < %{pkgver}-%{release}\ -Provides: %{basepkg}-doc = %{pkgver}-%{release}\ -Obsoletes: %{basepkg}-prof < %{pkgver}-%{release}\ -%if %{undefined without_prof}\ -Provides: %{basepkg}-prof = %{pkgver}-%{release}\ -%endif - -# ghc_devel_description -%ghc_devel_description()\ -%define pkgname %{?1}%{!?1:%{pkg_name}}\ -%define basepkg ghc-%{pkgname}\ +\ %description -n %{basepkg}-devel\ -%{?common_description}%{!?common_description:Haskell %{pkgname} library.}\ +This package provides the Haskell %{pkgname} library development files.\ \ -This package contains the development files. - -# ghc_devel_post_postun -%ghc_devel_post_postun()\ -%define pkgname %{?1}%{!?1:%{pkg_name}}\ -%define basepkg ghc-%{pkgname}\ %post -n %{basepkg}-devel\ %ghc_pkg_recache\ \ %postun -n %{basepkg}-devel\ -%ghc_pkg_recache - -# ghc_package_devel [-c cdepslist] [-h pkgdepslist] [-l licensetag] [name] [version] -%ghc_package_devel(c:h:l:)\ -%define pkgname %{?1}%{!?1:%{pkg_name}}\ -%define basepkg ghc-%{pkgname}\ -%ghc_devel_package\ -\ -%ghc_devel_description\ +%ghc_pkg_recache\ \ -%ghc_devel_post_postun\ +%files -n %{basepkg} -f %{basepkg}.files\ +%{?base_doc_files:%doc %base_doc_files}\ \ -%ghc_devel_files\ +%files -n %{basepkg}-devel -f %{basepkg}-devel.files\ +%{?devel_doc_files:%doc %devel_doc_files}\ %{nil} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.spec new/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.spec --- old/ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.spec 2013-04-24 09:08:41.000000000 +0200 +++ new/ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.spec 2013-10-15 11:08:08.000000000 +0200 @@ -6,12 +6,12 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 0.99 +Version: 1.2 Release: 1%{?dist} Summary: RPM macros for building packages for GHC License: GPLv3 -URL: https://fedoraproject.org/wiki/Haskell_SIG +URL: https://fedoraproject.org/wiki/Packaging:Haskell # This is a Fedora maintained package, originally made for # the distribution. Hence the source is currently only available @@ -24,12 +24,15 @@ Source4: cabal-tweak-dep-ver Source5: cabal-tweak-flag Source6: ghc-rpm-macros.ghc-extra -Requires: redhat-rpm-config +# ver-rel for unversioned docdir +Requires: redhat-rpm-config >= 9.1.0-50.fc20 %if %{undefined without_hscolour} BuildRequires: redhat-rpm-config ExclusiveArch: %{ghc_arches} Requires: hscolour %endif +# for execstack +Requires: prelink %description A set of macros for building GHC packages following the Haskell Guidelines @@ -54,8 +57,8 @@ %install -install -p -D -m 0644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{macros_dir}/macros.ghc -install -p -D -m 0644 %{SOURCE6} ${RPM_BUILD_ROOT}/%{macros_dir}/macros.ghc-extra +install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/macros.ghc +install -p -D -m 0644 %{SOURCE6} %{buildroot}/%{macros_dir}/macros.ghc-extra install -p -D -m 0755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh @@ -87,6 +90,71 @@ %changelog +* Tue Oct 15 2013 Jens Petersen <[email protected]> - 1.2-1 +- add ghcpkgdocdir, which like _pkgdocdir allows for unversioned haddock dirs + +* Tue Sep 10 2013 Jens Petersen <[email protected]> - 1.1.3-1 +- ghc-deps.sh: fix ghc-pkg path when bootstrapping new ghc version + +* Mon Sep 9 2013 Jens Petersen <[email protected]> - 1.1.2-1 +- fix ghc-deps.sh when bootstrapping a new ghc version + +* Mon Sep 9 2013 Jens Petersen <[email protected]> - 1.1.1-1 +- use objdump -p instead of ldd to read executable dependencies + +* Sat Sep 7 2013 Jens Petersen <[email protected]> - 1.1-1 +- update ghc-deps.sh to handling ghc-7.8 rts + +* Tue Aug 27 2013 Jens Petersen <[email protected]> - 1.0.8-1 +- drop ghc_docdir in favor of _pkgdocdir +- no longer version package htmldirs + +* Fri Jul 26 2013 Jens Petersen <[email protected]> - 1.0.7-1 +- add ghc_docdir for package's docdir since not provided by standard macros + +* Fri Jul 26 2013 Jens Petersen <[email protected]> - 1.0.6-1 +- also make %ghc_lib_build docdir unversioned +- require redhat-rpm-config >= 9.1.0-50.fc20 for unversioned docdir + +* Fri Jul 26 2013 Jens Petersen <[email protected]> - 1.0.5-1 +- F20 Change: docdir's are now unversioned + +* Thu Jul 11 2013 Jens Petersen <[email protected]> - 1.0.4-1 +- check for bindir before looking for executables in ghc_clear_execstack + +* Wed Jul 10 2013 Jens Petersen <[email protected]> - 1.0.3-1 +- add ghc_clear_execstack and use it also in ghc_lib_install (#973512) + and require prelink for execstack + +* Tue Jul 9 2013 Jens Petersen <[email protected]> - 1.0.2-1 +- drop doc and prof obsoletes and provides from ghc_lib_subpackage +- clear executable stack flag when installing package executables (#973512) + +* Thu Jun 20 2013 Jens Petersen <[email protected]> - 1.0.1-1 +- only configure with --global if not subpackaging libs + +* Thu Jun 20 2013 Jens Petersen <[email protected]> - 1.0-3 +- reenable hscolour + +* Thu Jun 20 2013 Jens Petersen <[email protected]> - 1.0-2 +- turn off hscolour for bootstrap + +* Wed Jun 19 2013 Jens Petersen <[email protected]> - 1.0-1 +- add --global to cabal_configure + +* Mon Jun 17 2013 Jens Petersen <[email protected]> - 0.99.4-1 +- merge remaining extra macros into ghc_lib_subpackage + +* Thu Jun 6 2013 Jens Petersen <[email protected]> - 0.99.3-1 +- configure builds with ghc -O2 (#880135) + +* Wed Jun 5 2013 Jens Petersen <[email protected]> - 0.99.2-1 +- drop -h option from extra macros and make -m work again + +* Fri May 17 2013 Jens Petersen <[email protected]> - 0.99.1-1 +- drop new ghc_compiler macro since it is not good for koji +- ghc_fix_dynamic_rpath: do not assume first RPATH + * Tue Apr 23 2013 Jens Petersen <[email protected]> - 0.99-1 - update for simplified revised Haskell Packaging Guidelines (https://fedorahosted.org/fpc/ticket/194) ++++++ sle-sp1-rpmdeps.patch ++++++ --- /var/tmp/diff_new_pack.OgXNGY/_old 2013-12-19 12:09:03.000000000 +0100 +++ /var/tmp/diff_new_pack.OgXNGY/_new 2013-12-19 12:09:03.000000000 +0100 @@ -1,7 +1,8 @@ -diff -Nur 0.95.1-suse-packaging/ghc-deps.sh 0.95.1-sle-sp1-rpmdeps/ghc-deps.sh ---- 0.95.1-suse-packaging/ghc-deps.sh 2012-06-24 11:03:36.000000000 +0200 -+++ 0.95.1-sle-sp1-rpmdeps/ghc-deps.sh 2012-06-24 11:18:57.000000000 +0200 -@@ -20,8 +20,8 @@ +Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-deps.sh +=================================================================== +--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-deps.sh ++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-deps.sh +@@ -25,8 +25,8 @@ else fi case $MODE in @@ -12,18 +13,19 @@ *) echo "`basename $0`: Need --provides or --requires" ; exit 1 esac -@@ -80,4 +80,4 @@ +@@ -81,4 +81,4 @@ for i in $files; do 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.95.1-suse-packaging/ghc-rpm-macros.ghc 0.95.1-sle-sp1-rpmdeps/ghc-rpm-macros.ghc ---- 0.95.1-suse-packaging/ghc-rpm-macros.ghc 2012-06-24 11:30:57.000000000 +0200 -+++ 0.95.1-sle-sp1-rpmdeps/ghc-rpm-macros.ghc 2012-06-24 11:30:09.000000000 +0200 -@@ -262,6 +262,9 @@ - %endif\ - %{nil} +Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc +=================================================================== +--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc ++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc +@@ -121,6 +121,9 @@ if [ -d "%{buildroot}%{_bindir}" ]; then + find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec execstack -c "{}" \\;\ + fi +# SLE does not define _rpmconfigdir (yet) +%_rpmconfigdir %{_prefix}/lib/rpm ++++++ suse-disable-debug-packages.patch ++++++ --- /var/tmp/diff_new_pack.OgXNGY/_old 2013-12-19 12:09:03.000000000 +0100 +++ /var/tmp/diff_new_pack.OgXNGY/_new 2013-12-19 12:09:03.000000000 +0100 @@ -1,10 +1,10 @@ -Index: ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc +Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc =================================================================== ---- ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.orig/ghc-rpm-macros.ghc -+++ ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc -@@ -92,15 +92,25 @@ Requires: ghc-%{?pkg_name}%{!?pkg_ - find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\ - %endif +--- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc ++++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc +@@ -78,15 +78,25 @@ done\ + install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}.conf\ + %{nil} +# ghc_suse_disable_debug_packages +%ghc_suse_disable_debug_packages\ @@ -27,6 +27,6 @@ %ghc_lib_build_without_haddock()\ -%global debug_package %{nil}\ +%ghc_suse_disable_debug_packages\ - %cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ + %cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\ %cabal build\ %{nil} ++++++ suse-docdir.patch ++++++ Index: ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc =================================================================== --- ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.orig/ghc-rpm-macros.ghc +++ ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52/ghc-rpm-macros.ghc @@ -18,6 +18,9 @@ proceeding, to avoid dependency ABI brea %endif\ fi +# no _pkgdocdir in openSUSE +%_pkgdocdir %{_docdir}/%{name} + # configure %cabal_configure\ %ghc_check_bootstrap\ @@ -27,7 +30,7 @@ fi %cabal_install %cabal copy --destdir=%{buildroot} -v # root dir for ghc docs -%ghcdocbasedir %{_docdir}/ghc/html +%ghcdocbasedir %{_datadir}/doc/ghc/html # libraries doc dir %ghclibdocdir %{ghcdocbasedir}/libraries # pkg doc dir -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
