[leksah] update to cabal2spec-0.25 and drop process-leksah BR
Jens Petersen
petersen at fedoraproject.org
Tue Mar 20 13:35:38 UTC 2012
commit 0686b885d253802bb53b756769e273ec687f831d
Author: Jens Petersen <petersen at redhat.com>
Date: Tue Mar 20 22:35:19 2012 +0900
update to cabal2spec-0.25 and drop process-leksah BR
leksah.spec | 120 +++++++++++++++++++++--------------------------------------
1 files changed, 43 insertions(+), 77 deletions(-)
---
diff --git a/leksah.spec b/leksah.spec
index 9cdfb98..10bbf5e 100644
--- a/leksah.spec
+++ b/leksah.spec
@@ -1,23 +1,22 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25.4
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
%global pkg_name leksah
-# common part of summary for all the subpackages
%global common_summary An IDE for Haskell
-# main description used for all the subpackages
%global common_description Leksah is an Integrated Development Environment for \
Haskell written in Haskell. Leksah uses GTK+ as GUI Toolkit.
Name: %{pkg_name}
Version: 0.12.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Haskell IDE
Group: Development/Tools
# LICENSE file is GPLv2 while sources only mention GPL, hence GPL+.
License: GPL+
+# BEGIN cabal2spec
URL: http://hackage.haskell.org/package/%{name}
Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
@@ -25,14 +24,9 @@ Source2: %{name}_loadsession.desktop
Source3: %{name}.xml
ExclusiveArch: %{ghc_arches}
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros
-%if %{undefined without_hscolour}
-BuildRequires: hscolour
-%endif
-# END: cabal2spec-0.24
-# BR any C devel dependency here
-# list ghc-*-prof dependencies:
-BuildRequires: ghc-Cabal-prof, ghc-directory-prof, ghc-gtksourceview2-prof, ghc-old-time-prof, ghc-process-leksah-prof, ghc-regex-tdfa-prof, ghc-utf8-string-prof, ghc-time-prof, ghc-ltk-prof, ghc-binary-shared-prof, ghc-deepseq-prof, ghc-hslogger-prof, ghc-leksah-server-prof, ghc-network-prof, ghc-ghc-prof, ghc-strict-prof, ghc-enumerator-prof, ghc-QuickCheck-prof
+BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires: ghc-Cabal-prof, ghc-directory-prof, ghc-gtksourceview2-prof, ghc-old-time-prof, ghc-regex-tdfa-prof, ghc-utf8-string-prof, ghc-time-prof, ghc-ltk-prof, ghc-binary-shared-prof, ghc-deepseq-prof, ghc-hslogger-prof, ghc-leksah-server-prof, ghc-network-prof, ghc-ghc-prof, ghc-strict-prof, ghc-enumerator-prof, ghc-QuickCheck-prof
BuildRequires: desktop-file-utils
# all requires list
Requires: hicolor-icon-theme
@@ -46,42 +40,6 @@ Patch2: haddock.patch
%{common_description}
-%if %{undefined ghc_without_shared}
-%package -n ghc-%{pkg_name}
-Summary: Development files for %{common_summary}
-Group: Development/Libraries
-# BEGIN: cabal2spec-0.24
-%{?ghc_devel_requires}
-Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides: ghc-%{pkg_name}-prof = %{version}-%{release}
-# END: cabal2spec-0.24
-# remember to require any C devel dependency here
-# Haskell devel dependencies are autogenerated by ghc-deps.sh
-
-%description -n ghc-%{pkg_name}
-%{common_description}
-
-This package contains the shared library.
-%endif
-
-
-%package -n ghc-%{pkg_name}-devel
-Summary: Development files for %{common_summary}
-Group: Development/Libraries
-# BEGIN: cabal2spec-0.24
-%{?ghc_devel_requires}
-Obsoletes: ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides: ghc-%{pkg_name}-prof = %{version}-%{release}
-# END: cabal2spec-0.24
-# remember to require any C devel dependency here
-# Haskell devel dependencies are autogenerated by ghc-deps.sh
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
%prep
%setup -q
%patch1 -p1 -b .orig
@@ -102,38 +60,17 @@ desktop-file-install --add-category="Development" --add-category="X-Development
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
install --mode=0644 -D %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
-
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+# library subpackage
+%ghc_package
+%ghc_description
-%files
-%doc LICENSE
-%attr(755,root,root) %{_bindir}/%{name}
-%dir %{_datadir}/%{name}-%{version}
-%dir %{_datadir}/%{name}-%{version}/data
-%dir %{_datadir}/%{name}-%{version}/pics
-%dir %{_datadir}/%{name}-%{version}/language-specs
-%attr(644,root,root) %{_datadir}/%{name}-%{version}/LICENSE
-%attr(644,root,root) %{_datadir}/%{name}-%{version}/Readme
-%attr(644,root,root) %{_datadir}/%{name}-%{version}/pics/*
-%attr(644,root,root) %{_datadir}/%{name}-%{version}/data/*
-%attr(644,root,root) %{_datadir}/%{name}-%{version}/language-specs/*
-%attr(644,root,root) %{_datadir}/applications/%{name}.desktop
-%attr(644,root,root) %{_datadir}/applications/%{name}_loadsession.desktop
-%attr(644,root,root) %{_datadir}/mime/packages/leksah.xml
-%attr(644,root,root) %{_datadir}/icons/hicolor/128x128/apps/leksah.png
+# devel subpackage
+%ghc_devel_package
-%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
+%ghc_devel_description
%post
@@ -150,11 +87,40 @@ fi
/usr/bin/update-desktop-database &> /dev/null || :
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%ghc_devel_post_postun
+
+
+%files
+%doc LICENSE
+%attr(755,root,root) %{_bindir}/%{name}
+%dir %{_datadir}/%{name}-%{version}
+%dir %{_datadir}/%{name}-%{version}/data
+%dir %{_datadir}/%{name}-%{version}/pics
+%dir %{_datadir}/%{name}-%{version}/language-specs
+%attr(644,root,root) %{_datadir}/%{name}-%{version}/LICENSE
+%attr(644,root,root) %{_datadir}/%{name}-%{version}/Readme
+%attr(644,root,root) %{_datadir}/%{name}-%{version}/pics/*
+%attr(644,root,root) %{_datadir}/%{name}-%{version}/data/*
+%attr(644,root,root) %{_datadir}/%{name}-%{version}/language-specs/*
+%attr(644,root,root) %{_datadir}/applications/%{name}.desktop
+%attr(644,root,root) %{_datadir}/applications/%{name}_loadsession.desktop
+%attr(644,root,root) %{_datadir}/mime/packages/leksah.xml
+%attr(644,root,root) %{_datadir}/icons/hicolor/128x128/apps/leksah.png
+
+
+%ghc_files LICENSE
+
+
%changelog
+* Tue Mar 20 2012 Jens Petersen <petersen at redhat.com> - 0.12.0.3-3
+- update to cabal2spec-0.25
+- drop unnecessary depends on process-leksah
+
* Sun Mar 18 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.0.3-2
- Rebuild for leksah-server update
More information about the scm-commits
mailing list