The package rpms/ghc-OpenGL.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ghc-OpenGL.git/commit/?id=98c42c863b... https://src.fedoraproject.org/cgit/rpms/ghc-OpenGL.git/commit/?id=858ecd2f57... https://src.fedoraproject.org/cgit/rpms/ghc-OpenGL.git/commit/?id=c628be9f19... https://src.fedoraproject.org/cgit/rpms/ghc-OpenGL.git/commit/?id=b71e57a9f9... https://src.fedoraproject.org/cgit/rpms/ghc-OpenGL.git/commit/?id=cce684a3e3... https://src.fedoraproject.org/cgit/rpms/ghc-OpenGL.git/commit/?id=6bbef4ccb2....
Change: -ExclusiveArch: %{ghc_arches} +ExclusiveArch: %{ghc_arches} +ExcludeArch: %{ghc_excluded_archs} +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 +ExclusiveArch: %{ix86} x86_64 ppc alpha
Thanks.
Full change: ============
commit 6789765634e376c79f7082417617118b59df819e Author: Jens Petersen petersen@redhat.com Date: Wed Nov 3 15:04:31 2021 +0800
import new package (#1982387)
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..95300e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/OpenGL-3.0.3.0.tar.gz diff --git a/OpenGL-3.0.3.0.cabal b/OpenGL-3.0.3.0.cabal new file mode 100644 index 0000000..78c4a73 --- /dev/null +++ b/OpenGL-3.0.3.0.cabal @@ -0,0 +1,188 @@ +name: OpenGL +version: 3.0.3.0 +x-revision: 1 +synopsis: A binding for the OpenGL graphics system +description: + A Haskell binding for the OpenGL graphics system (GL, version 4.6) and its + accompanying utility library (GLU, version 1.3). + . + OpenGL is the industry's most widely used and supported 2D and 3D graphics + application programming interface (API), incorporating a broad set of + rendering, texture mapping, special effects, and other powerful visualization + functions. For more information about OpenGL and its various extensions, + please see http://www.opengl.org/ + and http://www.opengl.org/registry/. +homepage: https://wiki.haskell.org/OpenGL +bug-reports: https://github.com/haskell-opengl/OpenGL/issues +copyright: Copyright (C) 2002-2019 Sven Panne +license: BSD3 +license-file: LICENSE +author: Sven Panne +maintainer: Sven Panne svenpanne@gmail.com, Jason Dagit dagitj@gmail.com +category: Graphics +build-type: Simple +tested-with: + GHC == 7.8.4 + GHC == 7.10.3 + GHC == 8.0.2 + GHC == 8.2.2 + GHC == 8.4.3 + GHC == 8.6.5 + GHC == 8.8.1 +cabal-version: >= 1.10 +extra-source-files: + CHANGELOG.md + README.md + +library + exposed-modules: + Graphics.Rendering.OpenGL + Graphics.Rendering.OpenGL.GL + Graphics.Rendering.OpenGL.GL.Antialiasing + Graphics.Rendering.OpenGL.GL.BeginEnd + Graphics.Rendering.OpenGL.GL.Bitmaps + Graphics.Rendering.OpenGL.GL.BufferObjects + Graphics.Rendering.OpenGL.GL.Clipping + Graphics.Rendering.OpenGL.GL.ColorSum + Graphics.Rendering.OpenGL.GL.Colors + Graphics.Rendering.OpenGL.GL.ConditionalRendering + Graphics.Rendering.OpenGL.GL.CoordTrans + Graphics.Rendering.OpenGL.GL.DebugOutput + Graphics.Rendering.OpenGL.GL.DisplayLists + Graphics.Rendering.OpenGL.GL.Evaluators + Graphics.Rendering.OpenGL.GL.Feedback + Graphics.Rendering.OpenGL.GL.FlushFinish + Graphics.Rendering.OpenGL.GL.Fog + Graphics.Rendering.OpenGL.GL.Framebuffer + Graphics.Rendering.OpenGL.GL.FramebufferObjects + Graphics.Rendering.OpenGL.GL.FramebufferObjects.Attachments + Graphics.Rendering.OpenGL.GL.FramebufferObjects.FramebufferObjects + Graphics.Rendering.OpenGL.GL.FramebufferObjects.Queries + Graphics.Rendering.OpenGL.GL.FramebufferObjects.RenderbufferObjects + Graphics.Rendering.OpenGL.GL.Hints + Graphics.Rendering.OpenGL.GL.LineSegments + Graphics.Rendering.OpenGL.GL.PerFragment + Graphics.Rendering.OpenGL.GL.PixelRectangles + Graphics.Rendering.OpenGL.GL.PixelRectangles.ColorTable + Graphics.Rendering.OpenGL.GL.PixelRectangles.Convolution + Graphics.Rendering.OpenGL.GL.PixelRectangles.Histogram + Graphics.Rendering.OpenGL.GL.PixelRectangles.Minmax + Graphics.Rendering.OpenGL.GL.PixelRectangles.PixelMap + Graphics.Rendering.OpenGL.GL.PixelRectangles.PixelStorage + Graphics.Rendering.OpenGL.GL.PixelRectangles.PixelTransfer + Graphics.Rendering.OpenGL.GL.PixelRectangles.Rasterization + Graphics.Rendering.OpenGL.GL.PixellikeObject + Graphics.Rendering.OpenGL.GL.Points + Graphics.Rendering.OpenGL.GL.Polygons + Graphics.Rendering.OpenGL.GL.PrimitiveMode + Graphics.Rendering.OpenGL.GL.QueryObjects + Graphics.Rendering.OpenGL.GL.RasterPos + Graphics.Rendering.OpenGL.GL.ReadCopyPixels + Graphics.Rendering.OpenGL.GL.Rectangles + Graphics.Rendering.OpenGL.GL.SavingState + Graphics.Rendering.OpenGL.GL.Selection + Graphics.Rendering.OpenGL.GL.Shaders + Graphics.Rendering.OpenGL.GL.Shaders.Attribs + Graphics.Rendering.OpenGL.GL.Shaders.Limits + Graphics.Rendering.OpenGL.GL.Shaders.ProgramBinaries + Graphics.Rendering.OpenGL.GL.Shaders.ProgramObjects + Graphics.Rendering.OpenGL.GL.Shaders.ShaderBinaries + Graphics.Rendering.OpenGL.GL.Shaders.ShaderObjects + Graphics.Rendering.OpenGL.GL.Shaders.Uniform + Graphics.Rendering.OpenGL.GL.StringQueries + Graphics.Rendering.OpenGL.GL.SyncObjects + Graphics.Rendering.OpenGL.GL.Tensor + Graphics.Rendering.OpenGL.GL.Texturing + Graphics.Rendering.OpenGL.GL.Texturing.Application + Graphics.Rendering.OpenGL.GL.Texturing.Environments + Graphics.Rendering.OpenGL.GL.Texturing.Objects + Graphics.Rendering.OpenGL.GL.Texturing.Parameters + Graphics.Rendering.OpenGL.GL.Texturing.Queries + Graphics.Rendering.OpenGL.GL.Texturing.Specification + Graphics.Rendering.OpenGL.GL.TransformFeedback + Graphics.Rendering.OpenGL.GL.VertexArrayObjects + Graphics.Rendering.OpenGL.GL.VertexArrays + Graphics.Rendering.OpenGL.GL.VertexSpec + Graphics.Rendering.OpenGL.GLU + Graphics.Rendering.OpenGL.GLU.Errors + Graphics.Rendering.OpenGL.GLU.Initialization + Graphics.Rendering.OpenGL.GLU.Matrix + Graphics.Rendering.OpenGL.GLU.Mipmapping + Graphics.Rendering.OpenGL.GLU.NURBS + Graphics.Rendering.OpenGL.GLU.Quadrics + Graphics.Rendering.OpenGL.GLU.Tessellation + other-modules: + Graphics.Rendering.OpenGL.GL.BlendingFactor + Graphics.Rendering.OpenGL.GL.BufferMode + Graphics.Rendering.OpenGL.GL.ByteString + Graphics.Rendering.OpenGL.GL.Capability + Graphics.Rendering.OpenGL.GL.ComparisonFunction + Graphics.Rendering.OpenGL.GL.ControlPoint + Graphics.Rendering.OpenGL.GL.DataType + Graphics.Rendering.OpenGL.GL.Domain + Graphics.Rendering.OpenGL.GL.EdgeFlag + Graphics.Rendering.OpenGL.GL.Exception + Graphics.Rendering.OpenGL.GL.Face + Graphics.Rendering.OpenGL.GL.FramebufferObjects.FramebufferObject + Graphics.Rendering.OpenGL.GL.FramebufferObjects.FramebufferObjectAttachment + Graphics.Rendering.OpenGL.GL.FramebufferObjects.FramebufferTarget + Graphics.Rendering.OpenGL.GL.FramebufferObjects.RenderbufferObject + Graphics.Rendering.OpenGL.GL.FramebufferObjects.RenderbufferTarget + Graphics.Rendering.OpenGL.GL.GLboolean + Graphics.Rendering.OpenGL.GL.IOState + Graphics.Rendering.OpenGL.GL.MatrixComponent + Graphics.Rendering.OpenGL.GL.PeekPoke + Graphics.Rendering.OpenGL.GL.PixelData + Graphics.Rendering.OpenGL.GL.PixelFormat + Graphics.Rendering.OpenGL.GL.PixelRectangles.Reset + Graphics.Rendering.OpenGL.GL.PixelRectangles.Sink + Graphics.Rendering.OpenGL.GL.PointParameter + Graphics.Rendering.OpenGL.GL.PolygonMode + Graphics.Rendering.OpenGL.GL.PrimitiveModeInternal + Graphics.Rendering.OpenGL.GL.QueryObject + Graphics.Rendering.OpenGL.GL.QueryUtils + Graphics.Rendering.OpenGL.GL.QueryUtils.PName + Graphics.Rendering.OpenGL.GL.QueryUtils.VertexAttrib + Graphics.Rendering.OpenGL.GL.RenderMode + Graphics.Rendering.OpenGL.GL.Shaders.Program + Graphics.Rendering.OpenGL.GL.Shaders.Shader + Graphics.Rendering.OpenGL.GL.Shaders.Variables + Graphics.Rendering.OpenGL.GL.Texturing.Filter + Graphics.Rendering.OpenGL.GL.Texturing.PixelInternalFormat + Graphics.Rendering.OpenGL.GL.Texturing.TexParameter + Graphics.Rendering.OpenGL.GL.Texturing.TextureObject + Graphics.Rendering.OpenGL.GL.Texturing.TextureTarget + Graphics.Rendering.OpenGL.GL.Texturing.TextureUnit + Graphics.Rendering.OpenGL.GL.VertexAttributes + Graphics.Rendering.OpenGL.GLU.ErrorsInternal + hs-source-dirs: src + ghc-options: -Wall + if impl(ghc > 8) + ghc-options: -Wcompat + build-depends: + base >= 3 && < 5, + bytestring >= 0.9 && < 0.11, + containers >= 0.3 && < 0.7, + text >= 0.1 && < 1.3, + transformers >= 0.2 && < 0.6, + ObjectName >= 1.1 && < 1.2, + StateVar >= 1.1 && < 1.3, + OpenGLRaw >= 3.0 && < 3.4, + GLURaw >= 2.0 && < 2.1 + default-language: Haskell2010 + other-extensions: + CPP + DeriveDataTypeable + KindSignatures + TypeSynonymInstances + if os(windows) + if arch(i386) + cpp-options: "-DCALLCONV=stdcall" + else + cpp-options: "-DCALLCONV=ccall" + else + cpp-options: "-DCALLCONV=ccall" + +source-repository head + type: git + location: https://github.com/haskell-opengl/OpenGL.git diff --git a/dead.package b/dead.package deleted file mode 100644 index 6dee5e4..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -obsoleted by haskell-platform subpackage diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec new file mode 100644 index 0000000..b2d2f3b --- /dev/null +++ b/ghc-OpenGL.spec @@ -0,0 +1,121 @@ +# generated by cabal-rpm-2.0.10 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ + +%global pkg_name OpenGL +%global pkgver %{pkg_name}-%{version} + +Name: ghc-%{pkg_name} +Version: 3.0.3.0 +Release: 1%{?dist} +Summary: A binding for the OpenGL graphics system + +License: BSD +Url: https://hackage.haskell.org/package/%%7Bpkg_name%7D +# Begin cabal-rpm sources: +Source0: https://hackage.haskell.org/package/%%7Bpkgver%7D/%%7Bpkgver%7D.tar.gz +Source1: https://hackage.haskell.org/package/%%7Bpkgver%7D/%%7Bpkg_name%7D.cabal#/%%7... +# End cabal-rpm sources + +# Begin cabal-rpm deps: +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +BuildRequires: ghc-GLURaw-prof +BuildRequires: ghc-ObjectName-prof +BuildRequires: ghc-OpenGLRaw-prof +BuildRequires: ghc-StateVar-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-transformers-prof +# End cabal-rpm deps + +%description +A Haskell binding for the OpenGL graphics system (GL, version 4.6) and its +accompanying utility library (GLU, version 1.3). + +OpenGL is the industry's most widely used and supported 2D and 3D graphics +application programming interface (API), incorporating a broad set of +rendering, texture mapping, special effects, and other powerful visualization +functions. For more information about OpenGL and its various extensions, please +see http://www.opengl.org/ and http://www.opengl.org/registry/. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} +%if %{defined ghc_version} +Requires: ghc-compiler = %{ghc_version} +%endif +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. + + +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch +Requires: ghc-filesystem + +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif + + +%prep +# Begin cabal-rpm setup: +%setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal +# End cabal-rpm setup + + +%build +# Begin cabal-rpm build: +%ghc_lib_build +# End cabal-rpm build + + +%install +# Begin cabal-rpm install +%ghc_lib_install +# End cabal-rpm install + + +%files -f %{name}.files +# Begin cabal-rpm files: +%license LICENSE +# End cabal-rpm files + + +%files devel -f %{name}-devel.files +%doc CHANGELOG.md README.md + + +%if %{with haddock} +%files doc -f %{name}-doc.files +%license LICENSE +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + +%changelog +* Wed Jul 14 2021 Jens Petersen petersen@redhat.com - 3.0.3.0-1 +- spec file generated by cabal-rpm-2.0.10 diff --git a/sources b/sources new file mode 100644 index 0000000..5c1271c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (OpenGL-3.0.3.0.tar.gz) = 1ccd11095d5d36346bd22c8ebeab3b9bcb267744d6c3ddfe3c76dc2ed620493d688353a778454a053c710464db0de8228823a95f63dfae5784c2f1ca931b0ae9
commit 98c42c863b22515720bc1ceb746e88f9c97c1c2e Author: Jens Petersen petersen@redhat.com Date: Mon Jul 16 09:34:07 2012 +0900
obsoleted by haskell-platform subpackage
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 000a68c..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -OpenGL-2.2.3.0.tar.gz -/OpenGL-2.2.3.1.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..6dee5e4 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +obsoleted by haskell-platform subpackage diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec deleted file mode 100644 index 81d68cc..0000000 --- a/ghc-OpenGL.spec +++ /dev/null @@ -1,122 +0,0 @@ -# cabal2spec-0.25.2 -# https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell - -%global pkg_name OpenGL - -%global common_summary Haskell %{pkg_name} library - -%global common_description Haskell bindings to the OpenGL graphics library. - -Name: ghc-%{pkg_name} -# part of haskell-platform -Version: 2.2.3.1 -Release: 1%{?dist} -Summary: %{common_summary} - -Group: System Environment/Libraries -License: BSD -# BEGIN cabal2spec -URL: http://hackage.haskell.org/package/%%7Bpkg_name%7D -Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... -ExclusiveArch: %{ghc_arches} -BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec -BuildRequires: ghc-base-prof -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel - -%description -%{common_description} - - -%prep -%setup -q -n %{pkg_name}-%{version} - - -%build -%ghc_lib_build - - -%install -%ghc_lib_install - - -%ghc_devel_package -Requires: mesa-libGL-devel%{?_isa} -Requires: mesa-libGLU-devel%{?_isa} - -%ghc_devel_description - - -%ghc_devel_post_postun - - -%ghc_files LICENSE - - -%changelog -* Tue Mar 20 2012 Jens Petersen petersen@redhat.com - 2.2.3.1-1 -- update to 2.2.3.1 - -* Fri Jan 6 2012 Jens Petersen petersen@redhat.com - 2.2.3.0-12 -- update to cabal2spec-0.25.2 - -* Fri Nov 11 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-11 -- update to cabal2spec-0.24.1 -- append _isa to mesa-libGL*-devel requires - -* Mon Oct 24 2011 Marcela Mašláňová mmaslano@redhat.com - 2.2.3.0-10.3 -- rebuild with new gmp without compat lib - -* Fri Oct 21 2011 Marcela Mašláňová mmaslano@redhat.com - 2.2.3.0-10.2 -- rebuild with new gmp without compat lib - -* Tue Oct 11 2011 Peter Schiffer pschiffe@redhat.com - 2.2.3.0-10.1 -- rebuild with new gmp - -* Tue Jun 21 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-10 -- ghc_arches replaces ghc_excluded_archs - -* Mon Jun 20 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-9 -- BR ghc-Cabal-devel and use ghc_excluded_archs - -* Fri May 27 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-8 -- update to cabal2spec-0.23: add ppc64 - -* Thu Mar 10 2011 Fabio M. Di Nitto fdinitto@redhat.com - 2.2.3.0-7 -- Enable build on sparcv9 - -* Tue Jan 18 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-6 -- update to cabal2spec-0.22.4 - -* Thu Nov 25 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-5 -- drop -o obsoletes - -* Sat Jul 31 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-4 -- ghc-rpm-macros-0.8.1 for doc obsoletes -- part of haskell-platform-2010.2.0.0 -- add hscolour - -* Sat Jun 26 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-3 -- sync cabal2spec-0.22 - -* Tue Apr 27 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-2 -- part of haskell-platform-2010.1.0.0 -- rebuild against ghc-6.12.2 -- condition ghc_lib_package - -* Mon Jan 11 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-1 -- update to 2.2.3.0 (current haskell-platform-2009.3.1) -- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: -- drop doc and prof bcond -- use ghc_lib_package - -* Sat Dec 26 2009 Jens Petersen petersen@redhat.com - 2.2.1.1-2 -- update for ghc-6.12.1: add shared library support -- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0 -- add common_summary and common_description - -* Wed Aug 12 2009 Bryan O'Sullivan bos@serpentine.com - 2.2.1.1-1 -- initial packaging for Fedora created by cabal2spec diff --git a/sources b/sources deleted file mode 100644 index 84ed7c6..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -31c8444c50b511b2bb463319f5fc0456 OpenGL-2.2.3.1.tar.gz
commit bc760c849e77e52dbe1ba74af5f467885cb0174c Author: Jens Petersen petersen@redhat.com Date: Tue Mar 20 17:16:13 2012 +0900
update to 2.2.3.1
diff --git a/.gitignore b/.gitignore index 67bc7f0..000a68c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ OpenGL-2.2.3.0.tar.gz +/OpenGL-2.2.3.1.tar.gz diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index ed81e8b..81d68cc 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -9,9 +9,9 @@ %global common_description Haskell bindings to the OpenGL graphics library.
Name: ghc-%{pkg_name} -# part of haskell-platform-2011.4.0.0 -Version: 2.2.3.0 -Release: 12%{?dist} +# part of haskell-platform +Version: 2.2.3.1 +Release: 1%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries @@ -53,10 +53,13 @@ Requires: mesa-libGLU-devel%{?_isa} %ghc_devel_post_postun
-%ghc_files +%ghc_files LICENSE
%changelog +* Tue Mar 20 2012 Jens Petersen petersen@redhat.com - 2.2.3.1-1 +- update to 2.2.3.1 + * Fri Jan 6 2012 Jens Petersen petersen@redhat.com - 2.2.3.0-12 - update to cabal2spec-0.25.2
diff --git a/sources b/sources index 3acc5a6..84ed7c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4e3ccb471034a6a74921d4dab9dd32d OpenGL-2.2.3.0.tar.gz +31c8444c50b511b2bb463319f5fc0456 OpenGL-2.2.3.1.tar.gz
commit e9c03c898745a8d2ca656147efa79821d14e42d0 Author: Jens Petersen petersen@redhat.com Date: Fri Jan 6 17:40:26 2012 +0900
update to cabal2spec-0.25.2
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 0f5c080..ed81e8b 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -1,3 +1,7 @@ +# cabal2spec-0.25.2 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name OpenGL
%global common_summary Haskell %{pkg_name} library @@ -5,9 +9,9 @@ %global common_description Haskell bindings to the OpenGL graphics library.
Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.1 +# part of haskell-platform-2011.4.0.0 Version: 2.2.3.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries @@ -17,10 +21,7 @@ URL: http://hackage.haskell.org/package/%%7Bpkg_name%7D Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -%if %{undefined without_hscolour} -BuildRequires: hscolour -%endif +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec BuildRequires: ghc-base-prof BuildRequires: mesa-libGL-devel @@ -30,23 +31,6 @@ BuildRequires: mesa-libGLU-devel %{common_description}
-%package -n ghc-%{pkg_name}-devel -Summary: Development files for %{common_summary} -Group: Development/Libraries -# BEGIN cabal2spec -%{?ghc_devel_requires} -Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} -Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END cabal2spec -Requires: mesa-libGL-devel%{?_isa} -Requires: mesa-libGLU-devel%{?_isa} - -%description -n ghc-%{pkg_name}-devel -%{common_description} - -This package contains the development files. - - %prep %setup -q -n %{pkg_name}-%{version}
@@ -59,23 +43,23 @@ This package contains the development files. %ghc_lib_install
-%post -n ghc-%{pkg_name}-devel -%ghc_pkg_recache - +%ghc_devel_package +Requires: mesa-libGL-devel%{?_isa} +Requires: mesa-libGLU-devel%{?_isa}
-%postun -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +%ghc_devel_description
-%if %{undefined ghc_without_shared} -%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files -%endif +%ghc_devel_post_postun
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files +%ghc_files
%changelog +* Fri Jan 6 2012 Jens Petersen petersen@redhat.com - 2.2.3.0-12 +- update to cabal2spec-0.25.2 + * Fri Nov 11 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-11 - update to cabal2spec-0.24.1 - append _isa to mesa-libGL*-devel requires
commit 757d2db81c487dd9d3124d68e9be392a83cb69f3 Author: Jens Petersen petersen@redhat.com Date: Sat Nov 12 22:01:54 2011 +0900
update to cabal2spec-0.24.1 and append _isa to mesa-libGL*-devel requires
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 79b6de8..0f5c080 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -4,28 +4,49 @@
%global common_description Haskell bindings to the OpenGL graphics library.
-%global ghc_pkg_c_deps mesa-libGL-devel, mesa-libGLU-devel - Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 2.2.3.0 -Release: 10%{?dist}.3 +Release: 11%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries License: BSD -URL: http://www.haskell.org/haskellwiki/Opengl +# BEGIN cabal2spec +URL: http://hackage.haskell.org/package/%%7Bpkg_name%7D Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +%if %{undefined without_hscolour} BuildRequires: hscolour -%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} +%endif +# END cabal2spec +BuildRequires: ghc-base-prof +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel
%description %{common_description}
+%package -n ghc-%{pkg_name}-devel +Summary: Development files for %{common_summary} +Group: Development/Libraries +# BEGIN cabal2spec +%{?ghc_devel_requires} +Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release} +Provides: ghc-%{pkg_name}-prof = %{version}-%{release} +# END cabal2spec +Requires: mesa-libGL-devel%{?_isa} +Requires: mesa-libGLU-devel%{?_isa} + +%description -n ghc-%{pkg_name}-devel +%{common_description} + +This package contains the development files. + + %prep %setup -q -n %{pkg_name}-%{version}
@@ -38,10 +59,27 @@ BuildRequires: hscolour %ghc_lib_install
-%ghc_lib_package +%post -n ghc-%{pkg_name}-devel +%ghc_pkg_recache + + +%postun -n ghc-%{pkg_name}-devel +%ghc_pkg_recache + + +%if %{undefined ghc_without_shared} +%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files +%endif + + +%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
%changelog +* Fri Nov 11 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-11 +- update to cabal2spec-0.24.1 +- append _isa to mesa-libGL*-devel requires + * Mon Oct 24 2011 Marcela Mašláňová mmaslano@redhat.com - 2.2.3.0-10.3 - rebuild with new gmp without compat lib
commit 85826cdb4e3bfca5a6753a2bcbe0bef6e01a44e7 Author: Marcela Mašláňová mmaslano@redhat.com Date: Mon Oct 24 15:00:30 2011 +0200
rebuild with new gmp without compat lib
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index ce0c0aa..79b6de8 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 2.2.3.0 -Release: 10%{?dist}.2 +Release: 10%{?dist}.3 Summary: %{common_summary}
Group: System Environment/Libraries @@ -42,6 +42,9 @@ BuildRequires: hscolour
%changelog +* Mon Oct 24 2011 Marcela Mašláňová mmaslano@redhat.com - 2.2.3.0-10.3 +- rebuild with new gmp without compat lib + * Fri Oct 21 2011 Marcela Mašláňová mmaslano@redhat.com - 2.2.3.0-10.2 - rebuild with new gmp without compat lib
commit 915613095efafd042745daee92c09f400d7fcfe4 Author: Marcela Mašláňová mmaslano@redhat.com Date: Fri Oct 21 02:39:10 2011 +0200
rebuild with new gmp without compat lib
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 10dd833..ce0c0aa 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 2.2.3.0 -Release: 10%{?dist}.1 +Release: 10%{?dist}.2 Summary: %{common_summary}
Group: System Environment/Libraries @@ -42,6 +42,9 @@ BuildRequires: hscolour
%changelog +* Fri Oct 21 2011 Marcela Mašláňová mmaslano@redhat.com - 2.2.3.0-10.2 +- rebuild with new gmp without compat lib + * Tue Oct 11 2011 Peter Schiffer pschiffe@redhat.com - 2.2.3.0-10.1 - rebuild with new gmp
commit aa7a69dc7c00713d69997d487b4c4a49340f82bd Author: Marcela Mašláňová mmaslano@redhat.com Date: Tue Oct 11 17:32:59 2011 +0200
rebuild with new gmp
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index cc99c79..10dd833 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 2.2.3.0 -Release: 10%{?dist} +Release: 10%{?dist}.1 Summary: %{common_summary}
Group: System Environment/Libraries @@ -42,6 +42,9 @@ BuildRequires: hscolour
%changelog +* Tue Oct 11 2011 Peter Schiffer pschiffe@redhat.com - 2.2.3.0-10.1 +- rebuild with new gmp + * Tue Jun 21 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-10 - ghc_arches replaces ghc_excluded_archs
commit 858ecd2f571e5e35673df1c2a570ab0c652a39c0 Author: Jens Petersen petersen@redhat.com Date: Tue Jun 21 16:56:10 2011 +0900
ghc_arches replaces ghc_excluded_archs (cabal2spec-0.23.2)
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 8aa485b..cc99c79 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -9,15 +9,14 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2011.2.0.1 Version: 2.2.3.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries License: BSD URL: http://www.haskell.org/haskellwiki/Opengl Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... -# ghc_excluded_archs is defined in redhat-rpm-config -ExcludeArch: %{ghc_excluded_archs} +ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour @@ -43,6 +42,9 @@ BuildRequires: hscolour
%changelog +* Tue Jun 21 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-10 +- ghc_arches replaces ghc_excluded_archs + * Mon Jun 20 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-9 - BR ghc-Cabal-devel and use ghc_excluded_archs
commit c628be9f19e6d667fa84897005f08e78ab3b4e6a Author: Jens Petersen petersen@redhat.com Date: Mon Jun 20 11:03:39 2011 +0900
BR ghc-Cabal-devel and use ghc_excluded_archs
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 228f944..8aa485b 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -7,18 +7,18 @@ %global ghc_pkg_c_deps mesa-libGL-devel, mesa-libGLU-devel
Name: ghc-%{pkg_name} -# part of haskell-platform-2011.2.0.0 +# part of haskell-platform-2011.2.0.1 Version: 2.2.3.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries License: BSD URL: http://www.haskell.org/haskellwiki/Opengl Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 -BuildRequires: ghc-prof +# ghc_excluded_archs is defined in redhat-rpm-config +ExcludeArch: %{ghc_excluded_archs} +BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} @@ -43,6 +43,9 @@ BuildRequires: hscolour
%changelog +* Mon Jun 20 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-9 +- BR ghc-Cabal-devel and use ghc_excluded_archs + * Fri May 27 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-8 - update to cabal2spec-0.23: add ppc64
commit b71e57a9f92eb253fc41ec0f6880a3fb55951eb2 Author: Jens Petersen petersen@redhat.com Date: Fri May 27 17:54:32 2011 +0900
update to cabal2spec-0.23: add ppc64
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index e0d536c..228f944 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -6,13 +6,10 @@
%global ghc_pkg_c_deps mesa-libGL-devel, mesa-libGLU-devel
-# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} -# part of haskell-platform-2010.2.0.0 +# part of haskell-platform-2011.2.0.0 Version: 2.2.3.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries @@ -20,17 +17,14 @@ License: BSD URL: http://www.haskell.org/haskellwiki/Opengl Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.3 +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 +BuildRequires: ghc-prof +BuildRequires: ghc-rpm-macros BuildRequires: hscolour %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
%description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif
%prep @@ -49,6 +43,9 @@ This package provides the shared library.
%changelog +* Fri May 27 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-8 +- update to cabal2spec-0.23: add ppc64 + * Thu Mar 10 2011 Fabio M. Di Nitto fdinitto@redhat.com - 2.2.3.0-7 - Enable build on sparcv9
commit cce684a3e33a6b15178b55f79ead08d2fdfc81a4 Author: Fabio M. Di Nitto fdinitto@redhat.com Date: Thu Mar 10 09:15:38 2011 +0100
Enable build on sparcv9
Signed-off-by: Fabio M. Di Nitto fdinitto@redhat.com
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index cb4815a..e0d536c 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 2.2.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries @@ -20,7 +20,7 @@ License: BSD URL: http://www.haskell.org/haskellwiki/Opengl Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour @@ -49,6 +49,9 @@ This package provides the shared library.
%changelog +* Thu Mar 10 2011 Fabio M. Di Nitto fdinitto@redhat.com - 2.2.3.0-7 +- Enable build on sparcv9 + * Tue Jan 18 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-6 - update to cabal2spec-0.22.4
commit 2a5a8be835640861c5666bece3f73df7697875da Author: Jens Petersen petersen@redhat.com Date: Tue Jan 18 18:33:45 2011 +1000
update to cabal2spec-0.22.4
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 604e11a..cb4815a 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -6,30 +6,24 @@
%global ghc_pkg_c_deps mesa-libGL-devel, mesa-libGLU-devel
-%bcond_without shared -%bcond_without hscolour - # debuginfo is not useful for ghc %global debug_package %{nil}
Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 2.2.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries License: BSD URL: http://www.haskell.org/haskellwiki/Opengl Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.8.1 -%if %{with hscolour} +BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour -%endif %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
%description @@ -48,18 +42,16 @@ This package provides the shared library.
%install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install
-%clean -rm -rf $RPM_BUILD_ROOT - - %ghc_lib_package
%changelog +* Tue Jan 18 2011 Jens Petersen petersen@redhat.com - 2.2.3.0-6 +- update to cabal2spec-0.22.4 + * Thu Nov 25 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-5 - drop -o obsoletes
commit 3638dd7b65224979a138b40b1067bc1e862e0c20 Author: Jens Petersen petersen@redhat.com Date: Thu Nov 25 18:28:24 2010 +1000
drop -o obsoletes
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 4ac6d38..604e11a 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -15,7 +15,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.2.0.0 Version: 2.2.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries @@ -56,10 +56,13 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
-%ghc_lib_package -o 2.2.3.0-4 +%ghc_lib_package
%changelog +* Thu Nov 25 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-5 +- drop -o obsoletes + * Sat Jul 31 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-4 - ghc-rpm-macros-0.8.1 for doc obsoletes - part of haskell-platform-2010.2.0.0
commit 6e57552c586cc6fc705ecae4581e86900487817d Author: Jens Petersen petersen@redhat.com Date: Sun Aug 1 00:37:52 2010 +1000
- ghc-rpm-macros-0.8.1 for doc obsoletes - part of haskell-platform-2010.2.0.0 - add hscolour
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index a80fc5b..4ac6d38 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -7,14 +7,15 @@ %global ghc_pkg_c_deps mesa-libGL-devel, mesa-libGLU-devel
%bcond_without shared +%bcond_without hscolour
# debuginfo is not useful for ghc %global debug_package %{nil}
Name: ghc-%{pkg_name} -# part of haskell-platform-2010.1.0.0 +# part of haskell-platform-2010.2.0.0 Version: 2.2.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries @@ -25,7 +26,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.0 +BuildRequires: ghc-rpm-macros >= 0.8.1 +%if %{with hscolour} +BuildRequires: hscolour +%endif %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
%description @@ -35,9 +39,6 @@ This package provides the shared library. %endif
-%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version}
@@ -55,7 +56,15 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
+%ghc_lib_package -o 2.2.3.0-4 + + %changelog +* Sat Jul 31 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-4 +- ghc-rpm-macros-0.8.1 for doc obsoletes +- part of haskell-platform-2010.2.0.0 +- add hscolour + * Sat Jun 26 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-3 - sync cabal2spec-0.22
commit f86197d7696081a26b85df34d2ef53b2759b7413 Author: Fedora Release Engineering rel-eng@lists.fedoraproject.org Date: Wed Jul 28 15:34:07 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c5fc03e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ghc-OpenGL -# $Id$ -NAME := ghc-OpenGL -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON)
commit 9c0142b08474efb41e17a280751a264945999292 Author: Jens Petersen petersen@fedoraproject.org Date: Sat Jun 26 13:31:29 2010 +0000
sync cabal2spec-0.22
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 8d00d77..a80fc5b 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -14,18 +14,18 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.1.0.0 Version: 2.2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries License: BSD URL: http://www.haskell.org/haskellwiki/Opengl Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 -BuildRequires: ghc-doc -BuildRequires: ghc-prof +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.7.0 %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
%description @@ -43,16 +43,12 @@ This package provides the shared library.
%build -%cabal_configure --ghc -p -%cabal build -%cabal haddock +%ghc_lib_build
%install -%cabal_install -%cabal_pkg_conf - -%ghc_gen_filelists +rm -rf $RPM_BUILD_ROOT +%ghc_lib_install
%clean @@ -60,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog +* Sat Jun 26 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-3 +- sync cabal2spec-0.22 + * Tue Apr 27 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-2 - part of haskell-platform-2010.1.0.0 - rebuild against ghc-6.12.2
commit 9cd5ec76343f42cdef40a73165f6af0679f7dc94 Author: Jens Petersen petersen@fedoraproject.org Date: Tue Apr 27 02:32:38 2010 +0000
- part of haskell-platform-2010.1.0.0 - rebuild against ghc-6.12.2 - condition ghc_lib_package
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 9c863e0..8d00d77 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -12,9 +12,9 @@ %global debug_package %{nil}
Name: ghc-%{pkg_name} -# part of haskell-platform-2009.3.1 +# part of haskell-platform-2010.1.0.0 Version: 2.2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries @@ -26,7 +26,6 @@ ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc BuildRequires: ghc-prof -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/(ghc-[^, ]+)-devel/\1-doc,\1-prof/g")} %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
%description @@ -36,7 +35,7 @@ This package provides the shared library. %endif
-%ghc_lib_package +%{?ghc_lib_package}
%prep @@ -61,6 +60,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog +* Tue Apr 27 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-2 +- part of haskell-platform-2010.1.0.0 +- rebuild against ghc-6.12.2 +- condition ghc_lib_package + * Mon Jan 11 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-1 - update to 2.2.3.0 (current haskell-platform-2009.3.1) - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
commit c7fd27ffcff16096dcaf52dc58e94975912ab11a Author: Jens Petersen petersen@fedoraproject.org Date: Mon Jan 11 04:26:26 2010 +0000
- update to 2.2.3.0 (current haskell-platform-2009.3.1) - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: - drop doc and prof bcond - use ghc_lib_package
diff --git a/.cvsignore b/.cvsignore index f87e29d..67bc7f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -OpenGL-2.2.1.1.tar.gz +OpenGL-2.2.3.0.tar.gz diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index b4922b9..9c863e0 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -4,17 +4,17 @@
%global common_description Haskell bindings to the OpenGL graphics library.
-%bcond_without doc -%bcond_without prof +%global ghc_pkg_c_deps mesa-libGL-devel, mesa-libGLU-devel + %bcond_without shared
-# ghc does not emit debug information -#%%global debug_package %{nil} +# debuginfo is not useful for ghc +%global debug_package %{nil}
Name: ghc-%{pkg_name} -# part of haskell-platform-2009.2.0.2 -Version: 2.2.1.1 -Release: 2%{?dist} +# part of haskell-platform-2009.3.1 +Version: 2.2.3.0 +Release: 1%{?dist} Summary: %{common_summary}
Group: System Environment/Libraries @@ -23,14 +23,11 @@ URL: http://www.haskell.org/haskellwiki/Opengl Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.4.0 -%if %{with doc} +BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc -%endif -%if %{with prof} BuildRequires: ghc-prof -%endif -BuildRequires: mesa-libGL-devel, mesa-libGLU-devel +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/(ghc-[^, ]+)-devel/\1-doc,\1-prof/g")} +%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
%description %{common_description} @@ -39,42 +36,7 @@ This package provides the shared library. %endif
-%package devel -Summary: %{common_summary} development files -Group: Development/Libraries -%{?ghc_requires} -Requires: mesa-libGL-devel, mesa-libGLU-devel - -%description devel -%{common_description} - -This package contains the development files. - - -%if %{with doc} -%package doc -Summary: Documentation for %{common_summary} -Group: Development/Libraries -%{?ghc_doc_requires} - -%description doc -%{common_description} - -This package contains development documentation files. -%endif - - -%if %{with prof} -%package prof -Summary: Profiling libraries for %{common_summary} -Group: Development/Libraries -%{?ghc_prof_requires} - -%description prof -%{common_description} - -This package contains the profiling library. -%endif +%ghc_lib_package
%prep @@ -82,73 +44,29 @@ This package contains the profiling library.
%build -%cabal_configure --ghc %{?with_prof:-p} +%cabal_configure --ghc -p %cabal build -%if %{with doc} %cabal haddock -%endif
%install %cabal_install %cabal_pkg_conf
-%ghc_gen_filelists %{name} +%ghc_gen_filelists
%clean rm -rf $RPM_BUILD_ROOT
-%post devel -ghc-pkg recache - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%postun devel -ghc-pkg recache - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -fi -%endif - - -%if %{with shared} -%files -f %{name}.files -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} -%endif - - -%files devel -f %{name}-devel.files -%defattr(-,root,root,-) -%if %{without shared} -%{_docdir}/%{name}-%{version} -%endif - - -%if %{with doc} -%files doc -f %{name}-doc.files -%defattr(-,root,root,-) -%endif - - -%if %{with prof} -%files prof -f %{name}-prof.files -%defattr(-,root,root,-) -%endif - - %changelog +* Mon Jan 11 2010 Jens Petersen petersen@redhat.com - 2.2.3.0-1 +- update to 2.2.3.0 (current haskell-platform-2009.3.1) +- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: +- drop doc and prof bcond +- use ghc_lib_package + * Sat Dec 26 2009 Jens Petersen petersen@redhat.com - 2.2.1.1-2 - update for ghc-6.12.1: add shared library support - use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0 diff --git a/sources b/sources index 11ed374..3acc5a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6819d1a6910c9c7cdd387fd51c11b017 OpenGL-2.2.1.1.tar.gz +f4e3ccb471034a6a74921d4dab9dd32d OpenGL-2.2.3.0.tar.gz
commit b7dffd5f140a71cad295cc3b515fa644cf123773 Author: Jens Petersen petersen@fedoraproject.org Date: Fri Dec 25 16:24:32 2009 +0000
- update for ghc-6.12.1: add shared library support - use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0 - add common_summary and common_description
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index e137a56..b4922b9 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -1,75 +1,79 @@ %global pkg_name OpenGL
+%global common_summary Haskell %{pkg_name} library + +%global common_description Haskell bindings to the OpenGL graphics library. + %bcond_without doc %bcond_without prof +%bcond_without shared
# ghc does not emit debug information -%global debug_package %{nil} +#%%global debug_package %{nil}
Name: ghc-%{pkg_name} # part of haskell-platform-2009.2.0.2 Version: 2.2.1.1 -Release: 1%{?dist} -Summary: Haskell %{pkg_name} library +Release: 2%{?dist} +Summary: %{common_summary}
-Group: Development/Libraries +Group: System Environment/Libraries License: BSD URL: http://www.haskell.org/haskellwiki/Opengl Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc -BuildRequires: ghc-rpm-macros -BuildRequires: mesa-libGL-devel, mesa-libGLU-devel +BuildRequires: ghc, ghc-rpm-macros >= 0.4.0 %if %{with doc} BuildRequires: ghc-doc %endif %if %{with prof} BuildRequires: ghc-prof %endif +BuildRequires: mesa-libGL-devel, mesa-libGLU-devel
%description -This package provides the Haskell %{pkg_name} library for ghc. -These provide bindings to the OpenGL graphics library. +%{common_description} +%if %{with shared} +This package provides the shared library. +%endif
%package devel -Summary: Haskell %{pkg_name} library +Summary: %{common_summary} development files Group: Development/Libraries -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(preun): ghc = %{ghc_version} +%{?ghc_requires} Requires: mesa-libGL-devel, mesa-libGLU-devel
%description devel -This package contains the development files for %{name} -built for ghc-%{ghc_version}. +%{common_description} + +This package contains the development files.
%if %{with doc} %package doc -Summary: Documentation for %{name} +Summary: Documentation for %{common_summary} Group: Development/Libraries -Requires: ghc-doc = %{ghc_version} -Requires(post): ghc-doc = %{ghc_version} -Requires(postun): ghc-doc = %{ghc_version} +%{?ghc_doc_requires}
%description doc -This package contains development documentation files for the %{name} library. +%{common_description} + +This package contains development documentation files. %endif
%if %{with prof} %package prof -Summary: Profiling libraries for %{name} +Summary: Profiling libraries for %{common_summary} Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: ghc-prof = %{ghc_version} +%{?ghc_prof_requires}
%description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. +%{common_description} + +This package contains the profiling library. %endif
@@ -83,13 +87,12 @@ built for ghc-%{ghc_version}. %if %{with doc} %cabal haddock %endif -%ghc_gen_scripts
%install -rm -rf $RPM_BUILD_ROOT %cabal_install -%ghc_install_scripts +%cabal_pkg_conf + %ghc_gen_filelists %{name}
@@ -98,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
%post devel -%ghc_register_pkg +ghc-pkg recache
%if %{with doc} @@ -107,10 +110,8 @@ rm -rf $RPM_BUILD_ROOT %endif
-%preun devel -if [ "$1" -eq 0 ] ; then - %ghc_unregister_pkg -fi +%postun devel +ghc-pkg recache
%if %{with doc} @@ -121,9 +122,18 @@ fi %endif
+%if %{with shared} +%files -f %{name}.files +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version} +%endif + + %files devel -f %{name}-devel.files %defattr(-,root,root,-) +%if %{without shared} %{_docdir}/%{name}-%{version} +%endif
%if %{with doc} @@ -139,5 +149,10 @@ fi
%changelog +* Sat Dec 26 2009 Jens Petersen petersen@redhat.com - 2.2.1.1-2 +- update for ghc-6.12.1: add shared library support +- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0 +- add common_summary and common_description + * Wed Aug 12 2009 Bryan O'Sullivan bos@serpentine.com - 2.2.1.1-1 - initial packaging for Fedora created by cabal2spec
commit dcb21fdf1356177f9bba0b6380e58ce20b785ff5 Author: Bill Nottingham notting@fedoraproject.org Date: Wed Nov 25 23:19:25 2009 +0000
Fix typo that causes a failure to update the common directory. (releng #2781)
diff --git a/Makefile b/Makefile index 66c440d..c5fc03e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := ghc-OpenGL SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit 9d676772e5ee5964399ce5fca8740447a83a5112 Author: Jens Petersen petersen@fedoraproject.org Date: Wed Sep 16 09:30:12 2009 +0000
specify the haskell-platform version
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index dead85d..e137a56 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -7,7 +7,7 @@ %global debug_package %{nil}
Name: ghc-%{pkg_name} -# part of haskell-platform +# part of haskell-platform-2009.2.0.2 Version: 2.2.1.1 Release: 1%{?dist} Summary: Haskell %{pkg_name} library
commit bcef0bc873b71494eab7f02b0086233526b0974f Author: Jens Petersen petersen@fedoraproject.org Date: Tue Sep 1 04:01:51 2009 +0000
list C deps on a separate line to keep the spec file closer to template
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index f9d3a81..dead85d 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -37,9 +37,10 @@ These provide bindings to the OpenGL graphics library. %package devel Summary: Haskell %{pkg_name} library Group: Development/Libraries -Requires: ghc = %{ghc_version}, mesa-libGL-devel, mesa-libGLU-devel +Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} +Requires: mesa-libGL-devel, mesa-libGLU-devel
%description devel This package contains the development files for %{name}
commit 38059a56bb3b690940d875052419a2149134a009 Author: Jens Petersen petersen@fedoraproject.org Date: Tue Sep 1 03:46:55 2009 +0000
add haskell-platform annotation comment
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 5c024cb..f9d3a81 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -7,6 +7,7 @@ %global debug_package %{nil}
Name: ghc-%{pkg_name} +# part of haskell-platform Version: 2.2.1.1 Release: 1%{?dist} Summary: Haskell %{pkg_name} library
commit f63f65b7d24ade62f95f0fce53e914f07656b41d Author: Jens Petersen petersen@fedoraproject.org Date: Mon Aug 31 09:34:47 2009 +0000
move mesa BRs to base (src) package
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec index 4e10676..5c024cb 100644 --- a/ghc-OpenGL.spec +++ b/ghc-OpenGL.spec @@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc BuildRequires: ghc-rpm-macros +BuildRequires: mesa-libGL-devel, mesa-libGLU-devel %if %{with doc} BuildRequires: ghc-doc %endif @@ -38,7 +39,6 @@ Group: Development/Libraries Requires: ghc = %{ghc_version}, mesa-libGL-devel, mesa-libGLU-devel Requires(post): ghc = %{ghc_version} Requires(preun): ghc = %{ghc_version} -BuildRequires: mesa-libGL-devel, mesa-libGLU-devel
%description devel This package contains the development files for %{name}
commit 6bbef4ccb268e40b2e3f75095e912a394c8593e0 Author: Bryan O'Sullivan bos@fedoraproject.org Date: Thu Aug 27 19:51:56 2009 +0000
ghc-OpenGL 2.2.1.1
diff --git a/.cvsignore b/.cvsignore index e69de29..f87e29d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +OpenGL-2.2.1.1.tar.gz diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec new file mode 100644 index 0000000..4e10676 --- /dev/null +++ b/ghc-OpenGL.spec @@ -0,0 +1,141 @@ +%global pkg_name OpenGL + +%bcond_without doc +%bcond_without prof + +# ghc does not emit debug information +%global debug_package %{nil} + +Name: ghc-%{pkg_name} +Version: 2.2.1.1 +Release: 1%{?dist} +Summary: Haskell %{pkg_name} library + +Group: Development/Libraries +License: BSD +URL: http://www.haskell.org/haskellwiki/Opengl +Source0: http://hackage.haskell.org/packages/archive/%%7Bpkg_name%7D/%%7Bversion%7D/%... +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha +BuildRequires: ghc +BuildRequires: ghc-rpm-macros +%if %{with doc} +BuildRequires: ghc-doc +%endif +%if %{with prof} +BuildRequires: ghc-prof +%endif + +%description +This package provides the Haskell %{pkg_name} library for ghc. +These provide bindings to the OpenGL graphics library. + + +%package devel +Summary: Haskell %{pkg_name} library +Group: Development/Libraries +Requires: ghc = %{ghc_version}, mesa-libGL-devel, mesa-libGLU-devel +Requires(post): ghc = %{ghc_version} +Requires(preun): ghc = %{ghc_version} +BuildRequires: mesa-libGL-devel, mesa-libGLU-devel + +%description devel +This package contains the development files for %{name} +built for ghc-%{ghc_version}. + + +%if %{with doc} +%package doc +Summary: Documentation for %{name} +Group: Development/Libraries +Requires: ghc-doc = %{ghc_version} +Requires(post): ghc-doc = %{ghc_version} +Requires(postun): ghc-doc = %{ghc_version} + +%description doc +This package contains development documentation files for the %{name} library. +%endif + + +%if %{with prof} +%package prof +Summary: Profiling libraries for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: ghc-prof = %{ghc_version} + +%description prof +This package contains profiling libraries for %{name} +built for ghc-%{ghc_version}. +%endif + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%cabal_configure --ghc %{?with_prof:-p} +%cabal build +%if %{with doc} +%cabal haddock +%endif +%ghc_gen_scripts + + +%install +rm -rf $RPM_BUILD_ROOT +%cabal_install +%ghc_install_scripts +%ghc_gen_filelists %{name} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post devel +%ghc_register_pkg + + +%if %{with doc} +%post doc +%ghc_reindex_haddock +%endif + + +%preun devel +if [ "$1" -eq 0 ] ; then + %ghc_unregister_pkg +fi + + +%if %{with doc} +%postun doc +if [ "$1" -eq 0 ] ; then + %ghc_reindex_haddock +fi +%endif + + +%files devel -f %{name}-devel.files +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version} + + +%if %{with doc} +%files doc -f %{name}-doc.files +%defattr(-,root,root,-) +%endif + + +%if %{with prof} +%files prof -f %{name}-prof.files +%defattr(-,root,root,-) +%endif + + +%changelog +* Wed Aug 12 2009 Bryan O'Sullivan bos@serpentine.com - 2.2.1.1-1 +- initial packaging for Fedora created by cabal2spec diff --git a/sources b/sources index e69de29..11ed374 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6819d1a6910c9c7cdd387fd51c11b017 OpenGL-2.2.1.1.tar.gz
arch-excludes@lists.fedoraproject.org