subject:"commit ghc\-rpm\-macros for openSUSE\:Factory"

commit ghc-rpm-macros for openSUSE:Factory

2020-05-11 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2020-05-11 13:36:12

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new.2738 (New)


Package is "ghc-rpm-macros"

Mon May 11 13:36:12 2020 rev:40 rq:801051 version:1.9.95

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2020-01-03 17:36:08.483269701 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new.2738/ghc-rpm-macros.changes  
2020-05-11 13:36:28.136503187 +0200
@@ -1,0 +2,5 @@
+Thu May  7 07:48:19 UTC 2020 - Peter Simons 
+
+- Update to version 1.9.95.
+
+---

Old:

  ghc-rpm-macros-1.9.90.tar.xz

New:

  ghc-rpm-macros-1.9.95.tar.xz



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.mA4ME5/_old  2020-05-11 13:36:28.824504630 +0200
+++ /var/tmp/diff_new_pack.mA4ME5/_new  2020-05-11 13:36:28.824504630 +0200
@@ -15,15 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%if 0%{?suse_version} <= 1320
-%global license doc
-%endif
-
 
 %global macros_dir %{_sysconfdir}/rpm
 %global without_hscolour 1
 Name:   ghc-rpm-macros
-Version:1.9.90
+Version:1.9.95
 Release:0
 Summary:RPM Macros for building packages for GHC
 License:GPL-3.0-or-later
@@ -78,10 +74,6 @@
 install -p -D -m 0644 ghc.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
 install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
 install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs
-%if 0%{?suse_version} <= 1320
-install -d -D -m 0755 %{buildroot}%{_datadir}/licenses
-%endif
-
 
 %files
 %doc AUTHORS
@@ -97,9 +89,6 @@
 %{_prefix}/lib/rpm/ghc-dirs.sh
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/Setup.hs
-%if 0%{?suse_version} <= 1320
-%dir %{_datadir}/licenses
-%endif
 
 %files extra
 %config %{macros_dir}/macros.ghc-extra

++ ghc-rpm-macros-1.9.90.tar.xz -> ghc-rpm-macros-1.9.95.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.9.90/macros.ghc 
new/ghc-rpm-macros-1.9.95/macros.ghc
--- old/ghc-rpm-macros-1.9.90/macros.ghc2019-12-21 14:32:49.370616082 
+0100
+++ new/ghc-rpm-macros-1.9.95/macros.ghc2020-01-07 15:05:11.902288793 
+0100
@@ -78,12 +78,12 @@
 %else\
 echo "%%dir ${pkgdir}" >> %{basepkg}.files\
 %if %{undefined ghc_without_shared}\
-echo "%%attr(755,root,root) ${pkgdir}/libHS*-*ghc%{ghc_version}.so" >> 
%{basepkg}.files\
+echo "${pkgdir}/libHS*-*ghc%{ghc_version}.so" >> %{basepkg}.files\
 %endif\
 find %{buildroot}${pkgdir} -mindepth 1 -type d | sed "s/^/%dir /" >> 
%{basepkg}-devel.files\
 find %{buildroot}${pkgdir} ! \\( -type d -o -name "libHS*.so" \\) >> 
%{basepkg}-devel.files\
 %endif\
-echo "%%attr(755,root,root) 
%{?_ghcdynlibdir}%{!?_ghcdynlibdir:${pkgdir}}/libHS%{pkgnamever}-*ghc%{ghc_version}.so"
 >> %{basepkg}.files\
+echo 
"%%{?_ghcdynlibdir}%{!?_ghcdynlibdir:${pkgdir}}/libHS%{pkgnamever}-*ghc%{ghc_version}.so"
 >> %{basepkg}.files\
 fi\
 if [ -d "%{buildroot}%{docdir}" ]; then\
 echo "%{docdir}" >> %{basepkg}-devel.files\
@@ -97,7 +97,9 @@
 if [ -f "$i" ]; then\
 sed -i -e "s!%{buildroot}!!g" $i\
 fi\
-done\
+done\ 
+sort < %{basepkg}-devel.files | uniq > %{basepkg}-devel.filesx\
+mv %{basepkg}-devel.filesx %{basepkg}-devel.files\
 %{nil}

commit ghc-rpm-macros for openSUSE:Factory

2020-01-03 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2020-01-03 17:35:45

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new.6675 (New)


Package is "ghc-rpm-macros"

Fri Jan  3 17:35:45 2020 rev:39 rq:760297 version:1.9.90

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2019-12-30 12:34:45.983802441 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new.6675/ghc-rpm-macros.changes  
2020-01-03 17:36:08.483269701 +0100
@@ -1,0 +2,6 @@
+Mon Dec 30 20:05:43 UTC 2019 - Ondřej Súkup 
+
+- add workaround for license
+  needed for work on ppc64 ghc compiler
+
+---



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.2W3sfe/_old  2020-01-03 17:36:08.851269890 +0100
+++ /var/tmp/diff_new_pack.2W3sfe/_new  2020-01-03 17:36:08.855269892 +0100
@@ -15,6 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%if 0%{?suse_version} <= 1320
+%global license doc
+%endif
+
 
 %global macros_dir %{_sysconfdir}/rpm
 %global without_hscolour 1
@@ -74,6 +78,10 @@
 install -p -D -m 0644 ghc.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
 install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
 install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs
+%if 0%{?suse_version} <= 1320
+install -d -D -m 0755 %{buildroot}%{_datadir}/licenses
+%endif
+
 
 %files
 %doc AUTHORS
@@ -89,6 +97,9 @@
 %{_prefix}/lib/rpm/ghc-dirs.sh
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/Setup.hs
+%if 0%{?suse_version} <= 1320
+%dir %{_datadir}/licenses
+%endif
 
 %files extra
 %config %{macros_dir}/macros.ghc-extra

commit ghc-rpm-macros for openSUSE:Factory

2019-12-30 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2019-12-30 12:34:38

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new.6675 (New)


Package is "ghc-rpm-macros"

Mon Dec 30 12:34:38 2019 rev:38 rq:759906 version:1.9.90

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2018-07-21 10:22:57.102990350 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new.6675/ghc-rpm-macros.changes  
2019-12-30 12:34:45.983802441 +0100
@@ -1,0 +2,8 @@
+Fri Dec 20 07:44:37 UTC 2019 - Ondřej Súkup 
+
+- update to 1.9.90
+ * backport upstream changes
+ * workaround for packages without Setup.hs file
+ - drop no-selfbootstrap-check.patch
+
+---

Old:

  ghc-rpm-macros-1.7.4.tar.xz
  no-selfbootstrap-check.patch

New:

  ghc-rpm-macros-1.9.90.tar.xz



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.HNp7F9/_old  2019-12-30 12:34:46.595802769 +0100
+++ /var/tmp/diff_new_pack.HNp7F9/_new  2019-12-30 12:34:46.595802769 +0100
@@ -19,7 +19,7 @@
 %global macros_dir %{_sysconfdir}/rpm
 %global without_hscolour 1
 Name:   ghc-rpm-macros
-Version:1.7.4
+Version:1.9.90
 Release:0
 Summary:RPM Macros for building packages for GHC
 License:GPL-3.0-or-later
@@ -27,10 +27,8 @@
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 # source gets updated with osc service dr
 Source0:%{name}-%{version}.tar.xz
-Patch:  no-selfbootstrap-check.patch
 BuildRequires:  xz
 Requires:   rpm
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildArch:  noarch
 %if %{undefined without_hscolour}
 Requires:   hscolour
@@ -60,7 +58,6 @@
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 echo no build stage needed
@@ -76,9 +73,7 @@
 install -p -D -m 0755 ghc-pkg-wrapper 
%{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper
 install -p -D -m 0644 ghc.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
 install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
-%if 0%{?suse_version} <= 1320
-install -d -D -m 0755 %{buildroot}%{_datadir}/licenses
-%endif
+install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs
 
 %files
 %doc AUTHORS
@@ -92,11 +87,8 @@
 %{_prefix}/lib/rpm/ghc-pkg-wrapper
 %{_prefix}/lib/rpm/fileattrs/ghc.attr
 %{_prefix}/lib/rpm/ghc-dirs.sh
-# With 1.7.4 of ghc-rpm-macros license files are installed here
-# but rpm does not own this directory on older openSUSE.
-%if 0%{?suse_version} <= 1320
-%dir %{_datadir}/licenses
-%endif
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/Setup.hs
 
 %files extra
 %config %{macros_dir}/macros.ghc-extra

++ ghc-rpm-macros-1.7.4.tar.xz -> ghc-rpm-macros-1.9.90.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.7.4/Setup.hs 
new/ghc-rpm-macros-1.9.90/Setup.hs
--- old/ghc-rpm-macros-1.7.4/Setup.hs   1970-01-01 01:00:00.0 +0100
+++ new/ghc-rpm-macros-1.9.90/Setup.hs  2019-09-19 10:57:34.749926669 +0200
@@ -0,0 +1,3 @@
+import Distribution.Simple
+
+main = defaultMain
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.7.4/ghc-deps.sh 
new/ghc-rpm-macros-1.9.90/ghc-deps.sh
--- old/ghc-rpm-macros-1.7.4/ghc-deps.sh2018-04-17 21:52:07.173717212 
+0200
+++ new/ghc-rpm-macros-1.9.90/ghc-deps.sh   2019-12-19 16:06:33.204054633 
+0100
@@ -23,30 +23,19 @@
 ghc_ver=$(basename $pkgbasedir | sed -e s/ghc-//)
 
 files=$(cat)
-#cabal_ver=$(ghc-pkg --global --simple-output list Cabal | sed -e "s/Cabal-//")
 
-declare -a exclude_dep
-all_files=$(ls $pkgconfdir/*)
-for x in $all_files; do
-if grep -q 'name: z-.*-z-.*' $x; then
-exclude_dep+=($(sed -rn '/id: /s/id: (.*)/\1/ p' <$x))
-fi
-done
 
 for i in $files; do
 case $i in
 # exclude builtin_rts.conf
 $pkgconfdir/*-*.conf)
-id=$(grep "id: " $i | sed -e "s/id: //")
-ids=$($ghc_pkg field $id $field | sed -e "s/rts//" -e 
"s/bin-package-db-[^ ]\+//")
-
+name=$(grep "^name: " $i | sed -e "s/name: //")
+ids=$($ghc_pkg field $name $field | sed -e "s/rts//" -e 
"s/bin-package-db-[^ ]\+//")
 for d in $ids; do
-if [[ ! " ${exclude_dep[@]} " =~ " ${d} " ]]; then
-case $d in
+case $d in
 *-*) echo "ghc-devel($d)" ;;
 *) ;;
-esac
-fi
+esac
 done
 ;;
 *) ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'

commit ghc-rpm-macros for openSUSE:Factory

2018-07-21 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2018-07-21 10:22:55

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New)


Package is "ghc-rpm-macros"

Sat Jul 21 10:22:55 2018 rev:37 rq:623848 version:1.7.4

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2018-06-05 12:52:46.189949519 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2018-07-21 10:22:57.102990350 +0200
@@ -1,0 +2,6 @@
+Wed Jul 18 14:26:39 UTC 2018 - psim...@suse.com
+
+- Cosmetic: replace tabs with blanks, strip trailing white space,
+  and update copyright headers with spec-cleaner.
+
+---
@@ -622 +627,0 @@
-



Other differences:
--

commit ghc-rpm-macros for openSUSE:Factory

2018-06-05 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2018-06-05 12:52:45

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New)


Package is "ghc-rpm-macros"

Tue Jun  5 12:52:45 2018 rev:36 rq:614000 version:1.7.4

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2018-05-30 12:27:04.462760104 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2018-06-05 12:52:46.189949519 +0200
@@ -1,0 +2,12 @@
+Sun May 27 17:22:21 UTC 2018 - ptromm...@icloud.com
+
+- own license directory on older openSUSE 
+
+---
+Fri May  4 06:59:22 UTC 2018 - ptromm...@icloud.com
+
+- add no-selfbootstrap-check.patch
+* GHC's ABI is stable now so a selfbootstrapped compiler is
+  no longer needed 
+
+---

New:

  no-selfbootstrap-check.patch



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.Q6jldz/_old  2018-06-05 12:52:46.901923441 +0200
+++ /var/tmp/diff_new_pack.Q6jldz/_new  2018-06-05 12:52:46.905923295 +0200
@@ -27,6 +27,7 @@
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 # source gets updated with osc service dr
 Source0:%{name}-%{version}.tar.xz
+Patch:  no-selfbootstrap-check.patch
 BuildRequires:  xz
 Requires:   rpm
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -59,6 +60,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 echo no build stage needed
@@ -74,6 +76,9 @@
 install -p -D -m 0755 ghc-pkg-wrapper 
%{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper
 install -p -D -m 0644 ghc.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
 install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
+%if 0%{?suse_version} <= 1320
+install -d -D -m 0755 %{buildroot}%{_datadir}/licenses
+%endif
 
 %files
 %doc AUTHORS
@@ -87,6 +92,11 @@
 %{_prefix}/lib/rpm/ghc-pkg-wrapper
 %{_prefix}/lib/rpm/fileattrs/ghc.attr
 %{_prefix}/lib/rpm/ghc-dirs.sh
+# With 1.7.4 of ghc-rpm-macros license files are installed here
+# but rpm does not own this directory on older openSUSE.
+%if 0%{?suse_version} <= 1320
+%dir %{_datadir}/licenses
+%endif
 
 %files extra
 %config %{macros_dir}/macros.ghc-extra

++ no-selfbootstrap-check.patch ++
Index: ghc-rpm-macros-1.7.4/macros.ghc
===
--- ghc-rpm-macros-1.7.4.orig/macros.ghc
+++ ghc-rpm-macros-1.7.4/macros.ghc
@@ -9,25 +9,11 @@ LANG=en_US.utf8\
 # compiler version
 %ghc_version %{!?ghc_version_override:%(ghc 
--numeric-version)}%{?ghc_version_override}
 
-# check ghc version was rebuilt against self
-%ghc_check_bootstrap\
-if [ ! "$(ghc --info | grep \\"Booter\\ version\\",\\"%{ghc_version}\\")" ]; 
then\
-  echo "Warning: this ghc build is not self-bootstrapped."\
-%if %{undefined ghc_bootstrapping}\
-  echo "The ghc package should be rebuilt against its current version before\
-proceeding, to avoid dependency ABI breakage from a future ghc rebuild."\
-  echo "To override set ghc_bootstrapping."\
-  echo "Aborting."\
-  exit 1\
-%endif\
-fi
-
 # no _pkgdocdir in openSUSE
 %_pkgdocdir %{_docdir}/%{name}
 
 # configure
 %cabal_configure\
-%ghc_check_bootstrap\
 %global _hardened_ldflags %{nil}\
 %cabal --version\
 %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} 
--docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' 
--ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} 
%{?with_tests:--enable-tests} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed 
-e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')}" 
%{?cabal_configure_options} $cabal_configure_extra_options

commit ghc-rpm-macros for openSUSE:Factory

2018-05-30 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2018-05-30 12:12:46

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New)


Package is "ghc-rpm-macros"

Wed May 30 12:12:46 2018 rev:35 rq:607876 version:1.7.4

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2018-04-17 11:15:52.979009358 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2018-05-30 12:27:04.462760104 +0200
@@ -1,0 +2,6 @@
+Wed Apr 18 07:43:30 UTC 2018 - mimi...@gmail.com
+
+- use %license macro
+- simplify dependecy generator
+
+---



Other differences:
--
++ ghc-rpm-macros-1.7.4.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.7.4/ghc-deps.sh 
new/ghc-rpm-macros-1.7.4/ghc-deps.sh
--- old/ghc-rpm-macros-1.7.4/ghc-deps.sh2018-03-19 20:56:05.0 
+0100
+++ new/ghc-rpm-macros-1.7.4/ghc-deps.sh2018-04-17 21:52:07.173717212 
+0200
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 # find rpm provides and requires for Haskell GHC libraries
 
-[ $# -ne 2 ] && echo "Usage: `basename $0` [--provides|--requires] 
%{buildroot}%{ghclibdir}" && exit 1
+[ $# -ne 2 ] && echo "Usage: $(basename $0) [--provides|--requires] 
%{buildroot}%{ghclibdir}" && exit 1
 
 set +x
 
@@ -12,35 +12,43 @@
 ghc_pkg="/usr/lib/rpm/ghc-pkg-wrapper $pkgbasedir"
 
 case $mode in
---provides) field=id ;;
---requires) field=depends ;;
-*) echo "`basename $0`: Need --provides or --requires" ; exit 1
+--provides) field=id ;;
+--requires) field=depends ;;
+*)
+echo "$(basename $0): Need --provides or --requires"
+exit 1
+;;
 esac
 
 ghc_ver=$(basename $pkgbasedir | sed -e s/ghc-//)
 
 files=$(cat)
-
 #cabal_ver=$(ghc-pkg --global --simple-output list Cabal | sed -e "s/Cabal-//")
 
+declare -a exclude_dep
+all_files=$(ls $pkgconfdir/*)
+for x in $all_files; do
+if grep -q 'name: z-.*-z-.*' $x; then
+exclude_dep+=($(sed -rn '/id: /s/id: (.*)/\1/ p' <$x))
+fi
+done
+
 for i in $files; do
 case $i in
-# exclude builtin_rts.conf
-   $pkgconfdir/*-*.conf)
-case $ghc_ver in
-8.*) id=$(grep "id: " $i | sed -e "s/id: //") ;;
-*) id=$(echo $i | sed -e "s%$pkgconfdir/%%" -e "s%.conf%%") ;;
-esac
-   ids=$($ghc_pkg field $id $field | sed -e "s/rts//" -e 
"s/bin-package-db-[^ ]\+//")
-
-   for d in $ids; do
-   case $d in
-   *-*) echo "ghc-devel($d)" ;;
-   *) ;;
-   esac
-   done
-   ;;
-*)
-;;
+# exclude builtin_rts.conf
+$pkgconfdir/*-*.conf)
+id=$(grep "id: " $i | sed -e "s/id: //")
+ids=$($ghc_pkg field $id $field | sed -e "s/rts//" -e 
"s/bin-package-db-[^ ]\+//")
+
+for d in $ids; do
+if [[ ! " ${exclude_dep[@]} " =~ " ${d} " ]]; then
+case $d in
+*-*) echo "ghc-devel($d)" ;;
+*) ;;
+esac
+fi
+done
+;;
+*) ;;
 esac
 done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.7.4/ghc-pkg-wrapper 
new/ghc-rpm-macros-1.7.4/ghc-pkg-wrapper
--- old/ghc-rpm-macros-1.7.4/ghc-pkg-wrapper2018-03-22 01:32:29.277955826 
+0100
+++ new/ghc-rpm-macros-1.7.4/ghc-pkg-wrapper2018-04-17 22:03:49.928834806 
+0200
@@ -1,33 +1,21 @@
 #!/bin/sh
 
-[ $# -lt 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghclibdir} ..." && 
exit 1
+[ $# -lt 1 ] && echo "Usage: $(basename $0) %{buildroot}%{ghclibdir} ..." && 
exit 1
 
 set +x
 
-PKGBASEDIR=$1
+PKGBASEDIR=${1}
 shift
-PKGCONFDIR=$PKGBASEDIR/package.conf.d
-GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
+PKGCONFDIR=${PKGBASEDIR}/package.conf.d
+GHC_VER=$(basename ${PKGBASEDIR} | sed -e s/ghc-//)
 
 # for a ghc build use the new ghc-pkg
-INPLACE_GHCPKG=$PKGBASEDIR/../../bin/ghc-pkg-$GHC_VER
+INPLACE_GHCPKG=${PKGBASEDIR}/../../bin/ghc-pkg-${GHC_VER}
 
-if [ -x "$INPLACE_GHCPKG" ]; then
-case $GHC_VER in
-7.4.*)
-GHC_PKG="$PKGBASEDIR/ghc-pkg --global-conf=$PKGCONFDIR"
-;;
-7.6.*)
-GHC_PKG="$PKGBASEDIR/ghc-pkg --global-package-db=$PKGCONFDIR"
-;;
-# 7.8 and 7.10
-*)
-GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
-;;
-esac
+if [ -x "${INPLACE_GHCPKG}" ]; then
+GHC_PKG="${PKGBASEDIR}/bin/ghc-pkg

commit ghc-rpm-macros for openSUSE:Factory

2018-04-17 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2018-04-17 11:15:52

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New)


Package is "ghc-rpm-macros"

Tue Apr 17 11:15:52 2018 rev:34 rq:590693 version:1.7.4

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2017-07-24 12:33:17.074217980 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2018-04-17 11:15:52.979009358 +0200
@@ -1,0 +2,7 @@
+Tue Mar 20 14:03:36 UTC 2018 - mimi...@gmail.com
+
+- update to 1.7.4
+- sync with ustream
+- support sublibraries
+
+---

Old:

  ghc-rpm-macros-1.7.2.tar.xz

New:

  ghc-rpm-macros-1.7.4.tar.xz



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.u7tKiu/_old  2018-04-17 11:15:53.982962285 +0200
+++ /var/tmp/diff_new_pack.u7tKiu/_new  2018-04-17 11:15:53.986962097 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-rpm-macros
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,10 +19,10 @@
 %global macros_dir %{_sysconfdir}/rpm
 %global without_hscolour 1
 Name:   ghc-rpm-macros
-Version:1.7.2
+Version:1.7.4
 Release:0
 Summary:RPM Macros for building packages for GHC
-License:GPL-3.0+
+License:GPL-3.0-or-later
 Group:  Development/Libraries/Other
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 # source gets updated with osc service dr
@@ -76,8 +76,8 @@
 install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%doc AUTHORS
+%license COPYING
 %config %{macros_dir}/macros.ghc
 %config %{macros_dir}/macros.ghc-suse
 %{_prefix}/lib/rpm/ghc-deps.sh
@@ -89,7 +89,6 @@
 %{_prefix}/lib/rpm/ghc-dirs.sh
 
 %files extra
-%defattr(-,root,root,-)
 %config %{macros_dir}/macros.ghc-extra
 
 %changelog

++ ghc-rpm-macros-1.7.2.tar.xz -> ghc-rpm-macros-1.7.4.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.7.2/ghc-deps.sh 
new/ghc-rpm-macros-1.7.4/ghc-deps.sh
--- old/ghc-rpm-macros-1.7.2/ghc-deps.sh2017-07-07 14:16:59.596993740 
+0200
+++ new/ghc-rpm-macros-1.7.4/ghc-deps.sh2018-03-19 20:56:05.0 
+0100
@@ -17,6 +17,8 @@
 *) echo "`basename $0`: Need --provides or --requires" ; exit 1
 esac
 
+ghc_ver=$(basename $pkgbasedir | sed -e s/ghc-//)
+
 files=$(cat)
 
 #cabal_ver=$(ghc-pkg --global --simple-output list Cabal | sed -e "s/Cabal-//")
@@ -25,8 +27,11 @@
 case $i in
 # exclude builtin_rts.conf
$pkgconfdir/*-*.conf)
-   pkgver=$(echo $i | sed -e "s%$pkgconfdir/\(.\+\)-.\+.conf%\1%")
-   ids=$($ghc_pkg field $pkgver $field | sed -e "s/rts//" -e 
"s/bin-package-db-[^ ]\+//")
+case $ghc_ver in
+8.*) id=$(grep "id: " $i | sed -e "s/id: //") ;;
+*) id=$(echo $i | sed -e "s%$pkgconfdir/%%" -e "s%.conf%%") ;;
+esac
+   ids=$($ghc_pkg field $id $field | sed -e "s/rts//" -e 
"s/bin-package-db-[^ ]\+//")
 
for d in $ids; do
case $d in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.7.2/ghc-pkg-wrapper 
new/ghc-rpm-macros-1.7.4/ghc-pkg-wrapper
--- old/ghc-rpm-macros-1.7.2/ghc-pkg-wrapper2017-07-07 14:16:59.576993852 
+0200
+++ new/ghc-rpm-macros-1.7.4/ghc-pkg-wrapper2018-03-22 01:32:29.277955826 
+0100
@@ -29,4 +29,5 @@
 GHC_PKG="/usr/bin/ghc-pkg-${GHC_VER} -f $PKGCONFDIR"
 fi
 
+#todo
 $GHC_PKG -v0 --simple-output --global $* | uniq
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.7.2/macros.ghc 
new/ghc-rpm-macros-1.7.4/macros.ghc
--- old/ghc-rpm-macros-1.7.2/macros.ghc 2017-07-12 12:08:02.187853889 +0200
+++ new/ghc-rpm-macros-1.7.4/macros.ghc 2018-03-23 10:56:24.631707980 +0100
@@ -29,6 +29,7 @@
 %cabal_configure\
 %ghc_check_bootstrap\
 %global _hardened_ldflags %{nil}\
+%cabal --version\
 %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} 
--docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' 
--ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} 
%{?with_tests:--enable-tests} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed

commit ghc-rpm-macros for openSUSE:Factory

2017-07-24 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2017-07-24 12:33:13

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New)


Package is "ghc-rpm-macros"

Mon Jul 24 12:33:13 2017 rev:33 rq:511989 version:1.7.2

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2017-05-31 12:20:00.534141415 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2017-07-24 12:33:17.074217980 +0200
@@ -1,0 +2,7 @@
+Fri Jul 14 14:23:54 UTC 2017 - mimi...@gmail.com
+
+- update to 1.7.2
+- disabled smp build -- it brokes reproduciblity of haskell packages
+   * reported by bwiedem...@suse.com
+
+---

Old:

  ghc-rpm-macros-1.7.1.tar.xz

New:

  ghc-rpm-macros-1.7.2.tar.xz



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.hy9CdM/_old  2017-07-24 12:33:17.654136118 +0200
+++ /var/tmp/diff_new_pack.hy9CdM/_new  2017-07-24 12:33:17.658135553 +0200
@@ -19,13 +19,13 @@
 %global macros_dir %{_sysconfdir}/rpm
 %global without_hscolour 1
 Name:   ghc-rpm-macros
-Version:1.7.1
+Version:1.7.2
 Release:0
 Summary:RPM Macros for building packages for GHC
 License:GPL-3.0+
 Group:  Development/Libraries/Other
 Url:https://fedoraproject.org/wiki/Haskell_SIG
-# source prepared manually from github.com/opensuse-haskell/ghc-rpm-macros
+# source gets updated with osc service dr
 Source0:%{name}-%{version}.tar.xz
 BuildRequires:  xz
 Requires:   rpm

++ ghc-rpm-macros-1.7.1.tar.xz -> ghc-rpm-macros-1.7.2.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.7.1/macros.ghc 
new/ghc-rpm-macros-1.7.2/macros.ghc
--- old/ghc-rpm-macros-1.7.1/macros.ghc 2017-05-28 12:19:32.878046958 +0200
+++ new/ghc-rpm-macros-1.7.2/macros.ghc 2017-07-12 12:08:02.187853889 +0200
@@ -67,6 +67,8 @@
 
 %Cabal_version %(ghc-pkg --global --simple-output list Cabal | sed -e 
"s/Cabal-//")
 
+%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
+
 # ghc_gen_filelists [name] [version]
 %ghc_gen_filelists()\
 %define pkgname %{?1}%{!?1:%{pkg_name}}\
@@ -91,7 +93,7 @@
 echo "%{docdir}" >> %{basepkg}-devel.files\
 fi\
 %if 0%{?1:1}\
-for i in $(ls 
%{buildroot}%{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}/%{!?1:%{name}}%{?1:%{basepkg}});
 do\
+for i in $(ls %{buildroot}%{_ghclicensedir}/%{!?1:%{name}}%{?1:%{basepkg}}); 
do\
 echo "%%license %{?1:%{pkgnamever}/}$i" >> %{basepkg}.files\
 done\
 %endif\
@@ -115,13 +117,13 @@
 # ghc_bin_build
 %ghc_bin_build\
 %cabal_configure\
-%cabal build %{_smp_mflags} %{?cabal_build_options}
+%cabal build %{?ghc_smp_mflags} %{?cabal_build_options}
 
 # 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} 
%{?ghc_without_shared:--disable-shared} 
%{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} 
%{?1:--docdir=%{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}/ghc-%1%{!?fedora:-%2}
 --htmldir=%{ghclibdocdir}/%1-%2} 
%{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} 
%{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
-%cabal build %{_smp_mflags} %{?cabal_build_options}\
+%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} 
%{?ghc_without_shared:--disable-shared} 
%{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} 
%{?1:--docdir=%{_ghclicensedir}/ghc-%1%{!?fedora:-%2} 
--htmldir=%{ghclibdocdir}/%1-%2} 
%{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} 
%{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
+%cabal build %{?ghc_smp_mflags} %{?cabal_build_options}\
 %{nil}
 
 # ghc_lib_build [name] [version]

commit ghc-rpm-macros for openSUSE:Factory

2017-05-31 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2017-05-31 12:19:07

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New)


Package is "ghc-rpm-macros"

Wed May 31 12:19:07 2017 rev:32 rq:498959 version:1.7.1

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2017-02-28 23:50:54.330427913 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2017-05-31 12:20:00.534141415 +0200
@@ -1,0 +2,6 @@
+Mon May 29 06:43:58 UTC 2017 - mimi...@gmail.com
+
+- update to 1.7.1
+- sync with upstream
+
+---

Old:

  ghc-rpm-macros-1.6.95.tar.xz

New:

  ghc-rpm-macros-1.7.1.tar.xz



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.iNVWaD/_old  2017-05-31 12:20:01.398019466 +0200
+++ /var/tmp/diff_new_pack.iNVWaD/_new  2017-05-31 12:20:01.402018901 +0200
@@ -18,28 +18,23 @@
 
 %global macros_dir %{_sysconfdir}/rpm
 %global without_hscolour 1
-
 Name:   ghc-rpm-macros
-Version:1.6.95
+Version:1.7.1
 Release:0
-BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC
 License:GPL-3.0+
 Group:  Development/Libraries/Other
-
 Url:https://fedoraproject.org/wiki/Haskell_SIG
-
 # source prepared manually from github.com/opensuse-haskell/ghc-rpm-macros
 Source0:%{name}-%{version}.tar.xz
-
 BuildRequires:  xz
 Requires:   rpm
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+BuildArch:  noarch
 %if %{undefined without_hscolour}
 Requires:   hscolour
 %endif
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-
 %description
 A set of macros for building GHC packages following the openSUSE
 Haskell Guidelines.  ghc needs to be installed in
@@ -63,7 +58,7 @@
 Macros used when generating source Haskell rpm packages.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
 echo no build stage needed
@@ -74,6 +69,7 @@
 install -p -D -m 0644 macros.ghc-suse 
%{buildroot}/%{macros_dir}/macros.ghc-suse
 install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
 install -p -D -m 0755 cabal-tweak-dep-ver 
%{buildroot}/%{_bindir}/cabal-tweak-dep-ver
+install -p -D -m 0755 cabal-tweak-drop-dep 
%{buildroot}/%{_bindir}/cabal-tweak-drop-dep
 install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag
 install -p -D -m 0755 ghc-pkg-wrapper 
%{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper
 install -p -D -m 0644 ghc.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
@@ -87,6 +83,7 @@
 %{_prefix}/lib/rpm/ghc-deps.sh
 %{_bindir}/cabal-tweak-dep-ver
 %{_bindir}/cabal-tweak-flag
+%{_bindir}/cabal-tweak-drop-dep
 %{_prefix}/lib/rpm/ghc-pkg-wrapper
 %{_prefix}/lib/rpm/fileattrs/ghc.attr
 %{_prefix}/lib/rpm/ghc-dirs.sh

++ ghc-rpm-macros-1.6.95.tar.xz -> ghc-rpm-macros-1.7.1.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.6.95/README 
new/ghc-rpm-macros-1.7.1/README
--- old/ghc-rpm-macros-1.6.95/README2016-12-19 09:57:45.0 +0100
+++ new/ghc-rpm-macros-1.7.1/README 2017-05-28 12:18:49.801151295 +0200
@@ -1,4 +1,7 @@
-This repo is used for latest rpm packaging of ghc and Haskell packages.
+This repo is used for the latest development rpm packaging of ghc and
+Haskell packages.
 
-It is used for experimental packaging for new versions of ghc
-and as upstream to Fedora and OpenSUSE Haskell packaging.
+It is used for packaging for new versions of ghc
+and as an upstream for Fedora and OpenSUSE Haskell packaging.
+
+The aim now is to make it work across multiple ghc versions.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.6.95/cabal-tweak-drop-dep 
new/ghc-rpm-macros-1.7.1/cabal-tweak-drop-dep
--- old/ghc-rpm-macros-1.6.95/cabal-tweak-drop-dep  1970-01-01 
01:00:00.0 +0100
+++ new/ghc-rpm-macros-1.7.1/cabal-tweak-drop-dep   2017-05-28 
12:16:53.830745496 +0200
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e +x
+
+USAGE="Usage: $0 dep"
+
+if [ $# -ne 1 ]; then
+echo "$USAGE"
+exit 1
+fi
+
+DEP=$1
+
+CABALFILE=$(ls *.cabal)
+
+if [ $(echo $CABALFILE | wc -w) -ne 1 ]; then
+   echo "There needs to be one .cabal file in the current dir!"
+   exit 1
+fi
+
+if [ ! -f $CABALFILE.orig ]; then
+BACKUP=.orig
+fi
+
+if grep $DEP $CABALFILE | sed -e "s/$DEP//" | grep -q -e "[A-Za-z]"; then
+echo "$0: deleting whole $DEP lines not safe - try more precise pattern"
+exit 1
+fi
+
+sed -i$BACKUP

commit ghc-rpm-macros for openSUSE:Factory

2017-02-28 Thread root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2017-02-28 23:50:53

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New)


Package is "ghc-rpm-macros"

Tue Feb 28 23:50:53 2017 rev:31 rq:459982 version:1.6.95

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2016-10-19 13:14:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2017-02-28 23:50:54.330427913 +0100
@@ -1,0 +2,7 @@
+Fri Jan 20 08:39:08 UTC 2017 - mimi...@gmail.com
+
+- update to 1.6.95
+- sync with upstream
+* fix compatibility with cabal 1.24.1.0 and 1.24.2.0
+
+---

Old:

  ghc-rpm-macros-1.6.91.tar.bz2

New:

  ghc-rpm-macros-1.6.95.tar.xz



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.4ZqZ81/_old  2017-02-28 23:50:55.034328562 +0100
+++ /var/tmp/diff_new_pack.4ZqZ81/_new  2017-02-28 23:50:55.038327997 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-rpm-macros
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.6.91
+Version:1.6.95
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC
@@ -30,9 +30,9 @@
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 
 # source prepared manually from github.com/opensuse-haskell/ghc-rpm-macros
-Source0:%{name}-%{version}.tar.bz2
+Source0:%{name}-%{version}.tar.xz
 
-BuildRequires:  bzip2
+BuildRequires:  xz
 Requires:   rpm
 %if %{undefined without_hscolour}
 Requires:   hscolour
@@ -77,6 +77,7 @@
 install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag
 install -p -D -m 0755 ghc-pkg-wrapper 
%{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper
 install -p -D -m 0644 ghc.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
+install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh
 
 %files
 %defattr(-,root,root,-)
@@ -88,6 +89,7 @@
 %{_bindir}/cabal-tweak-flag
 %{_prefix}/lib/rpm/ghc-pkg-wrapper
 %{_prefix}/lib/rpm/fileattrs/ghc.attr
+%{_prefix}/lib/rpm/ghc-dirs.sh
 
 %files extra
 %defattr(-,root,root,-)

commit ghc-rpm-macros for openSUSE:Factory

2016-10-19 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2016-10-19 13:13:59

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
2016-07-21 08:06:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2016-10-19 13:14:43.0 +0200
@@ -2 +2 @@
-Sun Jul 17 07:32:26 UTC 2016 - mimi...@gmail.com
+Fri Oct 14 12:32:13 UTC 2016 - mimi...@gmail.com
@@ -4,2 +4,5 @@
-- update to 1.5.4
-* support SMP in build phase
+- sync with upstream
+- ghc-pkg-wrapper is now quiet with simple output
+- new ghc_fix_rpath macro deprecates ghc_fix_dynamic_rpath
+- ghc_lib_subpackage now takes name-version
+- new ghc_libs_build and ghc_libs_install extra macros
@@ -8 +11,7 @@
-Tue Jun 28 14:24:31 UTC 2016 - mimi...@gmail.com
+Sat Jul 16 16:39:32 UTC 2016 - mimi...@gmail.com
+
+- update to 1.6.91 
+* support multiple jobs during build and configure phase
+
+---
+Tue Jun 28 11:22:46 UTC 2016 - mimi...@gmail.com
@@ -13,0 +23,11 @@
+Wed Jun 22 14:38:28 UTC 2016 - mimi...@gmail.com
+
+- update to 1.6.90
+* %ghc_gen_filelists: uniq keyname to prevent build failure for installed 
version
+
+---
+Sat May 28 15:48:31 UTC 2016 - peter.tromm...@ohm-hochschule.de
+
+- doc dir contains ghc version, now incompactible with ghc 7.10
+
+---
@@ -16 +36 @@
-- Incerase verbosity of configure and build macros
+- Increase verbosity of configure and build macros

Old:

  ghc-rpm-macros-1.5.4.tar.bz2

New:

  ghc-rpm-macros-1.6.91.tar.bz2



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.5nKHJD/_old  2016-10-19 13:14:45.0 +0200
+++ /var/tmp/diff_new_pack.5nKHJD/_new  2016-10-19 13:14:45.0 +0200
@@ -20,7 +20,7 @@
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.5.4
+Version:1.6.91
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC

++ ghc-rpm-macros-1.5.4.tar.bz2 -> ghc-rpm-macros-1.6.91.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.5.4/ghc-deps.sh 
new/ghc-rpm-macros-1.6.91/ghc-deps.sh
--- old/ghc-rpm-macros-1.5.4/ghc-deps.sh2016-06-22 14:32:48.0 
+0200
+++ new/ghc-rpm-macros-1.6.91/ghc-deps.sh   2016-10-14 14:08:49.0 
+0200
@@ -22,7 +22,7 @@
 # exclude builtin_rts.conf
$PKGCONFDIR/*-*.conf)
PKGVER=$(echo $i | sed -e "s%$PKGCONFDIR/\(.\+\)-.\+.conf%\1%")
-   OUT=$(/usr/lib/rpm/ghc-pkg-wrapper $PKGBASEDIR field $PKGVER $FIELD 
| sed -e "s/^depends: \+//" -e "s/rts//" -e "s/bin-package-db-[^ ]\+//")
+   OUT=$(/usr/lib/rpm/ghc-pkg-wrapper $PKGBASEDIR field $PKGVER $FIELD 
| sed -e "s/rts//" -e "s/bin-package-db-[^ ]\+//")
for d in $OUT; do
case $d in
*-*) echo "ghc-devel($d)" ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.5.4/ghc-pkg-wrapper 
new/ghc-rpm-macros-1.6.91/ghc-pkg-wrapper
--- old/ghc-rpm-macros-1.5.4/ghc-pkg-wrapper2016-06-22 14:32:48.0 
+0200
+++ new/ghc-rpm-macros-1.6.91/ghc-pkg-wrapper   2016-10-14 14:08:49.0 
+0200
@@ -29,4 +29,4 @@
 GHC_PKG="/usr/bin/ghc-pkg-${GHC_VER} -f $PKGCONFDIR"
 fi
 
-$GHC_PKG --global $*
+$GHC_PKG -v0 --simple-output --global $*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.5.4/ghc-rpm-macros.spec 
new/ghc-rpm-macros-1.6.91/ghc-rpm-macros.spec
--- old/ghc-rpm-macros-1.5.4/ghc-rpm-macros.spec1970-01-01 
01:00:00.0 +0100
+++ new/ghc-rpm-macros-1.6.91/ghc-rpm-macros.spec   2016-10-14 
14:08:49.0 +0200
@@ -0,0 +1,834 @@
+%global debug_package %{nil}
+
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%global macros_dir %{_rpmconfigdir}/macros.d
+%else
+%global macros_dir %{_sysconfdir}/rpm
+%endif
+
+# uncomment to bootstrap without hscolour
+#%%global without_hscolour 1
+
+Name:   ghc-rpm-macros
+Version:1.6.91
+Release:1%{?dist}
+Summary:RPM macros for building packages for GHC
+
+License:GPLv3+
+URL:https://github.com/fedora-haskell/ghc-rpm-macros
+# Currently source is only in git but tarballs could be made if it helps
+Source0:

commit ghc-rpm-macros for openSUSE:Factory

2016-07-21 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2016-07-21 08:06:33

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
2016-07-01 10:00:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2016-07-21 08:06:36.0 +0200
@@ -1,0 +2,6 @@
+Sun Jul 17 07:32:26 UTC 2016 - mimi...@gmail.com
+
+- update to 1.5.4
+* support SMP in build phase
+
+---

Old:

  ghc-rpm-macros-1.5.3.tar.bz2

New:

  ghc-rpm-macros-1.5.4.tar.bz2



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.pSfAty/_old  2016-07-21 08:06:37.0 +0200
+++ /var/tmp/diff_new_pack.pSfAty/_new  2016-07-21 08:06:37.0 +0200
@@ -20,7 +20,7 @@
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.5.3
+Version:1.5.4
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC

++ ghc-rpm-macros-1.5.3.tar.bz2 -> ghc-rpm-macros-1.5.4.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.5.3/macros.ghc 
new/ghc-rpm-macros-1.5.4/macros.ghc
--- old/ghc-rpm-macros-1.5.3/macros.ghc 2016-06-28 16:19:27.0 +0200
+++ new/ghc-rpm-macros-1.5.4/macros.ghc 2016-07-17 09:11:00.0 +0200
@@ -105,13 +105,13 @@
 %ghc_bin_build\
 %global debug_package %{nil}\
 %cabal_configure\
-%cabal build -v
+%cabal build %{_smp_mflags} %{?cabal_verbose}
 
 # 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} 
%{?ghc_without_shared:--disable-shared} 
%{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} 
%{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} 
%{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
-%cabal build -v\
+%cabal build %{_smp_mflags} %{?cabal_verbose}\
 %{nil}
 
 # ghc_lib_build [name] [version]

commit ghc-rpm-macros for openSUSE:Factory

2016-07-01 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2016-07-01 10:00:45

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
2016-05-29 03:13:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2016-07-01 10:00:47.0 +0200
@@ -1,0 +2,6 @@
+Tue Jun 28 14:24:31 UTC 2016 - mimi...@gmail.com
+
+- new macros.ghc-suse
+- binary packages build statically linked 
+
+---



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.HcP2X4/_old  2016-07-01 10:00:48.0 +0200
+++ /var/tmp/diff_new_pack.HcP2X4/_new  2016-07-01 10:00:48.0 +0200
@@ -71,6 +71,7 @@
 %install
 install -p -D -m 0644 macros.ghc %{buildroot}%{macros_dir}/macros.ghc
 install -p -D -m 0644 macros.ghc-extra 
%{buildroot}/%{macros_dir}/macros.ghc-extra
+install -p -D -m 0644 macros.ghc-suse 
%{buildroot}/%{macros_dir}/macros.ghc-suse
 install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
 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
@@ -81,6 +82,7 @@
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %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

++ ghc-rpm-macros-1.5.3.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.5.3/ghc-rpm-macros.spec 
new/ghc-rpm-macros-1.5.3/ghc-rpm-macros.spec
--- old/ghc-rpm-macros-1.5.3/ghc-rpm-macros.spec2016-03-17 
10:32:25.0 +0100
+++ new/ghc-rpm-macros-1.5.3/ghc-rpm-macros.spec1970-01-01 
01:00:00.0 +0100
@@ -1,822 +0,0 @@
-%global debug_package %{nil}
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%global macros_dir %{_rpmconfigdir}/macros.d
-%else
-%global macros_dir %{_sysconfdir}/rpm
-%endif
-
-# uncomment to bootstrap without hscolour
-#%%global without_hscolour 1
-
-Name:   ghc-rpm-macros
-Version:1.5.3
-Release:1%{?dist}
-Summary:RPM macros for building packages for GHC
-
-License:GPLv3+
-URL:https://github.com/fedora-haskell/ghc-rpm-macros
-# Currently source is only in git but tarballs could be made if it helps
-Source0:macros.ghc
-Source1:COPYING
-Source2:AUTHORS
-Source3:ghc-deps.sh
-Source4:cabal-tweak-dep-ver
-Source5:cabal-tweak-flag
-Source6:macros.ghc-extra
-Source7:ghc.attr
-Source8:ghc-pkg-wrapper
-Requires:   redhat-rpm-config
-# for ghc_version
-Requires:   ghc-compiler
-%if %{undefined without_hscolour}
-%ifarch %{ix86} %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 
s390x ppc64le aarch64
-Requires:   hscolour
-%endif
-%endif
-
-%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.
-
-
-%package extra
-Summary:Extra RPM macros for building Haskell library subpackages
-Requires:   %{name} = %{version}-%{release}
-
-%description extra
-Extra macros used for subpackaging of Haskell libraries,
-for example in ghc and haskell-platform.
-
-
-%prep
-%setup -c -T
-cp %{SOURCE1} %{SOURCE2} .
-
-
-%build
-echo no build stage needed
-
-
-%install
-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
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-install -p -D -m 0644 %{SOURCE7} 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
-%endif
-
-install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
-install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
-install -p -D -m 0755 %{SOURCE8} 
%{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper
-
-%if 0%{?rhel} && 0%{?rhel} < 7
-cat >> %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh <= 7
-%{_prefix}/lib/rpm/fileattrs/ghc.attr
-%endif
-%{_prefix}/lib/rpm/ghc-deps.sh
-%{_prefix}/lib/rpm/ghc-pkg-wrapper
-%{_bindir}/cabal-tweak-dep-ver
-%{_bindir}/cabal-tweak-flag
-
-
-%files extra
-%{macros_dir}/macros.ghc-extra
-
-
-%changelog
-* Wed Mar  2 2016 Jens Petersen  - 1.5.3-1
--

commit ghc-rpm-macros for openSUSE:Factory

2016-05-28 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2016-05-29 03:12:51

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
2016-03-18 21:42:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2016-05-29 03:13:50.0 +0200
@@ -1,0 +2,5 @@
+Sun May 22 17:55:50 UTC 2016 - mimi...@gmail.com
+
+- Incerase verbosity of configure and build macros
+
+---



Other differences:
--
++ ghc-rpm-macros-1.5.3.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.5.3/macros.ghc 
new/ghc-rpm-macros-1.5.3/macros.ghc
--- old/ghc-rpm-macros-1.5.3/macros.ghc 2016-03-17 10:32:25.0 +0100
+++ new/ghc-rpm-macros-1.5.3/macros.ghc 2016-05-22 19:52:41.0 +0200
@@ -26,7 +26,7 @@
 %cabal_configure\
 %ghc_check_bootstrap\
 %global _hardened_ldflags %{nil}\
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} 
--docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} 
--libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc 
%{!?ghc_without_dynamic:--enable-executable-dynamic} 
%{?with_tests:--enable-tests} %{?cabal_configure_options} 
$cabal_configure_extra_options
+%cabal configure -v --prefix=%{_prefix} --libdir=%{_libdir} 
--docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} 
--libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc 
%{!?ghc_without_dynamic:--enable-executable-dynamic} 
%{?with_tests:--enable-tests} %{?cabal_configure_options} 
$cabal_configure_extra_options
 
 # install
 %cabal_install %cabal copy --destdir=%{buildroot} -v
@@ -34,7 +34,7 @@
 # tests
 %cabal_test\
 %if %{with tests}\
-%cabal test\
+%cabal test -v\
 %endif
 
 # no _pkgdocdir in EPEL <= 7
@@ -105,13 +105,13 @@
 %ghc_bin_build\
 %global debug_package %{nil}\
 %cabal_configure\
-%cabal build
+%cabal build -v
 
 # 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} 
%{?ghc_without_shared:--disable-shared} 
%{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} 
%{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} 
%{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
-%cabal build\
+%cabal build -v\
 %{nil}
 
 # ghc_lib_build [name] [version]

commit ghc-rpm-macros for openSUSE:Factory

2016-03-19 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2016-03-18 21:42:42

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
2016-03-01 09:43:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2016-03-18 21:42:44.0 +0100
@@ -1,0 +2,7 @@
+Thu Mar 17 09:35:35 UTC 2016 - mimi...@gmail.com
+
+- update to 1.5.3
+* ghc_gen_filelists: determine keyname with pkgnamever not just pkgname
+* ghc-deps.sh no longer filter out ghc-prim and integer-gmp
+
+---

Old:

  ghc-rpm-macros-1.5.0.tar.bz2

New:

  ghc-rpm-macros-1.5.3.tar.bz2



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.7zgCLz/_old  2016-03-18 21:42:45.0 +0100
+++ /var/tmp/diff_new_pack.7zgCLz/_new  2016-03-18 21:42:45.0 +0100
@@ -20,7 +20,7 @@
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.5.0
+Version:1.5.3
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC

++ ghc-rpm-macros-1.5.0.tar.bz2 -> ghc-rpm-macros-1.5.3.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.5.0/ghc-deps.sh 
new/ghc-rpm-macros-1.5.3/ghc-deps.sh
--- old/ghc-rpm-macros-1.5.0/ghc-deps.sh2016-02-08 08:59:32.0 
+0100
+++ new/ghc-rpm-macros-1.5.3/ghc-deps.sh2016-03-17 10:32:25.0 
+0100
@@ -22,7 +22,7 @@
 # exclude builtin_rts.conf
$PKGCONFDIR/*-*.conf)
PKGVER=$(echo $i | sed -e "s%$PKGCONFDIR/\(.\+\)-.\+.conf%\1%")
-   OUT=$(/usr/lib/rpm/ghc-pkg-wrapper $PKGBASEDIR field $PKGVER $FIELD 
| sed -e "s/^depends: \+//" -e "s/rts//" -e 
"s/\(bin-package-db\|ghc-prim\|integer-gmp\)-[^ ]\+//")
+   OUT=$(/usr/lib/rpm/ghc-pkg-wrapper $PKGBASEDIR field $PKGVER $FIELD 
| sed -e "s/^depends: \+//" -e "s/rts//" -e "s/bin-package-db-[^ ]\+//")
for d in $OUT; do
case $d in
*-*) echo "ghc-devel($d)" ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.5.0/ghc-pkg-wrapper 
new/ghc-rpm-macros-1.5.3/ghc-pkg-wrapper
--- old/ghc-rpm-macros-1.5.0/ghc-pkg-wrapper2016-02-08 08:59:32.0 
+0100
+++ new/ghc-rpm-macros-1.5.3/ghc-pkg-wrapper2016-03-17 10:32:25.0 
+0100
@@ -22,11 +22,11 @@
 ;;
 # 7.8 and 7.10
 *)
-GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global 
--global-package-db=$PKGCONFDIR"
+GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
 ;;
 esac
 else
 GHC_PKG="/usr/bin/ghc-pkg-${GHC_VER} -f $PKGCONFDIR"
 fi
 
-$GHC_PKG $*
+$GHC_PKG --global $*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.5.0/ghc-rpm-macros.spec 
new/ghc-rpm-macros-1.5.3/ghc-rpm-macros.spec
--- old/ghc-rpm-macros-1.5.0/ghc-rpm-macros.spec1970-01-01 
01:00:00.0 +0100
+++ new/ghc-rpm-macros-1.5.3/ghc-rpm-macros.spec2016-03-17 
10:32:25.0 +0100
@@ -0,0 +1,822 @@
+%global debug_package %{nil}
+
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%global macros_dir %{_rpmconfigdir}/macros.d
+%else
+%global macros_dir %{_sysconfdir}/rpm
+%endif
+
+# uncomment to bootstrap without hscolour
+#%%global without_hscolour 1
+
+Name:   ghc-rpm-macros
+Version:1.5.3
+Release:1%{?dist}
+Summary:RPM macros for building packages for GHC
+
+License:GPLv3+
+URL:https://github.com/fedora-haskell/ghc-rpm-macros
+# Currently source is only in git but tarballs could be made if it helps
+Source0:macros.ghc
+Source1:COPYING
+Source2:AUTHORS
+Source3:ghc-deps.sh
+Source4:cabal-tweak-dep-ver
+Source5:cabal-tweak-flag
+Source6:macros.ghc-extra
+Source7:ghc.attr
+Source8:ghc-pkg-wrapper
+Requires:   redhat-rpm-config
+# for ghc_version
+Requires:   ghc-compiler
+%if %{undefined without_hscolour}
+%ifarch %{ix86} %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 
s390x ppc64le aarch64
+Requires:   hscolour
+%endif
+%endif
+
+%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.
+
+
+%package extra
+Summary:Extra

commit ghc-rpm-macros for openSUSE:Factory

2016-03-01 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2016-03-01 09:43:43

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
2015-11-18 22:34:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2016-03-01 09:43:54.0 +0100
@@ -1,0 +2,7 @@
+Thu Feb 18 14:55:41 UTC 2016 - mimi...@gmail.com
+
+- update to 1.5.0
+- update for ghc-8.0
+- ghc-deps uses --provides and --requires again
+
+---

Old:

  ghc-rpm-macros-1.4.98.tar.bz2

New:

  ghc-rpm-macros-1.5.0.tar.bz2



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.NmsybO/_old  2016-03-01 09:43:57.0 +0100
+++ /var/tmp/diff_new_pack.NmsybO/_new  2016-03-01 09:43:57.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-rpm-macros
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.4.98
+Version:1.5.0
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC

++ ghc-rpm-macros-1.4.98.tar.bz2 -> ghc-rpm-macros-1.5.0.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.4.98/README 
new/ghc-rpm-macros-1.5.0/README
--- old/ghc-rpm-macros-1.4.98/README1970-01-01 01:00:00.0 +0100
+++ new/ghc-rpm-macros-1.5.0/README 2016-02-18 15:43:34.0 +0100
@@ -0,0 +1,2 @@
+This repo is for openSUSE and SUSE fork of fedora-haskell/ghc-rpm-macros used 
for
+build openSUSE and SUSE haskell packages in https://build.opensuse.org 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.4.98/ghc-deps.sh 
new/ghc-rpm-macros-1.5.0/ghc-deps.sh
--- old/ghc-rpm-macros-1.4.98/ghc-deps.sh   2015-11-11 09:04:24.0 
+0100
+++ new/ghc-rpm-macros-1.5.0/ghc-deps.sh2016-02-08 08:59:32.0 
+0100
@@ -1,13 +1,20 @@
 #!/bin/sh
-# find rpm requires for Haskell GHC libraries
+# find rpm provides and requires for Haskell GHC libraries
 
-[ $# -ne 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghclibdir}" && exit 1
+[ $# -ne 2 ] && echo "Usage: `basename $0` [--provides|--requires] 
%{buildroot}%{ghclibdir}" && exit 1
 
 set +x
 
-PKGBASEDIR=$1
+MODE=$1
+PKGBASEDIR=$2
 PKGCONFDIR=$PKGBASEDIR/package.conf.d
 
+case $MODE in
+--provides) FIELD=id ;;
+--requires) FIELD=depends ;;
+*) echo "`basename $0`: Need --provides or --requires" ; exit 1
+esac
+
 files=$(cat)
 
 for i in $files; do
@@ -15,10 +22,10 @@
 # exclude builtin_rts.conf
$PKGCONFDIR/*-*.conf)
PKGVER=$(echo $i | sed -e "s%$PKGCONFDIR/\(.\+\)-.\+.conf%\1%")
-   DEPS=$(/usr/lib/rpm/ghc-pkg-wrapper $PKGBASEDIR field $PKGVER 
depends | sed -e "s/^depends: \+//" -e "s/builtin_rts//" -e 
"s/\(bin-package-db\|ghc-prim\|integer-gmp\)-[^ ]\+//")
-   for d in $DEPS; do
+   OUT=$(/usr/lib/rpm/ghc-pkg-wrapper $PKGBASEDIR field $PKGVER $FIELD 
| sed -e "s/^depends: \+//" -e "s/rts//" -e 
"s/\(bin-package-db\|ghc-prim\|integer-gmp\)-[^ ]\+//")
+   for d in $OUT; do
case $d in
-   *-*) echo "$d" | sed -e "s%\(.\+\)-\(.\+\)-.\+%ghc-\1-devel 
= \2%" ;;
+   *-*) echo "ghc-devel($d)" ;;
*) ;;
esac
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.4.98/ghc-pkg-wrapper 
new/ghc-rpm-macros-1.5.0/ghc-pkg-wrapper
--- old/ghc-rpm-macros-1.4.98/ghc-pkg-wrapper   2015-11-11 09:01:07.0 
+0100
+++ new/ghc-rpm-macros-1.5.0/ghc-pkg-wrapper2016-02-08 08:59:32.0 
+0100
@@ -22,7 +22,7 @@
 ;;
 # 7.8 and 7.10
 *)
-GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
+GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global 
--global-package-db=$PKGCONFDIR"
 ;;
 esac
 else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.4.98/ghc.attr 
new/ghc-rpm-macros-1.5.0/ghc.attr
--- old/ghc-rpm-macros-1.4.98/ghc.attr

commit ghc-rpm-macros for openSUSE:Factory

2015-11-18 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2015-11-18 22:34:43

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
2015-09-24 06:14:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2015-11-18 22:34:44.0 +0100
@@ -1,0 +2,13 @@
+Mon Oct 26 14:26:32 UTC 2015 - mimi...@gmail.com
+
+- update to 1.4.98
+- dropped: fix-library-dir.patch
+   suse-disable-debug-packages.patch
+   suse-docdir.patch
+   remove-flags.patch
+   fix-gen-filelists.patch
+* fix some missing quoting for deps generation
+* add and use ghc-pkg-wrapper script
+* use ghc-pkg key field
+
+---

Old:

  fix-gen-filelists.patch
  fix-library-dir.patch
  ghc-rpm-macros-1.4.94.tar.xz
  remove-flags.patch
  suse-disable-debug-packages.patch
  suse-docdir.patch

New:

  ghc-rpm-macros-1.4.98.tar.bz2



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.ot7YhU/_old  2015-11-18 22:34:45.0 +0100
+++ /var/tmp/diff_new_pack.ot7YhU/_new  2015-11-18 22:34:45.0 +0100
@@ -17,11 +17,10 @@
 
 
 %global macros_dir %{_sysconfdir}/rpm
-
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.4.94
+Version:1.4.98
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC
@@ -30,20 +29,10 @@
 
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 
-# source prepared manually from github.com/fedora-haskell/ghc-rpm-macros
-Source0:%{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
-Patch1: suse-disable-debug-packages.patch
-# PATCH-FIX-OPENSUSE suse-docdir.patch peter.tromm...@ohm-hochschule.de -- fix 
location of docdir
-Patch4: suse-docdir.patch
-# PATCH-FIX_UPSTREAM fix-gen-filelists.patch
-Patch5: fix-gen-filelists.patch
-# PATCH-FIX-OPENSUSE remove-flags.patch peter.tromm...@ohm-hochschule.de -- Do 
not pass CFLAGS and LDFLAGS to ghc. openSUSE is missing a RPM macro 
%%__global_ldflags.
-Patch8: remove-flags.patch
-# PATCH-FIX-UPSTREAM fix-library-dir.patch peter.tromm...@ohm-hochschule.de -- 
Fix ghc-rpm-macros and ghc build system installing into different library 
directories (package version vs package key).
-Patch9: fix-library-dir.patch
+# source prepared manually from github.com/opensuse-haskell/ghc-rpm-macros
+Source0:%{name}-%{version}.tar.bz2
 
-BuildRequires:  xz
+BuildRequires:  bzip2
 Requires:   rpm
 %if %{undefined without_hscolour}
 Requires:   hscolour
@@ -68,20 +57,13 @@
 %package -n ghc-srpm-macros
 Summary:RPM macros for building Haskell source packages
 Group:  Development/Libraries/Other
-%if 0%{?suse_version} > 1110
 BuildArch:  noarch
-%endif
 
 %description -n ghc-srpm-macros
 Macros used when generating source Haskell rpm packages.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .debug
-%patch4 -p1
-%patch5 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 echo no build stage needed
@@ -90,22 +72,20 @@
 install -p -D -m 0644 macros.ghc %{buildroot}%{macros_dir}/macros.ghc
 install -p -D -m 0644 macros.ghc-extra 
%{buildroot}/%{macros_dir}/macros.ghc-extra
 install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
-install -p -D -m 0644 ghc.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
 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
+install -p -D -m 0755 ghc-pkg-wrapper 
%{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper  
+install -p -D -m 0644 ghc.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %config %{macros_dir}/macros.ghc
-%if 0%{suse_version} < 1200
-%dir %{_prefix}/lib/rpm
-%dir %{_prefix}/lib/rpm/fileattrs
-%endif
 %{_prefix}/lib/rpm/ghc-deps.sh
-%{_prefix}/lib/rpm/fileattrs/ghc.attr
 %{_bindir}/cabal-tweak-dep-ver
 %{_bindir}/cabal-tweak-flag
+%{_prefix}/lib/rpm/ghc-pkg-wrapper
+%{_prefix}/lib/rpm/fileattrs/ghc.attr
 
 %files extra
 %defattr(-,root,root,-)

++ ghc-rpm-macros-1.4.94.tar.xz -> ghc-rpm-macros-1.4.98.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.4.94/Makefile

commit ghc-rpm-macros for openSUSE:Factory

2015-09-23 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2015-09-24 06:14:22

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
2015-08-28 08:27:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2015-09-24 06:14:25.0 +0200
@@ -1,0 +2,7 @@
+Wed Sep 16 09:26:31 UTC 2015 - mimi...@gmail.com
+
+- update to 1.4.94
+- refreshed remove-flags.patch
+- dropped add-group.patch and files-defattr.patch  
+
+---

Old:

  add-group.patch
  files-defattr.patch
  ghc-rpm-macros-1.4.93.tar.xz

New:

  ghc-rpm-macros-1.4.94.tar.xz



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.pfcCH8/_old  2015-09-24 06:14:26.0 +0200
+++ /var/tmp/diff_new_pack.pfcCH8/_new  2015-09-24 06:14:26.0 +0200
@@ -21,7 +21,7 @@
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.4.93
+Version:1.4.94
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC
@@ -34,10 +34,6 @@
 Source0:%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
-# PATCH-FIX-OPENSUSE add-group.patch sbahl...@suse.com -- Make sure a Group: 
tag is generated in subpackages; peter.tromm...@ohm-hochschule.de: also puts 
libraries in System/Libraries, see package group guidelines
-Patch2: add-group.patch
-# PATCH-FIX-OPENSUSE files-defattr.patch sbahl...@suse.com -- Make sure 
defattr macro used in files sections; peter.tromm...@ohm-hochschule.de: see 
also specfile guidelines, files section, permissions
-Patch3: files-defattr.patch
 # PATCH-FIX-OPENSUSE suse-docdir.patch peter.tromm...@ohm-hochschule.de -- fix 
location of docdir
 Patch4: suse-docdir.patch
 # PATCH-FIX_UPSTREAM fix-gen-filelists.patch
@@ -82,8 +78,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .debug
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch8 -p1

++ ghc-rpm-macros-1.4.93.tar.xz -> ghc-rpm-macros-1.4.94.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.4.93/ghc-rpm-macros.spec 
new/ghc-rpm-macros-1.4.94/ghc-rpm-macros.spec
--- old/ghc-rpm-macros-1.4.93/ghc-rpm-macros.spec   2015-05-11 
06:28:04.0 +0200
+++ new/ghc-rpm-macros-1.4.94/ghc-rpm-macros.spec   2015-09-16 
10:22:33.0 +0200
@@ -6,8 +6,8 @@
 #%%global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.4.93
-Release:2%{?dist}
+Version:1.4.94
+Release:1%{?dist}
 Summary:RPM macros for building packages for GHC
 
 License:GPLv3+
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 16 2015 Jens Petersen  - 1.4.94-1
+- configure libsubdir using pkgkey like ghc-cabal
+
 * Sat May  9 2015 Jens Petersen  - 1.4.93-2
 - handle no ghc-srpm-macros for fedora < 21
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ghc-rpm-macros-1.4.93/macros.ghc 
new/ghc-rpm-macros-1.4.94/macros.ghc
--- old/ghc-rpm-macros-1.4.93/macros.ghc2015-05-11 06:28:04.0 
+0200
+++ new/ghc-rpm-macros-1.4.94/macros.ghc2015-09-16 10:22:33.0 
+0200
@@ -25,7 +25,7 @@
 %global _hardened_ldflags %{nil}\
 CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\
 LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} 
--docdir=%{ghc_pkgdocdir} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' 
--ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} 
%{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / 
-optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" 
%{?cabal_configure_options} $cabal_configure_extra_options
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} 
--docdir=%{ghc_pkgdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' 
--ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} 
%{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / 
-optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" 
%{?cabal_configure_options} $cabal_configure_extra_options
 
 # install
 %cabal_install %cabal copy --destdir=%{buildroot} -v
@@ -109,11 +109,13 @@
 
 #

commit ghc-rpm-macros for openSUSE:Factory

2015-08-28 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2015-08-28 08:27:41

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
2015-08-23 17:39:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2015-08-28 08:27:55.0 +0200
@@ -1,0 +2,37 @@
+Thu Aug 27 08:45:19 UTC 2015 - mimi...@gmail.com
+
+- update to 1.4.93
+- refreshed:
+add-group.patch
+files-defattr.patch
+fix-gen-filelists.patch
+fix-library-dir.patch
+suse-disable-debug-packages.patch
+suse-docdir.patch
+- dropped:
+version-docdirs.patch
+fix-runpath.patch
+ldflags.patch
+- added:
+remove-flags.patch
+- fix ghc-pkg path in ghc-deps.sh for ghc-7.10
+- local pkgdir macro is redundant
+- use utf8 locale for cabal
+- add explicit --enable-shared again for arm64
+- introduce ghc_pkgdocdir since no _pkgdocdir in RHEL 7 and earlier
+- allow overriding ghc- prefix with ghc_name (for ghc784 etc)
+- version ghc-pkg in ghc_pkg_recache
+- have to turn off hardening in cabal_configure: set _hardened_ldflags to nil
+- add cabal_test macro
+- only run cabal haddock for real libraries with modules
+- make sure basepkg.files is also created for meta packages
+- fix the R*PATH regexp
+- version ghcpkgdocdir
+- add new names ghc_html_dir, ghc_html_libraries_dir, and ghc_html_pkg_dir
+- correct cabal-tweak-flag error message for missing flag
+- update ghc_gen_filelists to use new keyed library filepaths
+  and specify libHS*.so more loosely
+- ghc-dep.sh now just makes versioned devel reqs
+- rename ghc_lib.attr to ghc.attr and drop ghc_bin.attr
+
+---

Old:

  fix-runpath.patch
  ghc-rpm-macros-1.4.8.tar.xz
  ldflags.patch
  version-docdirs.patch

New:

  fix-gen-filelists.patch
  ghc-rpm-macros-1.4.93.tar.xz
  remove-flags.patch



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.w0gHID/_old  2015-08-28 08:27:56.0 +0200
+++ /var/tmp/diff_new_pack.w0gHID/_new  2015-08-28 08:27:56.0 +0200
@@ -21,7 +21,7 @@
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.4.8
+Version:1.4.93
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC
@@ -30,6 +30,7 @@
 
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 
+# source prepared manually from github.com/fedora-haskell/ghc-rpm-macros
 Source0:%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
@@ -39,17 +40,15 @@
 Patch3: files-defattr.patch
 # PATCH-FIX-OPENSUSE suse-docdir.patch peter.tromm...@ohm-hochschule.de -- fix 
location of docdir
 Patch4: suse-docdir.patch
-# PATCH-FIX-UPSTREAM fix-runpath.patch peter.tromm...@ohm-hochschule.de -- In 
openSUSE we patch binutils to default to the new RUNPATH dynamic tag and not 
the obsolete RPATH. This patch adds support for the former and still works for 
the latter.
-Patch7: fix-runpath.patch  
-# PATCH-FIX-OPENSUSE ldflags.patch peter.tromm...@ohm-hochschule.de -- Remove 
LDFLAGS. TODO: Find the right openSUSE way to do this.
-Patch8: ldflags.patch
+# PATCH-FIX_UPSTREAM fix-gen-filelists.patch
+Patch5: fix-gen-filelists.patch
+# PATCH-FIX-OPENSUSE remove-flags.patch peter.tromm...@ohm-hochschule.de -- Do 
not pass CFLAGS and LDFLAGS to ghc. openSUSE is missing a RPM macro 
%%__global_ldflags.
+Patch8: remove-flags.patch
 # PATCH-FIX-UPSTREAM fix-library-dir.patch peter.tromm...@ohm-hochschule.de -- 
Fix ghc-rpm-macros and ghc build system installing into different library 
directories (package version vs package key).
 Patch9: fix-library-dir.patch 
-# PATCH-FIX-UPSTREAM version-docdir.patch peter.tromm...@ohm-hochschule.de -- 
Include version number in package documentation dir.
-Patch10:version-docdirs.patch
 
-Requires:   rpm
 BuildRequires:  xz
+Requires:   rpm
 %if %{undefined without_hscolour}
 Requires:   hscolour
 %endif
@@ -70,7 +69,6 @@
 Extra macros used for subpackaging of Haskell libraries,
 for example in ghc and haskell-platform.
 
-
 %package -n ghc-srpm-macros
 Summary:RPM macros for building Haskell source packages
 Group:  Development/Libraries/Other
@@ -82,15 +80,14 @@
 Macros used when generating source Haskell rpm packages.

commit ghc-rpm-macros for openSUSE:Factory

2015-08-23 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2015-08-23 15:43:02

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
2015-04-15 16:24:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2015-08-23 17:39:06.0 +0200
@@ -1,0 +2,12 @@
+Wed Aug 19 08:08:54 UTC 2015 - mimi...@gmail.com
+
+- update to fake version 1.4.8 based on 1.3.91
+- dropped: sle-sp1-rpmdeps.patch 
+   fix-gen-filelists.patch
+   remove-flags.patch 
+- added patches: ldflags.patch
+ version-docdirs.patch
+ fix-runpath.patch
+ fix-library-dir.patch
+
+---

Old:

  fix-gen-filelists.patch
  ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.tar.xz
  remove-flags.patch
  sle-sp1-rpmdeps.patch

New:

  fix-library-dir.patch
  fix-runpath.patch
  ghc-rpm-macros-1.4.8.tar.xz
  ldflags.patch
  version-docdirs.patch



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.9LGKPx/_old  2015-08-23 17:39:06.0 +0200
+++ /var/tmp/diff_new_pack.9LGKPx/_new  2015-08-23 17:39:06.0 +0200
@@ -16,14 +16,12 @@
 #
 
 
-%global git_hash  81726e4857a866d19cc59b496846d127b9e8c381
-
 %global macros_dir %{_sysconfdir}/rpm
 
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.4.7
+Version:1.4.8
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC
@@ -32,7 +30,7 @@
 
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 
-Source0:
http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.xz
+Source0:%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
 # PATCH-FIX-OPENSUSE add-group.patch sbahl...@suse.com -- Make sure a Group: 
tag is generated in subpackages; peter.tromm...@ohm-hochschule.de: also puts 
libraries in System/Libraries, see package group guidelines
@@ -41,15 +39,17 @@
 Patch3: files-defattr.patch
 # PATCH-FIX-OPENSUSE suse-docdir.patch peter.tromm...@ohm-hochschule.de -- fix 
location of docdir
 Patch4: suse-docdir.patch
-# PATCH-FIX_UPSTREAM fix-gen-filelists.patch
-Patch5: fix-gen-filelists.patch
-# PATCH-FIX-OPENSUSE remove-flags.patch peter.tromm...@ohm-hochschule.de -- Do 
not pass CFLAGS and LDFLAGS to ghc. openSUSE is missing a RPM macro 
%%__global_ldflags.
-Patch8: remove-flags.patch
-# PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.tromm...@ohm-hochschule.de -- 
SLE's RPM is too old in 11 SP1 and SP2 and SP3
-Patch100:   sle-sp1-rpmdeps.patch
+# PATCH-FIX-UPSTREAM fix-runpath.patch peter.tromm...@ohm-hochschule.de -- In 
openSUSE we patch binutils to default to the new RUNPATH dynamic tag and not 
the obsolete RPATH. This patch adds support for the former and still works for 
the latter.
+Patch7: fix-runpath.patch  
+# PATCH-FIX-OPENSUSE ldflags.patch peter.tromm...@ohm-hochschule.de -- Remove 
LDFLAGS. TODO: Find the right openSUSE way to do this.
+Patch8: ldflags.patch
+# PATCH-FIX-UPSTREAM fix-library-dir.patch peter.tromm...@ohm-hochschule.de -- 
Fix ghc-rpm-macros and ghc build system installing into different library 
directories (package version vs package key).
+Patch9: fix-library-dir.patch 
+# PATCH-FIX-UPSTREAM version-docdir.patch peter.tromm...@ohm-hochschule.de -- 
Include version number in package documentation dir.
+Patch10:version-docdirs.patch
 
-BuildRequires:  xz
 Requires:   rpm
+BuildRequires:  xz
 %if %{undefined without_hscolour}
 Requires:   hscolour
 %endif
@@ -82,16 +82,15 @@
 Macros used when generating source Haskell rpm packages.
 
 %prep
-%setup -q -n %{name}-%{git_hash}
+%setup -q
 %patch1 -p1 -b .debug
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+%patch7 -p1
 %patch8 -p1
-%if 0%{?sles_version}
-%patch -P 100 -p2
-%endif
+%patch9 -p1
+%patch10 -p1
 
 %build
 echo no build stage needed
@@ -100,8 +99,7 @@
 install -p -D -m 0644 macros.ghc %{buildroot}%{macros_dir}/macros.ghc
 install -p -D -m 0644 macros.ghc-extra 
%{buildroot}/%{macros_dir}/macros.ghc-extra
 install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
-install -p -D -m 0644 ghc_bin.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr
-install -p

commit ghc-rpm-macros for openSUSE:Factory

2015-04-15 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2015-04-15 16:24:38

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
2015-03-28 18:38:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2015-04-15 16:24:40.0 +0200
@@ -1,0 +2,5 @@
+Tue Apr 14 07:10:18 UTC 2015 - mimi...@gmail.com
+
+- regenerated sle-sp1-rpmdeps.patch 
+
+---



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.VW1IPe/_old  2015-04-15 16:24:40.0 +0200
+++ /var/tmp/diff_new_pack.VW1IPe/_new  2015-04-15 16:24:40.0 +0200
@@ -90,7 +90,7 @@
 %patch5 -p1
 %patch8 -p1
 %if 0%{?sles_version}
-%patch -P 100 -p1
+%patch -P 100 -p2
 %endif
 
 %build

++ sle-sp1-rpmdeps.patch ++
--- /var/tmp/diff_new_pack.VW1IPe/_old  2015-04-15 16:24:40.0 +0200
+++ /var/tmp/diff_new_pack.VW1IPe/_new  2015-04-15 16:24:40.0 +0200
@@ -1,8 +1,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
+diff --git 
b/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/ghc-deps.sh 
a/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-deps.sh
+index e3a681e..300315b 100755
+--- b/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/ghc-deps.sh
 a/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/ghc-deps.sh
+@@ -30,8 +30,8 @@ else
  fi
  
  case $MODE in
@@ -13,23 +13,17 @@
  *) echo `basename $0`: Need --provides or --requires ; exit 1
  esac
  
-@@ -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
-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
+diff --git 
b/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc 
a/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc
+index 7bf522c..eda73be 100644
+--- b/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.orig/macros.ghc
 a/ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381/macros.ghc
+@@ -127,6 +127,9 @@ fi\
+ find %{buildroot} -type f -exec sh -c file {} | grep -q 'dynamically 
linked' \\; -exec strip {} \\;\
+ %endif
  
 +# SLE does not define _rpmconfigdir (yet)
 +%_rpmconfigdir %{_prefix}/lib/rpm
 +
  # install bin package
  %ghc_bin_install()\
- %global _use_internal_dependency_generator 0\
+ %cabal_install\

commit ghc-rpm-macros for openSUSE:Factory

2015-03-28 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2015-03-28 18:38:46

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
2015-02-24 13:07:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2015-03-28 18:38:47.0 +0100
@@ -1,0 +2,6 @@
+Fri Mar 27 08:17:55 UTC 2015 - peter.tromm...@ohm-hochschule.de
+
+- add rpm library directory to files on older openSUSE
+* fix build on openSUSE 11.4 
+
+---



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.PlAOHb/_old  2015-03-28 18:38:48.0 +0100
+++ /var/tmp/diff_new_pack.PlAOHb/_new  2015-03-28 18:38:48.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-rpm-macros
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -109,6 +109,10 @@
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %config %{macros_dir}/macros.ghc
+%if 0%{suse_version}  1200
+%dir %{_prefix}/lib/rpm
+%dir %{_prefix}/lib/rpm/fileattrs
+%endif
 %{_prefix}/lib/rpm/fileattrs/ghc_bin.attr
 %{_prefix}/lib/rpm/fileattrs/ghc_lib.attr
 %{_prefix}/lib/rpm/ghc-deps.sh

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ghc-rpm-macros for openSUSE:Factory

2015-02-24 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2015-02-24 13:03:01

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
2014-12-16 14:48:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2015-02-24 13:07:19.0 +0100
@@ -1,0 +2,15 @@
+Mon Feb 23 16:38:21 UTC 2015 - peter.tromm...@ohm-hochschule.de
+
+- update to 1.4.7
+- drop fix-runpath.patch
+  * fixed upstream
+- refresh fix-gen-filelists.patch
+- refresh suse-disable-debug-packages.patch
+- refresh suse-docdir.patch
+- add remove-flags.patch
+  * remove passing of CFLAGS and LDFLAGS to ghc
+  * no macro %__global_ldflags in openSUSE 
+- remove provides ghc() workaround
+  * fixed upstream 
+
+---

Old:

  fix-runpath.patch
  ghc-rpm-macros-2da26f9db56515862de9839f12a17be5f2ed2eb7.tar.xz

New:

  ghc-rpm-macros-81726e4857a866d19cc59b496846d127b9e8c381.tar.xz
  remove-flags.patch



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.Hcmcwm/_old  2015-02-24 13:07:20.0 +0100
+++ /var/tmp/diff_new_pack.Hcmcwm/_new  2015-02-24 13:07:20.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-rpm-macros
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,14 +16,14 @@
 #
 
 
-%global git_hash   2da26f9db56515862de9839f12a17be5f2ed2eb7
+%global git_hash  81726e4857a866d19cc59b496846d127b9e8c381
 
 %global macros_dir %{_sysconfdir}/rpm
 
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.3.6
+Version:1.4.7
 Release:0
 BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC
@@ -43,8 +43,8 @@
 Patch4: suse-docdir.patch
 # PATCH-FIX_UPSTREAM fix-gen-filelists.patch
 Patch5: fix-gen-filelists.patch
-# PATCH-FIX-UPSTREAM fix-runpath.patch peter.tromm...@ohm-hochschule.de -- In 
openSUSE we patch binutils to default to the new RUNPATH dynamic tag and not 
the obsolete RPATH. This patch adds support for the former and still works for 
the latter.
-Patch7: fix-runpath.patch  
+# PATCH-FIX-OPENSUSE remove-flags.patch peter.tromm...@ohm-hochschule.de -- Do 
not pass CFLAGS and LDFLAGS to ghc. openSUSE is missing a RPM macro 
%%__global_ldflags.
+Patch8: remove-flags.patch
 # PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.tromm...@ohm-hochschule.de -- 
SLE's RPM is too old in 11 SP1 and SP2 and SP3
 Patch100:   sle-sp1-rpmdeps.patch
 
@@ -53,12 +53,6 @@
 %if %{undefined without_hscolour}
 Requires:   hscolour
 %endif
-# This is a workaround for a bug in the automatic dependencies generator
-# ghc-deps.sh generates this symbol for extra libraries installed with a
-# dynamic ghc, currently only %%{ix86} and x86_64
-%ifarch %{ix86} x86_64
-Provides:   ghc()
-%endif
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -94,7 +88,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch7 -p1
+%patch8 -p1
 %if 0%{?sles_version}
 %patch -P 100 -p1
 %endif
@@ -106,7 +100,8 @@
 install -p -D -m 0644 macros.ghc %{buildroot}%{macros_dir}/macros.ghc
 install -p -D -m 0644 macros.ghc-extra 
%{buildroot}/%{macros_dir}/macros.ghc-extra
 install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
-install -p -D -m 0644 ghc.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc.attr
+install -p -D -m 0644 ghc_bin.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr
+install -p -D -m 0644 ghc_lib.attr 
%{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr
 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
 
@@ -114,7 +109,8 @@
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %config %{macros_dir}/macros.ghc
-%{_prefix}/lib/rpm/fileattrs/ghc.attr
+%{_prefix}/lib/rpm/fileattrs/ghc_bin.attr
+%{_prefix}/lib/rpm/fileattrs/ghc_lib.attr
 %{_prefix}/lib/rpm/ghc-deps.sh
 %{_bindir}/cabal-tweak-dep-ver
 %{_bindir}/cabal-tweak-flag

++ fix-gen-filelists.patch ++
--- /var/tmp/diff_new_pack.Hcmcwm/_old  2015-02-24 13:07:20.0 +0100
+++ /var/tmp/diff_new_pack.Hcmcwm/_new  2015-02-24 13:07:20.0 +0100
@@ -1,10 +1,10 @@
-Index:

commit ghc-rpm-macros for openSUSE:Factory

2014-12-16 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2014-12-16 14:48:49

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
2014-11-06 16:51:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2014-12-16 14:48:53.0 +0100
@@ -1,0 +2,11 @@
+Sun Dec 14 09:26:31 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- make package noarch and remove rpmlintrc 
+
+---
+Sat Dec 13 09:33:54 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- do not disable dynamic libraries on ppc anymore
+* fixed by patch 18 in ghc.spec 
+
+---

Old:

  ghc-rpm-macros-rpmlintrc



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.IkiUfK/_old  2014-12-16 14:48:55.0 +0100
+++ /var/tmp/diff_new_pack.IkiUfK/_new  2014-12-16 14:48:55.0 +0100
@@ -25,6 +25,7 @@
 Name:   ghc-rpm-macros
 Version:1.3.6
 Release:0
+BuildArch:  noarch
 Summary:RPM Macros for building packages for GHC
 License:GPL-3.0+
 Group:  Development/Libraries/Other
@@ -32,7 +33,6 @@
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 
 Source0:
http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.xz
-Source1:ghc-rpm-macros-rpmlintrc
 # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
 # PATCH-FIX-OPENSUSE add-group.patch sbahl...@suse.com -- Make sure a Group: 
tag is generated in subpackages; peter.tromm...@ohm-hochschule.de: also puts 
libraries in System/Libraries, see package group guidelines
@@ -110,18 +110,6 @@
 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 (still) arch-dependent:
-# turn off shared libs and dynamic linking on ppc
-# See Haskell trac #8024
-%ifarch ppc
-cat  %{buildroot}%{macros_dir}/macros.ghc EOF
-
-# shared libraries are only supported on primary intel archs
-%%ghc_without_dynamic 1
-%%ghc_without_shared 1
-EOF
-%endif
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ghc-rpm-macros for openSUSE:Factory

2014-10-23 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2014-10-23 14:20:17

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
2014-08-03 15:36:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2014-10-23 14:20:25.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 12 13:11:17 UTC 2014 - dmuel...@suse.com
+
+- disable dependency on prelink for arm and aarch64 architectures 
+
+---



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.5KsyRf/_old  2014-10-23 14:20:27.0 +0200
+++ /var/tmp/diff_new_pack.5KsyRf/_new  2014-10-23 14:20:27.0 +0200
@@ -50,7 +50,7 @@
 
 BuildRequires:  xz
 Requires:   ghc-srpm-macros = %{version}-%{release}
-%ifnarch ppc64le
+%ifnarch ppc64le aarch64 %arm
 # for execstack
 Requires:   prelink
 %endif
@@ -99,8 +99,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-# remove when prelink is available on ppc64le
-%ifarch ppc64le
+# remove when prelink is available on any of those architectures
+%ifarch ppc64le aarch64 %arm
 %patch6 -p1
 %endif
 %if 0%{?sles_version}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ghc-rpm-macros for openSUSE:Factory

2014-08-03 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2014-08-03 15:36:44

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
2014-06-30 21:50:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2014-08-03 15:36:48.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul 31 16:10:06 UTC 2014 - dims...@opensuse.org
+
+- Rename rpmlintrc to %{name}-rpmlintrc.
+  Follow the packaging guidelines.
+
+---

Old:

  rpmlintrc

New:

  ghc-rpm-macros-rpmlintrc



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.y0560l/_old  2014-08-03 15:36:50.0 +0200
+++ /var/tmp/diff_new_pack.y0560l/_new  2014-08-03 15:36:50.0 +0200
@@ -32,7 +32,7 @@
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 
 Source0:
http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.xz
-Source1:rpmlintrc
+Source1:ghc-rpm-macros-rpmlintrc
 # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
 # PATCH-FIX-OPENSUSE add-group.patch sbahl...@suse.com -- Make sure a Group: 
tag is generated in subpackages; peter.tromm...@ohm-hochschule.de: also puts 
libraries in System/Libraries, see package group guidelines

++ ghc-rpm-macros-rpmlintrc ++
addFilter(no-binary)
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ghc-rpm-macros for openSUSE:Factory

2014-06-30 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2014-06-30 21:45:09

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
2014-06-01 19:41:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2014-06-30 21:45:33.0 +0200
@@ -1,0 +2,10 @@
+Thu Jun 26 11:17:24 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- add rpmlintrc to spec file 
+
+---
+Thu Jun 26 06:52:11 UTC 2014 - martin.koeg...@chello.at
+
+- SLES11 does not support a different BuildArch for subpackages 
+
+---



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.lAYqwy/_old  2014-06-30 21:45:34.0 +0200
+++ /var/tmp/diff_new_pack.lAYqwy/_new  2014-06-30 21:45:34.0 +0200
@@ -32,6 +32,7 @@
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 
 Source0:
http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.xz
+Source1:rpmlintrc
 # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
 # PATCH-FIX-OPENSUSE add-group.patch sbahl...@suse.com -- Make sure a Group: 
tag is generated in subpackages; peter.tromm...@ohm-hochschule.de: also puts 
libraries in System/Libraries, see package group guidelines
@@ -84,7 +85,9 @@
 %package -n ghc-srpm-macros
 Summary:RPM macros for building Haskell source packages
 Group:  Development/Libraries/Other
+%if 0%{?suse_version}  1110
 BuildArch:  noarch
+%endif
 
 %description -n ghc-srpm-macros
 Macros used when generating source Haskell rpm packages.

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ghc-rpm-macros for openSUSE:Factory

2014-06-01 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2014-06-01 19:41: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
2014-05-13 20:44:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2014-06-01 19:41:18.0 +0200
@@ -1,0 +2,5 @@
+Thu May 29 19:39:26 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- BR xz for SLE 11 builds 
+
+---



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.EdAsIi/_old  2014-06-01 19:41:19.0 +0200
+++ /var/tmp/diff_new_pack.EdAsIi/_new  2014-06-01 19:41:19.0 +0200
@@ -47,6 +47,7 @@
 # PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.tromm...@ohm-hochschule.de -- 
SLE's RPM is too old in 11 SP1 and SP2 and SP3
 Patch100:   sle-sp1-rpmdeps.patch
 
+BuildRequires:  xz
 Requires:   ghc-srpm-macros = %{version}-%{release}
 %ifnarch ppc64le
 # for execstack

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ghc-rpm-macros for openSUSE:Factory

2014-05-13 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2014-05-13 20:44:03

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-12-19 12:09:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2014-05-13 20:44:04.0 +0200
@@ -1,0 +2,25 @@
+Sat May 10 20:56:02 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- update to 1.2.7
+  * set datasubdir in cabal_configure for ghc-7.8
+  * abort ghc_fix_dynamic_rpath if no chrpath
+  * update license tag to GPLv3+
+  * set Url field when generating subpackages
+- refresh patches add-group.patch, files-defattr.patch,
+  fix-genfilelists.patch, suse-disable-debug-patches.patch
+- remove macros.ghc-suse
+  * they never worked on OBS
+- add patch disable-execstack.patch
+  * disable execstack workaround on ppc64le
+  * prelink is not available on ppc64le yet
+  * ghc does not handle executable stack note properly
+you will probably get rpmlint warnings about it 
+
+---
+Sat Feb  1 08:46:53 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- update to 1.2.2
+  * fix error message
+- use stable URL (no git hash) 
+
+---

Old:

  _service
  ghc-rpm-macros-4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52.tar.bz2
  macros.ghc-suse

New:

  disable-execstack.patch
  ghc-rpm-macros-48199c851a2c672494e295b3cbfc4eded20c3a11.tar.xz



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.Lo59n5/_old  2014-05-13 20:44:05.0 +0200
+++ /var/tmp/diff_new_pack.Lo59n5/_new  2014-05-13 20:44:05.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-rpm-macros
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,23 +16,22 @@
 #
 
 
-%global git_hash 4d2eb25803c01c46ee84cd7f30f1bc5fb4efba52
+%global git_hash  48199c851a2c672494e295b3cbfc4eded20c3a11
 
 %global macros_dir %{_sysconfdir}/rpm
 
 %global without_hscolour 1
 
 Name:   ghc-rpm-macros
-Version:1.2
+Version:1.2.7
 Release:0
 Summary:RPM Macros for building packages for GHC
-License:GPL-3.0
+License:GPL-3.0+
 Group:  Development/Libraries/Other
 
 Url:https://fedoraproject.org/wiki/Haskell_SIG
 
-Source0:
http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.bz2
-Source4:macros.ghc-suse
+Source0:
http://pkgs.fedoraproject.org/cgit/%{name}.git/snapshot/%{name}-%{git_hash}.tar.xz
 # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
 # PATCH-FIX-OPENSUSE add-group.patch sbahl...@suse.com -- Make sure a Group: 
tag is generated in subpackages; peter.tromm...@ohm-hochschule.de: also puts 
libraries in System/Libraries, see package group guidelines
@@ -41,15 +40,28 @@
 Patch3: files-defattr.patch
 # PATCH-FIX-OPENSUSE suse-docdir.patch peter.tromm...@ohm-hochschule.de -- fix 
location of docdir
 Patch4: suse-docdir.patch
-# PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.tromm...@ohm-hochschule.de -- 
SLE's RPM is too old in 11 SP1 and SP2
+# PATCH-FIX_UPSTREAM fix-gen-filelists.patch
+Patch5: fix-gen-filelists.patch
+# PATCH-FIX-OPENSUSE disable-execstack.patch peter.tromm...@ohm-hochschule.de 
-- disable execstack workaround 
+Patch6: disable-execstack.patch
+# PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.tromm...@ohm-hochschule.de -- 
SLE's RPM is too old in 11 SP1 and SP2 and SP3
 Patch100:   sle-sp1-rpmdeps.patch
 
+Requires:   ghc-srpm-macros = %{version}-%{release}
+%ifnarch ppc64le
 # for execstack
 Requires:   prelink
+%endif
 Requires:   rpm
 %if %{undefined without_hscolour}
 Requires:   hscolour
 %endif
+# This is a workaround for a bug in the automatic dependencies generator
+# ghc-deps.sh generates this symbol for extra libraries installed with a
+# dynamic ghc, currently only %%{ix86} and x86_64
+%ifarch %{ix86} x86_64
+Provides:   ghc()
+%endif
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -64,7 +76,17 @@
 Requires:   %{name} = %{version}-%{release}
 
 %description

commit ghc-rpm-macros for openSUSE:Factory

2013-12-19 Thread h_root

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.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2013-12-19 12:09:01.0 +0100
@@ -1,0 +2,43 @@
+Mon Dec 16 15:26:01 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- add requires prelink
+  * need execstack to fix ghc generated binaries
+
+---
+Fri Dec 13 21:56:16 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- fix suse-docdir.patch
+* define _pkgdocdir macro 
+
+---
+Wed Dec 11 19:40:34 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- refresh sle-sp1-rpmdeps.patch 
+
+---
+Tue Oct 29 21:01:53 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- disable colorized documentation for ppc bootstrap 
+
+---
+Sat Oct 26 18:34:10 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- fix typo in email address for patch 2 
+
+---
+Sat Oct 26 18:32:22 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- refresh suse-disable-debug-packages.patch
+- refresh add-group.patch
+- refresh files-defattr.patch 
+
+---
+Sat Oct 26 18:26:21 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.OgXNGY/_new  2013-12-19 12:09:03.0 +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 peter.tromm...@ohm-hochschule.de -- 
openSUSE packaging Haskell guidelines
-Patch:  buildService.patch
 # PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
-# PATCH-FIX-OPENSUSE add-group.patch sbahl...@suse.com -- Make sure a Group: 
tag is generated in subpackages; peter.tromm...@ohm-hocschule.de: also puts 
libraries in System/Libraries, see package group guidelines
+# PATCH-FIX-OPENSUSE add-group.patch sbahl...@suse.com -- Make sure a Group: 
tag is generated in subpackages; peter.tromm...@ohm-hochschule.de: also puts 
libraries in System/Libraries, see package group guidelines
 Patch2: add-group.patch
 # PATCH-FIX-OPENSUSE files-defattr.patch sbahl...@suse.com -- Make sure 
defattr macro used in files sections; peter.tromm...@ohm-hochschule.de: see 
also specfile guidelines, files section, permissions
 Patch3: files-defattr.patch
+# PATCH-FIX-OPENSUSE suse-docdir.patch peter.tromm...@ohm-hochschule.de -- fix 
location of docdir
+Patch4: suse-docdir.patch
 # PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.tromm...@ohm-hochschule.de -- 
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

commit ghc-rpm-macros for openSUSE:Factory

2013-09-29 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2013-09-29 19:23:34

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-08-02 09:08:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2013-09-29 19:23:35.0 +0200
@@ -1,0 +2,12 @@
+Thu Sep 26 06:59:33 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- clean up spec file
+* fix comment for patch 1 (wrong file name)
+* remove unused patch2 in setup section 
+
+---
+Thu Sep 26 06:56:57 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- enable colorized documentation for all Haskell packages 
+
+---



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.GsrVjv/_old  2013-09-29 19:23:41.0 +0200
+++ /var/tmp/diff_new_pack.GsrVjv/_new  2013-09-29 19:23:41.0 +0200
@@ -20,7 +20,7 @@
 
 %global macros_dir %{_sysconfdir}/rpm
 
-%global without_hscolour 1
+#%%global without_hscolour 1
 
 Name:   ghc-rpm-macros
 Version:0.99
@@ -35,7 +35,7 @@
 Source4:macros.ghc-suse
 # PATCH-FIX-OPENSUSE buildService .patch peter.tromm...@ohm-hochschule.de -- 
openSUSE packaging Haskell guidelines
 Patch:  buildService.patch
-# PATCH-FIX-OPENSUSE cabal-rpm-spdx.patch peter.tromm...@ohm-hochschule.de -- 
openSUSE way to disable debug packages
+# PATCH-FIX-OPENSUSE suse-disable-debug-packages.patch 
peter.tromm...@ohm-hochschule.de -- openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
 # PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.tromm...@ohm-hochschule.de -- 
SLE's RPM is too old in 11 SP1 and SP2
 Patch100:   sle-sp1-rpmdeps.patch
@@ -64,7 +64,6 @@
 %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

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ghc-rpm-macros for openSUSE:Factory

2013-08-02 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2013-08-02 09:08:47

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-08-01 15:33:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2013-08-02 09:08:48.0 +0200
@@ -1,0 +2,5 @@
+Thu Aug  1 15:18:38 UTC 2013 - dval...@suse.com
+
+- fix %{macros_dir}/macros.ghc for non x86 arches 
+
+---



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.fsgV8H/_old  2013-08-02 09:08:49.0 +0200
+++ /var/tmp/diff_new_pack.fsgV8H/_new  2013-08-02 09:08:49.0 +0200
@@ -84,7 +84,7 @@
 # this is why this package is now arch-dependent:
 # turn off shared libs and dynamic linking on secondary archs
 %ifnarch %{ix86} x86_64
-cat  %{buildroot}/%{macros_file} EOF
+cat  %{buildroot}%{macros_dir}/macros.ghc EOF
 
 # shared libraries are only supported on primary intel archs
 %%ghc_without_dynamic 1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ghc-rpm-macros for openSUSE:Factory

2013-08-01 Thread h_root

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.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2013-08-01 15:33:21.0 +0200
@@ -1,0 +2,35 @@
+Wed May  1 19:51:20 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- put version back into html doc directory (needed by haddock) 
+
+---
+Wed May  1 18:42:46 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- fix library directory for ghc packages 
+
+---
+Wed May  1 17:59:27 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- drop library version in html documentation directory 
+
+---
+Mon Apr 29 17:16:30 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- add patch to fix ghc_gen_filelists macro 
+
+---
+Mon Apr 29 08:59:04 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- 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 - peter.tromm...@ohm-hochschule.de
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.K8vxqz/_new  2013-08-01 15:33:22.0 +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 peter.tromm...@ohm-hochschule.de -- 
openSUSE packaging Haskell guidelines
 Patch:  buildService.patch
+# PATCH-FIX-OPENSUSE cabal-rpm-spdx.patch peter.tromm...@ohm-hochschule.de -- 
openSUSE way to disable debug packages
 Patch1: suse-disable-debug-packages.patch
+# PATCH-FIX-SLE sle-sp1-rpmdeps.patch peter.tromm...@ohm-hochschule.de -- 
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

commit ghc-rpm-macros for openSUSE:Factory

2012-11-24 Thread h_root

Hello community,

here is the log from the commit of package ghc-rpm-macros for openSUSE:Factory 
checked in at 2012-11-24 20:54:47

Comparing /work/SRC/openSUSE:Factory/ghc-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new (New)


Package is ghc-rpm-macros, Maintainer is 

Changes:

--- /work/SRC/openSUSE:Factory/ghc-rpm-macros/ghc-rpm-macros.changes
2012-10-11 10:42:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/ghc-rpm-macros.changes   
2012-11-24 20:54:48.0 +0100
@@ -1,0 +2,6 @@
+Sat Nov 17 12:41:05 UTC 2012 - peter.tromm...@ohm-hochschule.de
+
+- openSUSE specific macros to disable debug packages
+- refresh and remove .orig files from sle-sp1-rpmdeps.patch
+
+---

New:

  suse-disable-debug-packages.patch



Other differences:
--
++ ghc-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.dzGqq7/_old  2012-11-24 20:54:49.0 +0100
+++ /var/tmp/diff_new_pack.dzGqq7/_new  2012-11-24 20:54:49.0 +0100
@@ -1,8 +1,7 @@
 #
-# spec file for ghc-rpm-macros
+# spec file for package ghc-rpm-macros
 #
-
-# Copyright (c) 2012 Peter Trommler peter.tromm...@ohm-hochschule.de
+# Copyright (c) 2012 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,18 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%global debug_package %{nil}
 
 %global macros_file %{_sysconfdir}/rpm/macros.ghc
 
 Name:   ghc-rpm-macros
 Version:0.95.5.1
-Release:1
+Release:0
 Summary:Macros for building packages for GHC
-
-Group:  Development/Libraries/Other
 License:GPL-3.0
-URL:https://fedoraproject.org/wiki/Haskell_SIG
+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
@@ -39,7 +37,8 @@
 Source4:macros.ghc-suse
 Source5:cabal-tweak-dep-ver
 Patch:  buildService.patch
-Patch1: sle-sp1-rpmdeps.patch
+Patch1: suse-disable-debug-packages.patch
+Patch100:   sle-sp1-rpmdeps.patch
 #Requires:   redhat-rpm-config
 Requires:   rpm
 
@@ -55,16 +54,15 @@
 %setup -c -T
 cp %{SOURCE1} %{SOURCE2} .
 cp %{SOURCE0} %{SOURCE3} .
-%patch -p1
-%if %{defined sles_version}
-%patch1 -p1
+%patch -p1 -b .obs
+%patch1 -p1 -b .debug
+%if 0%{?sles_version}
+%patch -P 100 -p1
 %endif
 
-
 %build
 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
@@ -83,7 +81,6 @@
 EOF
 %endif
 
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS

++ sle-sp1-rpmdeps.patch ++
 711 lines (skipped)
 between /work/SRC/openSUSE:Factory/ghc-rpm-macros/sle-sp1-rpmdeps.patch
 and /work/SRC/openSUSE:Factory/.ghc-rpm-macros.new/sle-sp1-rpmdeps.patch

++ suse-disable-debug-packages.patch ++
Index: ghc-rpm-macros/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
 find %{buildroot} -type f -exec sh -c file {} | grep -q 'dynamically linked' 
\\; -exec strip {} \\;\
 %endif
 
+# ghc_suse_disable_debug_packages
+%ghc_suse_disable_debug_packages\
+%global debug_package %{nil}\
+%global __debug_install_post %{nil}\
+%global suse_insert_debug_package %{nil}\
+echo /usr/lib/debug  debugfiles.list\
+mkdir -p $RPM_BUILD_ROOT/usr/lib/debug\
+echo /usr/src/debug  debugsources.list\
+mkdir -p $RPM_BUILD_ROOT/usr/src/debug
+
+
 # ghc_bin_build
 %ghc_bin_build\
-%global debug_package %{nil}\
+%ghc_suse_disable_debug_packages\
 %cabal_configure\
 %cabal build
 
 # ghc_lib_build_without_haddock [name] [version]
 %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 build\
 %{nil}
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

commit ghc-rpm-macros for openSUSE:Factory

34 matches

Site Navigation

Mail list logo

Footer information