diff --git a/ghc-rpm-macros-1.6.95.tar.xz b/ghc-rpm-macros-1.6.95.tar.xz deleted file mode 100644 index 679038e..0000000 --- a/ghc-rpm-macros-1.6.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46f5dd0cf3e2ff2757191b2c722d964a7882d439511a372379e7f545a4a049dd -size 16872 diff --git a/ghc-rpm-macros-1.7.1.tar.xz b/ghc-rpm-macros-1.7.1.tar.xz new file mode 100644 index 0000000..595d6d9 --- /dev/null +++ b/ghc-rpm-macros-1.7.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1010fa54fa90c12efe77dbd895617a4db34be083e687d799988750a6026edd7 +size 17096 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 1f2ca21..e4fbd84 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 29 06:43:58 UTC 2017 - mimi.vx@gmail.com + +- update to 1.7.1 +- sync with upstream + ------------------------------------------------------------------- Fri Jan 20 08:39:08 UTC 2017 - mimi.vx@gmail.com diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 5d0dbfb..186ce05 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -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 @@ BuildArch: noarch 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-extra %{buildroot}/%{macros_dir}/macros.ghc-ext 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 @@ install -p -D -m 0755 ghc-dirs.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-dirs.sh %{_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