[gettext] subpackage archive.git.tar.gz to avoid multilib conflicts (#631733)
Jens Petersen
petersen at fedoraproject.org
Thu Sep 9 08:38:50 UTC 2010
commit ed8b437b5f06726e1d1a78ca693c473264324b81
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Sep 9 18:38:53 2010 +1000
subpackage archive.git.tar.gz to avoid multilib conflicts (#631733)
gettext.spec | 24 +++++++++++++++++++++---
msghack.py | 2 +-
2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/gettext.spec b/gettext.spec
index 2e8be86..e33667b 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -6,7 +6,7 @@
Summary: GNU libraries and utilities for producing multi-lingual messages
Name: gettext
Version: 0.18.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv3+ and LGPLv2+
Group: Development/Tools
URL: http://www.gnu.org/software/gettext/
@@ -53,6 +53,17 @@ catalogs and is a powerful and simple method for internationalizing
programs.
+%package common-devel
+Summary: Common development files for %{name}
+Group: Development/Tools
+# autopoint is GPLv3+
+License: GPLv3+
+BuildArch: noarch
+
+%description common-devel
+This package contains common architecture independent gettext development files.
+
+
%package devel
Summary: Development files for %{name}
Group: Development/Tools
@@ -60,6 +71,7 @@ Group: Development/Tools
License: LGPLv2+ and GPLv3+
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common-devel = %{version}-%{release}
Requires(post): info
Requires(preun): info
# for autopoint
@@ -67,7 +79,6 @@ Requires: git
Obsoletes: gettext-autopoint < 0.18.1.1-3
Provides: gettext-autopoint = %{version}-%{release}
-
%description devel
This package contains all development related files necessary for
developing or compiling applications/libraries that needs
@@ -267,11 +278,14 @@ fi
%{_datadir}/%{name}/po
%{_datadir}/%{name}/styles
+%files common-devel
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/archive.*.tar.gz
+
%files devel
%defattr(-,root,root,-)
%doc gettext-runtime/man/*.3.html ChangeLog
%{_bindir}/autopoint
-%{_datadir}/%{name}/archive.*.tar.gz
%{_datadir}/%{name}/projects/
%{_datadir}/%{name}/config.rpath
%{_datadir}/%{name}/*.h
@@ -313,6 +327,10 @@ fi
%{_emacs_sitelispdir}/%{name}/*.el
%changelog
+* Thu Sep 9 2010 Jens Petersen <petersen at redhat.com> - 0.18.1.1-4
+- subpackage archive.git.tar.gz to avoid multilib conflicts (#631733)
+- update msghack.py header
+
* Mon Aug 23 2010 Jens Petersen <petersen at redhat.com> - 0.18.1.1-3
- merge autopoint subpackage into devel to simplify deps (#625325)
- have ABOUT-NLS only in the base package datadir
diff --git a/msghack.py b/msghack.py
index 685b3bc..8d700e9 100755
--- a/msghack.py
+++ b/msghack.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
## -*- coding: utf-8 -*-
-## Copyright (C) 2001 Red Hat, Inc.
+## Copyright (C) 2001, 2008 Red Hat, Inc.
## Copyright (C) 2001 Trond Eivind Glomsrød <teg at redhat.com>
## v0.2 - 2001-08-21
More information about the scm-commits
mailing list