[tor/f16: 9/9] Merge remote-tracking branch 'origin/master' into f16
ensc
ensc at fedoraproject.org
Fri Oct 28 08:26:47 UTC 2011
commit c7d60b31affc1c5c9192b264f63853ecde29591d
Merge: 9bff6d9 f87a00a
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Fri Oct 28 10:25:17 2011 +0200
Merge remote-tracking branch 'origin/master' into f16
Conflicts:
.gitignore
lastver
sources
tor.spec
.gitignore | 12 ++----------
lastver | 2 +-
sources | 4 ++--
tor.spec | 7 +++++--
4 files changed, 10 insertions(+), 15 deletions(-)
---
diff --cc tor.spec
index 5ccbd25,a6ae57e..95cc4aa
--- a/tor.spec
+++ b/tor.spec
@@@ -11,10 -11,26 +11,10 @@@
%{!?_unitdir:%global _unitdir /lib/systemd/system}
%{?with_noarch:%global noarch BuildArch: noarch}
%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
-%{!?systemd_reqs:%global systemd_reqs \
-Requires(post): /bin/systemctl\
-Requires(preun): /bin/systemctl\
-Requires(postun): /bin/systemctl\
-%nil}
-%{!?systemd_install:%global systemd_install()\
-%post %1\
-test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\
-%preun %1\
-test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\
-test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\
-%postun %1\
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :\
-test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\
-%nil}
-
Name: tor
- Version: 0.2.2.33
- Release: %release_func 1601
+ Version: 0.2.2.34
-Release: %release_func 1700
++Release: %release_func 1600
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@@ -239,10 -244,13 +239,13 @@@ rm -rf $RPM_BUILD_ROO
%changelog
-* Fri Oct 28 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.34-1700
++* Fri Oct 28 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.34-1600
+ - updated to 0.2.2.34; critical privacy/anonymity fixes
+
-* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2.33-1701
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2.33-1601
- Rebuilt for glibc bug#747377
-* Sun Sep 18 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.33-1700
+* Sun Sep 18 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.33-1600
- updated to 2.2.33
- removed -doc subpackage because shipped files are not available
anymore
More information about the scm-commits
mailing list