petersen pushed to Agda-stdlib (master). "move ffi lib into main package"

[notifications at fedoraproject.org]

>From 001ba0471e5fc98ded6c36df3faa3be633e968dd Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at redhat.com>
Date: Fri, 17 Apr 2015 15:38:45 +0900
Subject: move ffi lib into main package


diff --git a/Agda-stdlib.spec b/Agda-stdlib.spec
index 9e472ee..596b62d 100644
--- a/Agda-stdlib.spec
+++ b/Agda-stdlib.spec
@@ -7,8 +7,7 @@
 
 Name:           Agda-stdlib
 Version:        0.9
-# Only reset if agda-lib-ffi also bumped
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        Agda standard libraries
 
 Group:          Development/Libraries
@@ -29,6 +28,7 @@ BuildRequires:  ghc-unix-compat-devel
 # Agda needs ghci and is not building on arm currently
 ExclusiveArch:  %{ghc_arches_with_ghci}
 ExcludeArch:    armv7hl
+Obsoletes:      ghc-agda-lib-ffi < 0.0.2-6, ghc-agda-lib-ffi-devel < 0.0.2-6
 
 %description
 Agda standard libraries
@@ -43,11 +43,6 @@ This package provides the html documentation for the stdlibs
 generated by the Agda compiler program.
 
 
-%global stdlib_version %{version}
-%ghc_lib_subpackage agda-lib-ffi %{ffi_ver}
-%global version %{stdlib_version}
-
-
 %global debug_package %{nil}
 
 
@@ -82,6 +77,7 @@ cd ffi
 ./Setup register --inplace
 mv *.files ..
 cd ..
+cat ghc-agda-lib-ffi*.files > haskell-ffi.files
 
 mkdir -p %{buildroot}%{_datadir}/%{name}
 cp -pr Everything.agda* src/* %{buildroot}%{_datadir}/%{name}
@@ -92,7 +88,15 @@ agda -i. -isrc README.agda
 rm README.agdai README/*.agdai
 
 
-%files 
+%post
+%ghc_pkg_recache
+
+
+%postun
+%ghc_pkg_recache
+
+
+%files -f haskell-ffi.files
 %doc CHANGELOG LICENCE README*
 %{_datadir}/%{name}
 
@@ -102,8 +106,9 @@ rm README.agdai README/*.agdai
 
 
 %changelog
-* Thu Apr 16 2015 Jens Petersen <petersen at redhat.com> - 0.9-6
+* Thu Apr 16 2015 Jens Petersen <petersen at redhat.com> - 0.9-1
 - update to 0.9
+- include ffi lib in main package
 
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/Agda-stdlib.git/commit/?h=master&id=001ba0471e5fc98ded6c36df3faa3be633e968dd