Hello community, here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory checked in at 2013-08-01 15:33:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-11-24 20:54:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes 2013-08-01 15:33:21.000000000 +0200 @@ -1,0 +2,35 @@ +Wed May 1 19:51:20 UTC 2013 - [email protected] + +- put version back into html doc directory (needed by haddock) + +------------------------------------------------------------------- +Wed May 1 18:42:46 UTC 2013 - [email protected] + +- fix library directory for ghc packages + +------------------------------------------------------------------- +Wed May 1 17:59:27 UTC 2013 - [email protected] + +- drop library version in html documentation directory + +------------------------------------------------------------------- +Mon Apr 29 17:16:30 UTC 2013 - [email protected] + +- add patch to fix ghc_gen_filelists macro + +------------------------------------------------------------------- +Mon Apr 29 08:59:04 UTC 2013 - [email protected] + +- update to 0.99 from upstream +- support for ghc 7.6 +- more transparent file lists +- macros dealing with subpackages moved to extra subbpackage + +------------------------------------------------------------------- +Sat Mar 9 16:17:16 UTC 2013 - [email protected] + +- update to 0.98.1 from upstream +- new ghc_fix_dynamic_rpath macro to make executables work that + are linked to their own library + +------------------------------------------------------------------- Old: ---- AUTHORS COPYING cabal-tweak-dep-ver ghc-deps.sh ghc-rpm-macros.ghc New: ---- _service fix-gen-filelists.patch ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.K8vxqz/_old 2013-08-01 15:33:22.000000000 +0200 +++ /var/tmp/diff_new_pack.K8vxqz/_new 2013-08-01 15:33:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-rpm-macros # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,46 +16,55 @@ # -%global macros_file %{_sysconfdir}/rpm/macros.ghc +%global git_hash 237337a6c6b3299bc6a437446c7f17136fc67ffa + +%global macros_dir %{_sysconfdir}/rpm + +%global without_hscolour 1 Name: ghc-rpm-macros -Version: 0.95.5.1 +Version: 0.99 Release: 0 -Summary: Macros for building packages for GHC +Summary: RPM Macros for building packages for GHC License: GPL-3.0 Group: Development/Libraries/Other Url: https://fedoraproject.org/wiki/Haskell_SIG -# This is a Fedora maintained package which is specific to -# our distribution. Thus the source is only available from -# within this srpm. -Source0: ghc-rpm-macros.ghc -Source1: COPYING -Source2: AUTHORS -Source3: ghc-deps.sh +Source0: http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.bz2 Source4: macros.ghc-suse -Source5: cabal-tweak-dep-ver +# PATCH-FIX-OPENSUSE buildService .patch [email protected] -- openSUSE packaging Haskell guidelines Patch: buildService.patch +# PATCH-FIX-OPENSUSE cabal-rpm-spdx.patch [email protected] -- openSUSE way to disable debug packages Patch1: suse-disable-debug-packages.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 #Requires: redhat-rpm-config Requires: rpm +%if %{undefined without_hscolour} +Requires: hscolour +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -A set of macros for building GHC packages following the Haskell Guidelines -of the Fedora Haskell SIG. ghc needs to be installed in order to make use of -these macros. +A set of macros for building GHC packages following the openSUSE +Haskell Guidelines. ghc needs to be installed in +order to make use of these macros. +%package extra +Summary: Extra RPM macros for building Haskell packages with several libs +Group: Development/Libraries/Other +Requires: %{name} = %{version}-%{release} + +%description extra +Set of macros to build ghc packages that contain multiple subpackages. %prep -%setup -c -T -cp %{SOURCE1} %{SOURCE2} . -cp %{SOURCE0} %{SOURCE3} . +%setup -q -n %{name}-%{git_hash} %patch -p1 -b .obs %patch1 -p1 -b .debug +#%%patch2 -p1 -b .filelists %if 0%{?sles_version} %patch -P 100 -p1 %endif @@ -64,11 +73,13 @@ echo no build stage needed %install -install -p -D -m 0644 ./ghc-rpm-macros.ghc ${RPM_BUILD_ROOT}/%{macros_file} -install -p -D -m 0644 %{SOURCE4} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc-suse +install -p -D -m 0644 ./ghc-rpm-macros.ghc %{buildroot}%{macros_dir}/macros.ghc +install -p -D -m 0644 ./ghc-rpm-macros.ghc-extra ${RPM_BUILD_ROOT}/%{macros_dir}/macros.ghc-extra +install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.ghc-suse install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh -install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver +install -p -D -m 0755 cabal-tweak-dep-ver %{buildroot}/%{_bindir}/cabal-tweak-dep-ver +install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag # this is why this package is now arch-dependent: # turn off shared libs and dynamic linking on secondary archs @@ -84,9 +95,14 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS -%config(noreplace) %{macros_file} -%config(noreplace) %{_sysconfdir}/rpm/macros.ghc-suse +%config %{macros_dir}/macros.ghc +%config %{macros_dir}/macros.ghc-suse %{_prefix}/lib/rpm/ghc-deps.sh %{_bindir}/cabal-tweak-dep-ver +%{_bindir}/cabal-tweak-flag + +%files extra +%defattr(-,root,root,-) +%config %{macros_dir}/macros.ghc-extra %changelog ++++++ _service ++++++ <services> <service name="download_files" mode="localonly"/></services> ++++++ buildService.patch ++++++ --- /var/tmp/diff_new_pack.K8vxqz/_old 2013-08-01 15:33:22.000000000 +0200 +++ /var/tmp/diff_new_pack.K8vxqz/_new 2013-08-01 15:33:22.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Nur 0.95.1/ghc-rpm-macros.ghc 0.95.1-suse-packaging/ghc-rpm-macros.ghc ---- 0.95.1/ghc-rpm-macros.ghc 2012-06-24 11:03:15.000000000 +0200 -+++ 0.95.1-suse-packaging/ghc-rpm-macros.ghc 2012-06-24 11:30:57.000000000 +0200 -@@ -21,13 +21,14 @@ +Index: ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc +=================================================================== +--- ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.orig/ghc-rpm-macros.ghc ++++ ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc +@@ -21,13 +21,14 @@ fi # configure %cabal_configure\ %ghc_check_bootstrap\ @@ -18,82 +19,12 @@ # libraries doc dir %ghclibdocdir %{ghcdocbasedir}/libraries # top library dir -@@ -50,19 +51,19 @@ - %endif\ - %if %{defined ghc_without_shared}\ - if [ "%{name}" = "%{basepkg}" -o -n "%{?1}" ]; then\ -- if [ -d "%{buildroot}%{_docdir}/%{basepkg}-%{pkgver}" ]; then\ -- mv %{buildroot}%{_docdir}/%{basepkg}-%{pkgver} %{buildroot}%{_docdir}/%{basepkg}-devel-%{pkgver}\ -+ if [ -d "%{buildroot}%{_docdir}/%{basepkg}" ]; then\ -+ mv %{buildroot}%{_docdir}/%{basepkg} %{buildroot}%{_docdir}/%{basepkg}-devel\ - %if %{undefined ghc_exclude_docdir}\ -- echo "%{_docdir}/%{basepkg}-devel-%{version}" >> %{basepkg}-devel.files\ -+ echo "%{_docdir}/%{basepkg}-devel" >> %{basepkg}-devel.files\ - %endif\ - fi\ - fi\ - %endif\ - %if %{undefined ghc_exclude_docdir}\ --if [ -d "%{buildroot}%{_docdir}/%{name}-%{version}" ]; then\ -- echo "%{_docdir}/%{name}-%{version}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\ --elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgnamever}" ]; then\ -- echo "%{_docdir}/ghc-%{pkgnamever}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\ -+if [ -d "%{buildroot}%{_docdir}/%{name}" ]; then\ -+ echo "%{_docdir}/%{name}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\ -+elif [ -d "%{buildroot}%{_docdir}/ghc-%{pkgname}" ]; then\ -+ echo "%{_docdir}/ghc-%{pkgname}" >> %{basepkg}%{?ghc_without_shared:-devel}.files\ - fi\ - %endif\ - echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" >> %{basepkg}-devel.files\ -@@ -109,6 +110,7 @@ - %ghc_shared_files\ - %if %{undefined ghc_without_shared}\ - %files -n %{basepkg} -f %{basepkg}.files\ -+%defattr(-,root,root,-)\ - %{?base_doc_files:%doc %base_doc_files}\ - %endif\ - %{nil} -@@ -129,7 +131,7 @@ - %define basepkg ghc-%{pkgname}\ - %package -n %{basepkg}\ - Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library}\ --Group: System Environment/Libraries\ -+Group: System/Libraries\ - %{?1:Version: %{pkgver}}\ - %{-l:License: %{-l*}}\ - %{?ghc_pkg_obsoletes:Obsoletes: %(echo "%{ghc_pkg_obsoletes}" | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1/g")} -@@ -165,6 +167,7 @@ - - %ghc_devel_files\ - %files -n %{basepkg}-devel -f %{basepkg}-devel.files\ -+%defattr(-,root,root,-)\ - %if %{defined ghc_without_shared}\ - %{?base_doc_files:%doc %base_doc_files}\ - %endif\ -@@ -187,7 +190,7 @@ - %define basepkg ghc-%{pkgname}\ - %package -n %{basepkg}-devel\ - Summary: %{?common_summary}%{!?common_summary:Haskell %{pkgname} library} development files\ --Group: Development/Libraries\ -+Group: Development/Libraries/Other\ - %{?1:Version: %{pkgver}}\ - %{-l:License: %{-l*}}\ - %{?ghc_devel_requires}\ -@@ -196,8 +199,6 @@ - %{-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}\ --Obsoletes: %{basepkg}-prof < %{pkgver}-%{release}\ - %if %{undefined without_prof}\ - Provides: %{basepkg}-prof = %{pkgver}-%{release}\ - %endif -@@ -249,7 +250,7 @@ +@@ -100,7 +101,7 @@ find %{buildroot} -type f -exec sh -c "f # 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:--disable-library-for-ghci}\ -+%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1} %{!?ghc_with_lib_for_ghci:--disable-library-for-ghci}\ +-%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} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ %cabal build\ %{nil} ++++++ fix-gen-filelists.patch ++++++ Index: ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc =================================================================== --- ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa.orig/ghc-rpm-macros.ghc +++ ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc @@ -44,7 +44,7 @@ fi %define docdir %{ghclibdocdir}/%{pkgname}\ rm -f %{basepkg}.files %{basepkg}-devel.files\ if [ -d "%{buildroot}%{pkgdir}" ]; then\ -echo "%dir %{pkgdir}" >> %{basepkg}.files\ +echo "%%dir %{pkgdir}" >> %{basepkg}.files\ %if %{undefined ghc_without_shared}\ echo "%attr(755,root,root) %{pkgdir}/libHS%{pkgnamever}-ghc%{ghc_version}.so" >> %{basepkg}.files\ %endif\ ++++++ suse-disable-debug-packages.patch ++++++ --- /var/tmp/diff_new_pack.K8vxqz/_old 2013-08-01 15:33:22.000000000 +0200 +++ /var/tmp/diff_new_pack.K8vxqz/_new 2013-08-01 15:33:22.000000000 +0200 @@ -1,8 +1,8 @@ -Index: ghc-rpm-macros/ghc-rpm-macros.ghc +Index: ghc-rpm-macros-237337a6c6b3299bc6a437446c7f17136fc67ffa/ghc-rpm-macros.ghc =================================================================== ---- ghc-rpm-macros.orig/ghc-rpm-macros.ghc -+++ ghc-rpm-macros/ghc-rpm-macros.ghc -@@ -241,15 +241,26 @@ This package contains the development fi +--- 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 @@ -16,7 +16,6 @@ +echo "/usr/src/debug" > debugsources.list\ +mkdir -p $RPM_BUILD_ROOT/usr/src/debug + -+ # ghc_bin_build %ghc_bin_build\ -%global debug_package %{nil}\ @@ -28,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} %{!?ghc_with_lib_for_ghci:--disable-library-for-ghci}\ + %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 build\ %{nil} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
