Tagged from proxyface.deb #32

configure.in

@@ -177,7 +177,12 @@ else
   CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG"
   CPPFLAGS+=" -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_WEBKIT_LIB -DQT_CORE_LIB"
   CPPFLAGS+=" -I$QTINCDIR"
-  AC_CHECK_PROGS([MOC], [moc-qt4 moc-mac moc])
+  AC_ARG_WITH([moc],
+             AC_HELP_STRING([--with-moc=/path/to/moc],
+                            [to specify the path to qt4 moc.]),
+             [MOC="$withval"],
+             [MOC=""])
+  AC_CHECK_PROGS([MOC], [$MOC moc-qt4 moc-mac moc])
   test -n "$MOC" || AC_MSG_ERROR([moc for Qt 4 not found!])
   AC_SUBST(MOC)
   AC_CHECK_PROGS([RCC], [rcc-qt4 rcc-mac rcc])

install-64-and-32-bit-linux.sh

@@ -11,7 +11,8 @@ LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
   ./configure \
   --prefix=/opt/local/i586-mingw32msvc \
   --build=x86_64 \
-  --host=i586-mingw32msvc && \
+  --host=i586-mingw32msvc \
+  --with-moc=/usr/local/Trolltech/Qt-4.8.0/bin/moc && \
 make && \
 sudo make install && \
 make clean && \

proxyface.spec.in

@@ -1,4 +1,4 @@
-Summary: @PACKAGENAME@ PLEASE DESCRIBE
+Summary: @PACKAGENAME@ Proxy interface for Unix/Mac/Windows
 Name: @PACKAGENAME@
 Version: @VERSION@
 Release: 1
@@ -6,8 +6,13 @@ License: LGPL
 Group: Development/Libraries/C++
 URL: https://dev.swisssign.com/projects/@PACKAGENAME@
 Source0: %{name}-%{version}.tar.gz
-BuildRequires: subversion libcppunit-devel gcc-c++ doxygen graphviz texlive automake autoconf libtool make libqt4-devel libproxy-devel
+BuildRequires: subversion gcc-c++ doxygen graphviz texlive automake autoconf libtool make libproxy-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+BuildRequires: cppunit-devel qt-devel
+%else%if 0%{?suse_version} || 0%{?sles_version}
+BuildRequires: libcppunit-devel libqt4-devel
+%endif%endif
 
 
 %description
@@ -19,7 +24,7 @@ This package contains only the shared libraries required at runtime.
 %setup -q
 ./configure --prefix=/usr \
             --docdir=/usr/share/doc/packages/@PACKAGENAME@ \
-            --libdir=/usr/lib
+            --libdir=/usr/%_lib
 
 %build
 make
@@ -32,7 +37,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/usr/lib/lib@PACKAGENAME@.so.*
+/usr/%_lib/lib@PACKAGENAME@.so.*
 /usr/share/@PACKAGENAME@
 %doc
 /usr/share/doc/packages/@PACKAGENAME@/AUTHORS
@@ -43,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/packages/@PACKAGENAME@/README
 
 %package devel
-Summary: @PACKAGENAME@ PLEASE DESCRIBE (development files)
+Summary: @PACKAGENAME@ Proxy interface for Unix/Mac/Windows (development files)
 Group: Development/Libraries/C++
 Requires: @PACKAGENAME@ = @VERSION@
 
@@ -54,10 +59,10 @@ This Package contains all files required for developement.
 
 %files devel
 %defattr(-,root,root,-)
-/usr/lib/lib@PACKAGENAME@.so
-/usr/lib/lib@PACKAGENAME@.a
-/usr/lib/pkgconfig
-/usr/lib/lib@PACKAGENAME@.la
+/usr/%_lib/lib@PACKAGENAME@.so
+/usr/%_lib/lib@PACKAGENAME@.a
+/usr/%_lib/pkgconfig
+/usr/%_lib/lib@PACKAGENAME@.la
 /usr/include/
 /usr/share/pkgconfig
 %doc

src/makefile.am

@@ -7,7 +7,7 @@
 
 if USE_QT
 UISOURCES  = proxyface/proxy.ui proxyface/proxyauth.ui
-RESOURCES  = resources.cxx
+RESOURCES  = proxyface/resources.cxx
 MOCHEADER  = proxyface/proxy.hxx proxyface/autoproxy.hxx proxyface/proxyauth.hxx
 LANGUAGES  = proxy_de.qm proxy_en.qm proxy_fr.qm proxy_it.qm
 LANG_TS    = proxy_de.ts proxy_en.ts proxy_fr.ts proxy_it.ts

src/proxyface/proxy.hxx

@@ -86,6 +86,11 @@ namespace gui {
         acceptValues();
       }
 
+      void proxy(const QString& url,
+                 int timeout1=5000, int timeout2=30000) {
+        _auto.proxy(url.toStdString(), timeout1, timeout2);
+      }
+
       void ping() {
         _auto.ping(_testUrl->currentText());
       }

src/proxyface/proxy.ui

@@ -115,7 +115,7 @@
          <item row="2" column="1">
           <widget class="QSpinBox" name="_port">
            <property name="maximum">
-            <number>10000</number>
+            <number>65535</number>
            </property>
            <property name="value">
             <number>80</number>