Merge remote-tracking branch 'origin/f18'

Catches rawhide up to the final 2.1 release, to preserve the upgrade path
if nothing else.  (We'll start on 2.2 snapshots soon though.)
This commit is contained in:
Josh Stone 2013-02-13 19:01:23 -08:00
commit f1c743c1e2
3 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View File

@ -28,3 +28,4 @@ systemtap-1.3.tar.gz
/systemtap-2.1-0.353.g43e1259.tar.gz /systemtap-2.1-0.353.g43e1259.tar.gz
/systemtap-2.1-0.354.g75c7136.tar.gz /systemtap-2.1-0.354.g75c7136.tar.gz
/systemtap-2.1-0.385.gab733d5.tar.gz /systemtap-2.1-0.385.gab733d5.tar.gz
/systemtap-2.1.tar.gz

View File

@ -1 +1 @@
31d915dc37f4d8a8669ab5684c275750 systemtap-2.1-0.385.gab733d5.tar.gz 86a01af0139c868aa1736ebf8c640caa systemtap-2.1.tar.gz

View File

@ -31,7 +31,7 @@
Name: systemtap Name: systemtap
Version: 2.1 Version: 2.1
Release: 0.385.gab733d5%{?dist} Release: 1%{?dist}
# for version, see also configure.ac # for version, see also configure.ac
@ -62,7 +62,7 @@ Group: Development/System
License: GPLv2+ License: GPLv2+
URL: http://sourceware.org/systemtap/ URL: http://sourceware.org/systemtap/
#Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz #Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz
Source: %{name}-%{version}-0.385.gab733d5.tar.gz Source: %{name}-%{version}.tar.gz
# Build* # Build*
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -695,6 +695,9 @@ exit 0
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
%changelog %changelog
* Wed Feb 13 2013 Serguei Makarov <smakarov@redhat.com> - 2.1-1
- Upstream release.
* Mon Feb 11 2013 Lukas Berk <lberk@redhat.com> - 2.1-0.385.gab733d5 * Mon Feb 11 2013 Lukas Berk <lberk@redhat.com> - 2.1-0.385.gab733d5
- Automated weekly rawhide release - Automated weekly rawhide release