rpms/mercurial/EL-5 mercurial.spec,1.14,1.15 sources,1.10,1.11

Neal Becker nbecker at fedoraproject.org
Thu Sep 4 14:55:01 UTC 2008


Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26228

Modified Files:
	mercurial.spec sources 
Log Message:
Update to 1.0.2



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/mercurial.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mercurial.spec	2 Apr 2007 21:26:04 -0000	1.14
+++ mercurial.spec	4 Sep 2008 14:54:30 -0000	1.15
@@ -1,49 +1,289 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.9.3
-Release: 1%{?dist}
-License: GPL
+Version: 1.0.2
+Release: 2%{?dist}
+License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
+Source1: mercurial-site-start.el
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel asciidoc xmlto
+BuildRequires: python python-devel asciidoc xmlto
+BuildRequires: emacs emacs-el pkgconfig
+Requires: python
+Provides: hg = %{version}-%{release}
 
 %description
-Mercurial is a fast, lightweight source control management system designed 
+Mercurial is a fast, lightweight source control management system designed
 for efficient handling of very large distributed projects.
- 
+
+Quick start: http://www.selenic.com/mercurial/wiki/index.cgi/QuickStart
+Tutorial: http://www.selenic.com/mercurial/wiki/index.cgi/Tutorial
+Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
+
+%define pkg mercurial
+#%define pkgname Foo
+
+# If the emacs-el package has installed a pkgconfig file, use that to determine
+# install locations and Emacs version at build time, otherwise set defaults.
+%if %($(pkg-config emacs) ; echo $?)
+%define emacs_version 22.1
+%define emacs_lispdir %{_datadir}/emacs/site-lisp
+%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
+%else
+%define emacs_version %{expand:%(pkg-config emacs --modversion)}
+%define emacs_lispdir %{expand:%(pkg-config emacs --variable sitepkglispdir)}
+%define emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)}
+%endif
+
+%package -n emacs-%{pkg}
+Summary:	Mercurial version control system support for Emacs
+Group:		Applications/Editors
+Requires:	hg = %{version}-%{release}, emacs-common
+Requires:       emacs(bin) >= %{emacs_version}
+Obsoletes:	%{pkg}-emacs
+
+%description -n emacs-%{pkg}
+Contains byte compiled elisp packages for %{pkg}.
+To get started: start emacs, load hg-mode with M-x hg-mode, and show 
+help with C-c h h
+
+%package -n emacs-%{pkg}-el
+Summary:        Elisp source files for %{pkg} under GNU Emacs
+Group:          Applications/Editors
+Requires:       emacs-%{pkg} = %{version}-%{release}
+
+%description -n emacs-%{pkg}-el
+This package contains the elisp source files for %{pkg} under GNU Emacs. You
+do not need to install this package to run %{pkg}. Install the emacs-%{pkg}
+package to use %{pkg} with GNU Emacs.
+
+%package hgk
+Summary:	Hgk interface for mercurial
+Group:		Development/Tools
+Requires:	hg = %{version}-%{release}, tk
+
+
+%description hgk
+A Mercurial extension for displaying the change history graphically
+using Tcl/Tk.  Displays branches and merges in an easily
+understandable way and shows diffs for each revision.  Based on
+gitk for the git SCM.
+
+Adds the "hg view" command.  See 
+http://www.selenic.com/mercurial/wiki/index.cgi/UsingHgk for more
+documentation.
+
 %prep
 %setup -q
 
 %build
-python ./setup.py build
-
-# not built by default.  kind of lame
-pushd doc ; make man ; popd
+make all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
+%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --prefix %{_prefix} --record=%{name}.files
+make install-doc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
+
+grep -v 'hgk.py*' < %{name}.files > %{name}-base.files
+grep 'hgk.py*' < %{name}.files > %{name}-hgk.files
+
+install -D contrib/hgk       $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk
+install contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}/mercurial-convert-repo
+install contrib/hg-ssh       $RPM_BUILD_ROOT%{_bindir}
+install contrib/git-viz/{hg-viz,git-rev-tree} $RPM_BUILD_ROOT%{_bindir}
+
+bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+mkdir -p $bash_completion_dir
+install -m 644 contrib/bash_completion $bash_completion_dir/mercurial.sh
+
+zsh_completion_dir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
+mkdir -p $zsh_completion_dir
+install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial
+
+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
+
+pushd contrib
+for file in mercurial.el mq.el; do
+  emacs -batch -l mercurial.el --no-site-file -f batch-byte-compile $file
+  install -p -m 644 $file ${file}c $RPM_BUILD_ROOT%{emacs_lispdir}
+  rm ${file}c
+done
+popd
+
+
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
-# and we have to install the man pages
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
-install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
-install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
-install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} && install -m644 %SOURCE1 $RPM_BUILD_ROOT%{emacs_startdir}
 
+cat >hgk.rc <<EOF
+[extensions]
+# enable hgk extension ('hg help' shows 'view' as a command)
+hgk=
+
+[hgk]
+path=%{_libexecdir}/mercurial/hgk
+EOF
+install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
+
+install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files -f %{name}.files
+%files -f %{name}-base.files
 %defattr(-,root,root,-)
-%doc CONTRIBUTORS README contrib/sample.hgrc
-%{_mandir}/man*/*
+%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi
+%doc %attr(644,root,root) %{_mandir}/man?/hg*.gz
+%doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
+%{_sysconfdir}/bash_completion.d/mercurial.sh
+%{_datadir}/zsh/site-functions/_mercurial
+%{_bindir}/hg-ssh
+%{_bindir}/hg-viz
+%{_bindir}/git-rev-tree
+%{_bindir}/mercurial-convert-repo
+%dir %{_sysconfdir}/mercurial
+%dir %{_sysconfdir}/mercurial/hgrc.d
+%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%dir %{python_sitearch}/mercurial
+%dir %{python_sitearch}/hgext
+
+%files -n emacs-%{pkg}
+%{emacs_lispdir}/*.elc
+%{emacs_startdir}/*.el
+
+%files -n emacs-%{pkg}-el
+%{emacs_lispdir}/*.el
+
+%files hgk -f %{name}-hgk.files
+%{_libexecdir}/mercurial/
+%{_sysconfdir}/mercurial/hgrc.d/hgk.rc
 
+#%%check
+#cd tests && %{__python} run-tests.py
 
 %changelog
+* Thu Aug 28 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-2
+- Use macro for python executable
+
+* Fri Aug 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-1
+- Update to 1.0.2
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-4
+- Bitten by expansion of commented out macro (again)
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-3
+- Add BR pkgconfig
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-2
+- Update to 1.0.1
+- Fix emacs_version, etc macros (need expand)
+- Remove patch0
+
+* Mon Jun  2 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-15
+- Bump release tag
+
+* Thu Apr 17 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-14
+- Oops, fix %%files due to last change
+
+* Wed Apr 16 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-13
+- install mergetools.hgrc as mergetools.rc
+
+* Sat Apr 12 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-12
+- Remove xemacs pkg - this is moved to xemacs-extras
+- Own %{python_sitearch}/{mercurial,hgext} dirs
+
+* Thu Apr 10 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-11
+- Use install -p to install .el{c} files
+- Don't (load mercurial) by default.
+
+* Wed Apr  9 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-10
+- Patch to hgk from Mads Kiilerich <mads at kiilerich.com>
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-9
+- Add '-l mercurial.el' for emacs also
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-8
+- BR xemacs-packages-extra
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-7
+- Various fixes
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-6
+- fix to comply with emacs packaging guidelines
+
+* Thu Mar 27 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-5
+- Move hgk-related py files to hgk
+- Put mergetools.hgrc in /etc/mercurial/hgrc.d
+- Add hgk.rc and put in /etc/mercurial/hgrc.d
+
+* Wed Mar 26 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-4
+- Rename mercurial-site-start -> mercurial-site-start.el
+
+* Wed Mar 26 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-3
+- Incorprate suggestions from hopper at omnifarious.org
+
+* Wed Mar 26 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-2
+- Add site-start
+
+* Tue Mar 25 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-1
+- Update to 1.0
+- Disable check for now - 1 test fails
+- Move emacs to separate package
+- Add check
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.5-7
+- Autorebuild for GCC 4.3
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-6
+- rpmlint fixes
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-5
+- /etc/mercurial/hgrc.d missing
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-3
+- Fix to last change
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-2
+- mkdir /etc/mercurial/hgrc.d for plugins
+
+* Tue Oct 23 2007  <ndbecker2 at gmail.com> - 0.9.5-2
+- Bump tag to fix confusion
+
+* Mon Oct 15 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-1
+- Sync with spec file from mercurial
+
+* Sat Sep 22 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-8
+- Just cp contrib tree.
+- Revert install -O2
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-7
+- Change setup.py install to -O2 to get bytecompile on EL-4
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-6
+- Revert last change.
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
+- Use {ghost} on contrib, otherwise EL-4 build fails
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
+- remove {_datadir}/contrib stuff for now
+
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
+- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
+
+* Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
+- update to 0.9.4-2
+- install contrib directory
+- set up required path for hgk
+- install man5 man pages
+
+* Thu Aug 23 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-1
+- update to 0.9.4
+
 * Wed Jan  3 2007 Jeremy Katz <katzj at redhat.com> - 0.9.3-1
 - update to 0.9.3
 - remove asciidoc files now that we have them as manpages


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Apr 2007 21:26:04 -0000	1.10
+++ sources	4 Sep 2008 14:54:30 -0000	1.11
@@ -1 +1 @@
-5e39fed853e5669cbac32b77a67bb6dd  mercurial-0.9.3.tar.gz
+32432616f517107e6582721c257cd1f4  mercurial-1.0.2.tar.gz




More information about the fedora-extras-commits mailing list