OpenPKG Specs / changeset

     1.1 --- a/tor/tor.spec	Wed Jan 22 21:02:10 2014 +0100
     1.2 +++ b/tor/tor.spec	Fri Jan 24 17:02:56 2014 +0100
     1.3 @@ -21,10 +21,6 @@
     1.4  ##  SUCH DAMAGE.
     1.5  ##
     1.6  
     1.7 -#   package version
     1.8 -%define       V_dist  0.2.3.14-alpha
     1.9 -%define       V_opkg  0.2.3.14
    1.10 -
    1.11  #   package information
    1.12  Name:         tor
    1.13  Summary:      Anonymous Internet Communication System
    1.14 @@ -35,11 +31,11 @@
    1.15  Class:        PLUS
    1.16  Group:        Network
    1.17  License:      LGPL
    1.18 -Version:      %{V_opkg}
    1.19 -Release:      20120427
    1.20 +Version:      0.2.4.20
    1.21 +Release:      20140124
    1.22  
    1.23  #   list of sources
    1.24 -Source0:      http://www.torproject.org/dist/tor-%{V_dist}.tar.gz
    1.25 +Source0:      http://www.torproject.org/dist/tor-%{version}.tar.gz
    1.26  Source1:      rc.tor
    1.27  Source2:      torrc
    1.28  
    1.29 @@ -65,22 +61,24 @@
    1.30  
    1.31  %track
    1.32      prog tor = {
    1.33 -        version   = %{V_dist}
    1.34 +        version   = %{version}
    1.35          url       = http://www.torproject.org/dist/
    1.36          regex     = tor-(\d+\.\d+(\.\d+)*(-(alpha|beta|rc))?)\.tar\.gz
    1.37      }
    1.38  
    1.39  %prep
    1.40 -    %setup -q -n tor-%{V_dist}
    1.41 +    %setup -q
    1.42  
    1.43  %build
    1.44      libs=""
    1.45      case "%{l_platform -t}" in
    1.46          *-linux* ) libs="$libs -lrt" ;;
    1.47      esac
    1.48 -    CC="%{l_cc}" \
    1.49 +    CC="%{l_cc} -fpermissive" \
    1.50      CFLAGS="%{l_cflags -O}" \
    1.51      CPPFLAGS="%{l_cppflags}" \
    1.52 +    CXX="%{l_cxx}" \
    1.53 +    CXXFLAGS="%{l_cxxflags -O}" \
    1.54      LDFLAGS="%{l_ldflags}" \
    1.55      LIBS="$libs" \
    1.56      ./configure \
    1.57 @@ -92,7 +90,7 @@
    1.58      %{l_make} %{l_mflags -O}
    1.59  
    1.60  %install
    1.61 -    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
    1.62 +    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    1.63      strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
    1.64      mv $RPM_BUILD_ROOT%{l_prefix}/etc/tor/torrc.sample \
    1.65         $RPM_BUILD_ROOT%{l_prefix}/etc/tor/torrc