rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.22, 1.23 ghc-rpm-macros.spec, 1.25, 1.26
Jens Petersen
petersen at fedoraproject.org
Thu Jun 24 02:13:22 UTC 2010
Author: petersen
Update of /cvs/pkgs/rpms/ghc-rpm-macros/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23647
Modified Files:
ghc-rpm-macros.ghc ghc-rpm-macros.spec
Log Message:
- drop the summary -s and description -d package options since rpm does not
seem to allow white\ space in macro option args anyway
Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ghc-rpm-macros.ghc 23 Jun 2010 10:24:53 -0000 1.22
+++ ghc-rpm-macros.ghc 24 Jun 2010 02:13:22 -0000 1.23
@@ -92,18 +92,18 @@ Requires: ghc-%{-n:%{-n*}}%{!-n:%{
%ghc_package_prof\
%{nil}
-# ghc_binlib_package [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version] [-s summary] [-d description]
+# ghc_binlib_package [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version]
%ghc_binlib_package(n:c:h:l:v:s:d:)\
%define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
%define ghc_pkg_name ghc-%{local_pkg_name}\
%package -n %{ghc_pkg_name}\
-Summary: %{-s:%{-s*}}%{!-s:%{?common_summary}%{!?common_summary:%{local_pkg_name}}}\
+Summary: %{?common_summary}%{!?common_summary:%{local_pkg_name} library}\
Group: System Environment/Libraries\
%{-v:Version: %{-v*}}\
%{-l:License: %{-l*}}\
\
%description -n %{ghc_pkg_name}\
-%{-d:%{-d*}}%{!-d:%{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}}\
+%{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}\
\
This package provides the shared library.\
\
@@ -115,12 +115,12 @@ This package provides the shared library
# for docs post and postun
%ghc_reindex_haddock ( cd %{ghcdocbasedir}/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
-# ghc_package_devel [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version] [-s summary] [-d description]
+# ghc_package_devel [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version]
%ghc_package_devel(n:c:h:l:v:s:d:)\
%define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
%define ghc_pkg_name ghc-%{local_pkg_name}\
%package -n %{ghc_pkg_name}-devel\
-Summary: %{-s:%{-s*}}%{!-s:%{?common_summary}%{!?common_summary:%{local_pkg_name}}} development files\
+Summary: %{?common_summary}%{!?common_summary:%{local_pkg_name}} development files\
Group: Development/Libraries\
%{-v:Version: %{-v*}}\
%{-l:License: %{-l*}}\
@@ -131,7 +131,7 @@ Group: Development/Libraries\
%{-c:Requires: %{-c*}}\
\
%description -n %{ghc_pkg_name}-devel\
-%{-d:%{-d*}}%{!-d:%{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}}\
+%{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}\
\
This package contains the development files.\
\
@@ -148,12 +148,12 @@ This package contains the development fi
# re-index haddock
%ghc_reindex_haddock ( cd %{ghcdocbasedir}/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
-# ghc_package_doc [-n pkgname] [-h pkgdepslist] [-l licensetag] [-v version] [-s summary] [-d description]
+# ghc_package_doc [-n pkgname] [-h pkgdepslist] [-l licensetag] [-v version]
%ghc_package_doc(n:h:l:v:s:d:)\
%define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
%define ghc_pkg_name ghc-%{local_pkg_name}\
%package -n %{ghc_pkg_name}-doc\
-Summary: Documentation for %{-s:%{-s*}}%{!-s:%{?common_summary}%{!?common_summary:%{local_pkg_name}}}\
+Summary: Documentation for %{?common_summary}%{!?common_summary:%{local_pkg_name}}\
Group: Development/Libraries\
%{-v:Version: %{-v*}}\
%{-l:License: %{-l*}}\
@@ -162,7 +162,7 @@ Group: Development/Libraries\
%{-h:Requires: %(echo %{-h*} | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-doc/g")}\
\
%description -n %{ghc_pkg_name}-doc\
-%{-d:%{-d*}}%{!-d:%{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}}\
+%{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}\
\
This package contains development documentation files.\
\
@@ -178,12 +178,12 @@ fi\
%defattr(-,root,root,-)\
%{nil}
-# ghc_package_prof [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version] [-s summary] [-d description]
+# ghc_package_prof [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version]
%ghc_package_prof(n:h:l:v:s:d:)\
%define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
%define ghc_pkg_name ghc-%{local_pkg_name}\
%package -n %{ghc_pkg_name}-prof\
-Summary: Profiling libraries for %{-s:%{-s*}}%{!-s:%{?common_summary}%{!?common_summary:%{local_pkg_name}}}\
+Summary: Profiling libraries for %{?common_summary}%{!?common_summary:%{local_pkg_name}}\
Group: Development/Libraries\
%{-v:Version: %{-v*}}\
%{-l:License: %{-l*}}\
@@ -192,7 +192,7 @@ Group: Development/Libraries\
%{-h:Requires: %(echo %{-h*} | sed -e "s/\\(ghc-[^, ]*\\)-devel/\\1-prof/g")}\
\
%description -n %{ghc_pkg_name}-prof\
-%{-d:%{-d*}}%{!-d:%{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}}\
+%{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}\
\
This package contains the profiling library.\
\
Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ghc-rpm-macros.spec 23 Jun 2010 10:24:53 -0000 1.25
+++ ghc-rpm-macros.spec 24 Jun 2010 02:13:22 -0000 1.26
@@ -1,5 +1,5 @@
Name: ghc-rpm-macros
-Version: 0.6.0
+Version: 0.6.1
Release: 1%{?dist}
Summary: Macros for building packages for GHC
@@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 24 2010 Jens Petersen <petersen at redhat.com> - 0.6.1-1
+- drop the summary -s and description -d package options since rpm does not
+ seem to allow white\ space in macro option args anyway
+
* Wed Jun 23 2010 Jens Petersen <petersen at redhat.com> - 0.6.0-1
- make ghc_strip_dynlinked conditional on no debug_package
More information about the scm-commits
mailing list