Hello community,
here is the log from the commit of package mercurial for openSUSE:Factory
checked in at Mon Jul 18 09:53:15 CEST 2011.
--------
--- mercurial/mercurial.changes 2011-07-04 07:10:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/mercurial/mercurial.changes 2011-07-11
15:50:49.000000000 +0200
@@ -0,0 +1,15 @@
+
+-------------------------------------------------------------------
+Mon Jul 11 08:16:23 UTC 2011 - sasc...@suse.de
+
+- Spec file cleanup:
+ * Fixed several rpmlint warnings (macros in comments, exec-bits)
+ * Check for SUSE before using SUSE-specific stuff, fixes build on
+ Fedora, Mandriva
+ * Don't use --record-rpm and drop perl dependency
+ * Drop gcc dependency, already pulled through python-devel
+ * Drop unused asciidoc,sgml-skel,xmlto dependencies
+ * Much simpler lang package generation (no shell scripts involved)
+ * Run fdupes on %{buildroot}%{_prefix} to catch all dupes
+- Added mercurial-locale-path-fix.patch to properly load locales
+
calling whatdependson for head-i586
New:
----
mercurial-locale-path-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mercurial.spec ++++++
--- /var/tmp/diff_new_pack.uSuRzq/_old 2011-07-18 09:46:29.000000000 +0200
+++ /var/tmp/diff_new_pack.uSuRzq/_new 2011-07-18 09:46:29.000000000 +0200
@@ -16,153 +16,113 @@
#
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-%if 0%{?suse_version} >= 1100 && !0%{?sles_version}
-%define with_doc 1
-%endif
-%if 0%{?suse_version} >= 1110
-%define with_lang 1
-%endif
Name: mercurial
Summary: Scalable Distributed SCM
Version: 1.9
-Release: 1
+Release: 2
License: GPLv2+
Group: Development/Tools/Version Control
Url: http://mercurial.selenic.com/
-# http://mercurial.selenic.com/release/mercurial-%{version}.tar.gz
-Source: %{name}-%{version}.tar.gz
+Source:
http://mercurial.selenic.com/release/mercurial-%{version}.tar.gz
Source1: cacerts.rc
Source99: rpmlintrc
-Patch: mercurial-hgk-path-fix.diff
+Patch0: mercurial-hgk-path-fix.diff
+# PATCH-FIX_SLE mercurial-sle10-inotify-fixes.diff --
Patch1: mercurial-sle10-inotify-fixes.diff
+# PATCH-FIX-OPENSUSE mercurial-docutils-compat.diff -- Fix for new docutils
options not available on 11.1 and older
Patch2: mercurial-docutils-compat.diff
+# PATCH-FIX-OPENSUSE mercurial-locale-path-fix.patch sasc...@suse.de --
locales are found in /usr/share/locale
+Patch3: mercurial-locale-path-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc python-devel python-xml
-%if 0%{?with_doc}
-BuildRequires: asciidoc docutils sgml-skel xmlto
+BuildRequires: python-devel
+%if 0%{?fedora_version} || 0%{?suse_version} || 0%{?rhel_version}
+BuildRequires: docutils
+%else
+BuildRequires: python-docutils
%endif
-BuildRequires: perl
+# require rcs for 3-way "merge" command.
+Requires: rcs
+%if 0%{?suse_version}
+BuildRequires: python-xml
+Requires: python-xml
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
-# hgext/hgcia needs python-xml
-Requires: python-xml
-# require rcs for 3-way "merge" command.
-Requires: rcs
%if 0%{?suse_version} >= 1130
Requires: ca-certificates
%endif
-%if 0%{?with_lang}
+%py_requires
Recommends: %{name}-lang
%endif
-%py_requires
Provides: hg = {version}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%description
Mercurial is a fast, lightweight source control management system
designed for efficient handling of very large distributed projects.
-
-
+%if 0%{?suse_version}
%lang_package
+%endif
+
%prep
%setup -q
-# %setup -n %{name}-%{version}-mq
-# set version number manually (for snapshot only)
-# sed -e s"/^version = ''$/version = '"%{version}"'/" setup.py > foo.py
-# mv foo.py setup.py
-%patch
+%patch0
%patch1 -p1
-# mercurial uses new docutils options not available on 11.1 and older
-# this makes it possible to "build"
-%if 0%{?suse_version} <= 1110
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%patch2 -p0
%endif
+%patch3 -p1
+chmod 644 hgweb.cgi
%build
-%__make \
- build \
-%if 0%{?with_doc}
- doc \
-%endif
- PREFIX="%{_prefix}"
+make all
%install
-%__python setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" \
- --record-rpm=files.lst
+make install PREFIX="%{_prefix}" DESTDIR=%{buildroot}
-%if 0%{?with_doc}
-%__make -C doc DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install
-%else
-pushd doc
-for f in hg.1 hgrc.5 hgignore.5 ; do
- %__gzip $f && f=$f.gz
- ff="${f##*/}"
- n="${ff%.gz}"
- n="${n##*.}"
- %__install -D -m0644 "$f" "%{buildroot}%{_mandir}/man$n/$ff"
-done
-popd
-%endif
-# install stuff in contrib
-install -c -m 0755 contrib/hgk $RPM_BUILD_ROOT%{_bindir}
-install -c -m 0755 contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}
-install -c -m 0755 contrib/shrink-revlog.py $RPM_BUILD_ROOT%{_bindir}
-
-%__python -c 'import compileall;
compileall.compile_dir("%{buildroot}%{python_sitearch}/",ddir="%{python_sitearch}/",force=True)'
-
-mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d
-install -c -m 0644 contrib/bash_completion
$RPM_BUILD_ROOT/etc/bash_completion.d/mercurial.sh
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
-install -c -m 0644 contrib/zsh_completion
$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/_mercurial
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp
-install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp
-mkdir -p $RPM_BUILD_ROOT/etc/mercurial/hgrc.d
-install -c -m 0644 contrib/mergetools.hgrc
$RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+# Move locales to proper location
+mkdir -p %{buildroot}%{_datadir}/locale
+mv %{buildroot}%{python_sitearch}/mercurial/locale/*
%{buildroot}%{_datadir}/locale
+%find_lang hg
+
+# Install stuff in contrib
+install -m0755 contrib/hgk %{buildroot}%{_bindir}
+install -m0755 contrib/convert-repo %{buildroot}%{_bindir}
+sed -i "1i #!/usr/bin/python" contrib/shrink-revlog.py # Add a she-bang line
to executable script
+install -m0755 contrib/shrink-revlog.py %{buildroot}%{_bindir}
+install -Dm0644 contrib/bash_completion
%{buildroot}/etc/bash_completion.d/mercurial.sh
+install -Dm0644 contrib/zsh_completion
%{buildroot}%{_datadir}/zsh/site-functions/_mercurial
+mkdir -p %{buildroot}%{_datadir}/{x,}emacs/site-lisp
+install -m0644 contrib/*.el %{buildroot}%{_datadir}/emacs/site-lisp
+install -m0644 contrib/*.el %{buildroot}%{_datadir}/xemacs/site-lisp
+install -Dm0644 contrib/mergetools.hgrc
%{buildroot}%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
%if 0%{?suse_version} >= 1130
-install -c -m 0644 %{SOURCE1}
$RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/cacerts.rc
+install -m0644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/mercurial/hgrc.d/cacerts.rc
%endif
%if 0%{?suse_version} > 1020
-%fdupes -s "%{buildroot}%{_datadir}"
-%fdupes -s "%{buildroot}%{_libdir}"
+%fdupes -s %{buildroot}%{_prefix}
%endif
-chmod 644 $RPM_BUILD_DIR/%{name}-%{version}/hgweb.cgi
-if [ "%{python_sitelib}" != "%{python_sitearch}" ]; then
- %__install -d "%{buildroot}%{python_sitelib}/mercurial"
- %__mv "%{buildroot}%{python_sitearch}/mercurial/locale" \
- "%{buildroot}%{python_sitelib}/mercurial/locale"
-fi
-
-%__perl -n -i -e 'print unless m,/mercurial/locale(/?|/.+)$,' files.lst
-LANGFILES="$PWD/%{name}.lang"
->"$LANGFILES"
-pushd "%{buildroot}%{python_sitelib}/mercurial/locale"
-/bin/ls -1 | while read lang; do
- echo "%lang($lang) %{python_sitelib}/mercurial/locale/$lang" >>"$LANGFILES"
-done
-popd #%python_sitelib/mercurial/locale
-
-%if ! 0%{?with_lang}
-%__mv files.lst files.lst.orig
-cat files.lst.orig "%{name}.lang" > files.lst
-%__rm files.lst.orig
-%endif
+#%%check
+#make tests
%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+rm -rf %{buildroot}
+
+%if 0%{?suse_version}
+
+%files lang -f hg.lang
-%files -f files.lst
+%files
+%else
+
+%files -f hg.lang
+%endif
%defattr(-, root, root)
-%doc README CONTRIBUTORS COPYING hgweb.cgi
-%doc contrib/sample.hgrc
+%doc README CONTRIBUTORS COPYING hgweb.cgi contrib/sample.hgrc
%{_bindir}/*
/etc/bash_completion.d/*
%{_datadir}/zsh/
@@ -171,16 +131,9 @@
%config /etc/mercurial/hgrc.d/*
%{_datadir}/emacs
%{_datadir}/xemacs
-%{_mandir}/man1/hg.1%{ext_man}
-%{_mandir}/man5/hgignore.5%{ext_man}
-%{_mandir}/man5/hgrc.5%{ext_man}
-
-%if 0%{?with_lang}
-
-%files lang -f %{name}.lang
-%defattr(-, root, root)
-%endif
-%dir %{python_sitelib}/mercurial
-%dir %{python_sitelib}/mercurial/locale
+%{_mandir}/man1/hg.1*
+%{_mandir}/man5/hgignore.5*
+%{_mandir}/man5/hgrc.5*
+%{python_sitearch}/*
%changelog
++++++ mercurial-locale-path-fix.patch ++++++
diff -u a/mercurial/i18n.py b/mercurial/i18n.py
--- a/mercurial/i18n.py 2011-07-01 20:54:23.000000000 +0200
+++ b/mercurial/i18n.py 2011-07-11 15:23:29.920882539 +0200
@@ -16,7 +16,7 @@
base = os.path.dirname(module)
for dir in ('.', '..'):
- localedir = os.path.join(base, dir, 'locale')
+ localedir = '/usr/share/locale'
if os.path.isdir(localedir):
break
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
