# HG changeset patch # User Michael Schloh von Bennewitz # Date 1390579376 -3600 # Node ID ab976cd2e548dfb2cd08ced0237ba86223ed02b2 # Parent cbbc8daa8174a371e27202bed6fb2e0ccaff0d50 Update vendor version and permit compilation of sloppy constructs. diff -r cbbc8daa8174 -r ab976cd2e548 tor/tor.spec --- a/tor/tor.spec Wed Jan 22 21:02:10 2014 +0100 +++ b/tor/tor.spec Fri Jan 24 17:02:56 2014 +0100 @@ -21,10 +21,6 @@ ## SUCH DAMAGE. ## -# package version -%define V_dist 0.2.3.14-alpha -%define V_opkg 0.2.3.14 - # package information Name: tor Summary: Anonymous Internet Communication System @@ -35,11 +31,11 @@ Class: PLUS Group: Network License: LGPL -Version: %{V_opkg} -Release: 20120427 +Version: 0.2.4.20 +Release: 20140124 # list of sources -Source0: http://www.torproject.org/dist/tor-%{V_dist}.tar.gz +Source0: http://www.torproject.org/dist/tor-%{version}.tar.gz Source1: rc.tor Source2: torrc @@ -65,22 +61,24 @@ %track prog tor = { - version = %{V_dist} + version = %{version} url = http://www.torproject.org/dist/ regex = tor-(\d+\.\d+(\.\d+)*(-(alpha|beta|rc))?)\.tar\.gz } %prep - %setup -q -n tor-%{V_dist} + %setup -q %build libs="" case "%{l_platform -t}" in *-linux* ) libs="$libs -lrt" ;; esac - CC="%{l_cc}" \ + CC="%{l_cc} -fpermissive" \ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ + CXX="%{l_cxx}" \ + CXXFLAGS="%{l_cxxflags -O}" \ LDFLAGS="%{l_ldflags}" \ LIBS="$libs" \ ./configure \ @@ -92,7 +90,7 @@ %{l_make} %{l_mflags -O} %install - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true mv $RPM_BUILD_ROOT%{l_prefix}/etc/tor/torrc.sample \ $RPM_BUILD_ROOT%{l_prefix}/etc/tor/torrc