.gear/rules | 2 + .../tags/daee30116434016981b125ca632cc3709fb7b350 | 13 ++ .gear/tags/list | 1 + autogen.sh | 2 +- cli/Makefile.am | 2 +- configure.ac | 34 +++- daemon/Makefile.am | 2 +- daemon/remote.c | 2 +- gtk/Makefile.am | 2 +- gtk/util.c | 2 +- libtransmission/Makefile.am | 2 +- libtransmission/clients.c | 2 +- libtransmission/rpc-server.c | 4 +- third-party/Makefile.am | 1 - transmission.spec | 219 ++++++++++++++++++++ 15 files changed, 274 insertions(+), 16 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..be6a1e7 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: v@version@:. name=transmission-@version@ +diff: v@version@:. . diff --git a/.gear/tags/daee30116434016981b125ca632cc3709fb7b350 b/.gear/tags/daee30116434016981b125ca632cc3709fb7b350 new file mode 100644 index 0000000..dc6316f --- /dev/null +++ b/.gear/tags/daee30116434016981b125ca632cc3709fb7b350 @@ -0,0 +1,13 @@ +object 43d1f3ea799799921b1628e124bf408330572395 +type commit +tag v1.61 +tagger Anton Farygin 1242243907 +0400 + +v1.61 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEABECAAYFAkoLI00ACgkQqohfd2vlwKvnRgCgrgIyE/QFByC2uOOUJM84NWxt +Bj4An3qTA6EGtxwF1ERKWfn76FnBQDan +=nACe +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..023ae58 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +daee30116434016981b125ca632cc3709fb7b350 v1.61 diff --git a/autogen.sh b/autogen.sh index 3b2c1a4..b8824f3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -22,7 +22,7 @@ then fi export LIBTOOLIZE -autoreconf -fi -I m4 +autoreconf -fis -I m4 if test "$GETTEXTIZE"; then echo "Creating aclocal.m4 ..." diff --git a/cli/Makefile.am b/cli/Makefile.am index 3244936..df2e045 100644 --- a/cli/Makefile.am +++ b/cli/Makefile.am @@ -17,11 +17,11 @@ transmissioncli_SOURCES = cli.c transmissioncli_LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ - $(top_builddir)/third-party/libevent/libevent.la \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(INTLLIBS) \ $(LIBCURL_LIBS) \ + $(LIBEVENT_LIBS) \ $(ZLIB_LIBS) \ $(OPENSSL_LIBS) \ $(PTHREAD_LIBS) \ diff --git a/configure.ac b/configure.ac index 5cc108a..f550564 100644 --- a/configure.ac +++ b/configure.ac @@ -169,10 +169,34 @@ dnl ---------------------------------------------------------------------------- dnl dnl libevent fun -AC_CONFIG_SUBDIRS([third-party/libevent]) -AC_MSG_NOTICE([invoking libevent's configure script]) -LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent" -AC_SUBST(LIBEVENT_CPPFLAGS) +#AC_CONFIG_SUBDIRS([third-party/libevent]) +#AC_MSG_NOTICE([invoking libevent's configure script]) +#LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent" +#AC_SUBST(LIBEVENT_CPPFLAGS) +AC_MSG_CHECKING([for libEvent]) + +for dir in /usr/local /usr; do + eventdir="$dir" + if test -f "$dir/include/event.h"; then + found_libevent="yes"; + LIBEVENT_CFLAGS="-I$eventdir/include"; + break; + fi + if test -f "$dir/include/event.h"; then + found_libevent="yes"; + LIVEVENT_CFLAGS="-I$eventdir/include"; + break + fi +done +if test x_$found_libevent != x_yes; then + AC_MSG_ERROR([Cannot locate libevent]) +else + AC_MSG_RESULT([$eventdir]) + LIBEVENT_LIBS="-L$eventdir/lib -levent"; +fi + +AC_SUBST(LIBEVENT_CFLAGS) +AC_SUBST(LIBEVENT_LIBS) dnl ---------------------------------------------------------------------------- @@ -263,7 +287,7 @@ fi use_nls=no if test "x$enable_nls" = "xyes" ; then use_nls=yes - IT_PROG_INTLTOOL([0.23],[no-xml]) +IT_PROG_INTLTOOL([0.23],[no-xml]) AC_CHECK_HEADERS([libintl.h]) GETTEXT_PACKAGE=transmission AC_SUBST(GETTEXT_PACKAGE) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index ea22fac..f64b83f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -21,9 +21,9 @@ LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - $(top_builddir)/third-party/libevent/libevent.la \ $(INTLLIBS) \ $(LIBCURL_LIBS) \ + $(LIBEVENT_LIBS) \ $(ZLIB_LIBS) \ $(OPENSSL_LIBS) \ $(PTHREAD_LIBS) -lm diff --git a/daemon/remote.c b/daemon/remote.c index 49ca39c..df46178 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -23,7 +23,7 @@ #include /* getcwd */ #endif -#include +#include #define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */ #include diff --git a/gtk/Makefile.am b/gtk/Makefile.am index ff712a3..4ac6bfe 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -98,12 +98,12 @@ dist_man_MANS = transmission.1 transmission_LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ - $(top_builddir)/third-party/libevent/libevent.la \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(GTK_LIBS) \ $(GIO_LIBS) \ $(LIBNOTIFY_LIBS) \ + $(LIBEVENT_LIBS) \ $(DBUS_GLIB_LIBS) \ $(OPENSSL_LIBS) \ $(LIBCURL_LIBS) \ diff --git a/gtk/util.c b/gtk/util.c index dca5a2e..b8432bd 100644 --- a/gtk/util.c +++ b/gtk/util.c @@ -38,7 +38,7 @@ #include #endif -#include +#include #include /* TR_RATIO_NA, TR_RATIO_INF */ #include /* tr_inf */ diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am index 4f869d3..c3b6853 100644 --- a/libtransmission/Makefile.am +++ b/libtransmission/Makefile.am @@ -123,9 +123,9 @@ apps_ldadd = \ ./libtransmission.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - $(top_builddir)/third-party/libevent/libevent.la \ $(INTLLIBS) \ $(LIBCURL_LIBS) \ + $(LIBEVENT_LIBS) \ $(OPENSSL_LIBS) \ $(PTHREAD_LIBS) \ $(ZLIB_LIBS) \ diff --git a/libtransmission/clients.c b/libtransmission/clients.c index ebff927..e86ea3d 100644 --- a/libtransmission/clients.c +++ b/libtransmission/clients.c @@ -17,7 +17,7 @@ #include /* strtol */ #include -#include /* evbuffer */ +#include /* evbuffer */ #include "transmission.h" #include "clients.h" diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c index d4bc9a6..92986ea 100644 --- a/libtransmission/rpc-server.c +++ b/libtransmission/rpc-server.c @@ -24,8 +24,8 @@ #include #endif -#include -#include +#include +#include #include "transmission.h" #include "bencode.h" diff --git a/third-party/Makefile.am b/third-party/Makefile.am index 4d9e661..82be71b 100644 --- a/third-party/Makefile.am +++ b/third-party/Makefile.am @@ -1,5 +1,4 @@ SUBDIRS = \ - libevent \ libnatpmp \ miniupnp diff --git a/transmission.spec b/transmission.spec new file mode 100644 index 0000000..88cb056 --- /dev/null +++ b/transmission.spec @@ -0,0 +1,219 @@ +%define _optlevel s +%def_disable wxgtk + +%define rname Transmission +Name: transmission +Version: 1.61 +Release: alt0.M50.1 + +Group: Networking/File transfer +Summary: Llightweight BitTorrent client +License: GPLv2 + MIT +Url: http://www.transmissionbt.com/ + +Provides: %rname = %version-%release + +Obsoletes: %name-benc2php +Obsoletes: %name-proxy + +Requires: %name-gtk = %version-%release +%if_enabled wxgtk +Requires: %name-wxgtk = %version-%release +%endif +Requires: %name-cli = %version-%release +Requires: %name-remote = %version-%release +Requires: %name-daemon = %version-%release + +Requires(post,postun): desktop-file-utils + +Source: http://download.m0k.org/%name/files/%name-%version.tar +Patch0: %name-%version-%release.patch + +BuildPreReq: desktop-file-utils + +# Automatically added by buildreq on Tue Feb 17 2009 +BuildRequires: gcc-c++ gcc-fortran glibc-devel-static intltool libcurl-devel libevent1.4-devel libnotify-devel + +%if_enabled wxgtk +BuildRequires: wxGTK2u-devel +%endif + +%description +Transmission has been built from the ground up to be a lightweight, +yet powerful BitTorrent client. Its simple, intuitive interface +strikes a balance between providing useful functionality without +feature bloat. Furthermore, it is free for anyone to use or modify. + +%package common +Group: Networking/File transfer +Summary: Common files for %name +Conflicts: %name < 1.00-alt10 +%description common +Common files for %name + +%package gtk +Group: Networking/File transfer +Summary: Graphical BitTorrent client +Provides: %name-gui = %version-%release +Requires: %name-common = %version-%release +%description gtk +GTK-based graphical BitTorrent client + +%if_enabled wxgtk +%package wxgtk +Group: Networking/File transfer +Summary: Graphical BitTorrent client +Provides: %name-gui = %version-%release +Requires: %name-common = %version-%release +%description wxgtk +WxGTK-based graphical BitTorrent client +%endif + +%package cli +Group: Networking/File transfer +Summary: Command line BitTorrent client +Requires: %name-common = %version-%release +%description cli +Command line BitTorrent client + +%package remote +Group: Networking/Remote access +Summary: Command line remote interface to %name-daemon +Requires: %name-common = %version-%release +Requires: %name-daemon = %version-%release +%description remote +Command line remote interface to %name-daemon + +%package daemon +Group: Networking/File transfer +Summary: Daemonised BitTorrent client +Requires: %name-common = %version-%release +%description daemon +Daemonised BitTorrent client + +%prep +%setup -q +%patch0 -p1 + +%build +./autogen.sh +%configure \ + --verbose \ + %{subst_enable wx} \ + --enable-gtk + +%make_build + +%install +%make DESTDIR=%buildroot install + +%find_lang %name + +%files common +%dir %_datadir/%name +%_datadir/%name/web/ + +%files + +%files gtk -f %name.lang +%doc AUTHORS COPYING NEWS README ChangeLog +%_bindir/%name +%_datadir/applications/*.desktop +%_iconsdir/hicolor/*/*/* +%_datadir/pixmaps/* +%_man1dir/%name.1.* + +%if_enabled wxgtk +%files wxgtk +%doc AUTHORS COPYING NEWS README ChangeLog +%_bindir/Xmission +%endif + +%files cli +%doc AUTHORS COPYING NEWS README ChangeLog +%_bindir/%{name}cli +%_man1dir/%{name}cli.1.* + +%files remote +%doc AUTHORS COPYING NEWS README ChangeLog +%_bindir/%name-remote +%_man1dir/%name-remote.1.* + +%files daemon +%doc AUTHORS COPYING NEWS README ChangeLog +%_bindir/%name-daemon +%_man1dir/%name-daemon.1.* + +%changelog +* Wed May 13 2009 Anton Farygin 1.61-alt0.M50.1 +- new version + +* Wed May 06 2009 Anton Farygin 1.60-alt1 +- new version + +* Tue Apr 14 2009 Anton Farygin 1.52-alt1 +- new version + +* Thu Mar 05 2009 Anton Farygin 1.51-alt0.M40.1 +- new version + +* Mon Feb 16 2009 Anton Farygin 1.50-alt1 +- new version +- fixed build from svn +- build with system libevent +- buildreq updated + +* Thu Jan 15 2009 Yuri N. Sedunov 1.42-alt1 +- new version + +* Sat Nov 08 2008 Yuri N. Sedunov 1.34-alt2 +- fix altbug #17817 (patch0) + +* Mon Sep 22 2008 Yuri N. Sedunov 1.34-alt1.1 +- packaged builtin web-server + +* Fri Sep 19 2008 Yuri N. Sedunov 1.34-alt1 +- new version for Sisyphus +- updated buildreqs +- removed {update,clean}_menus from post{,un} + +* Tue Aug 05 2008 Sergey V Turchin 1.22-alt0.M40.1 +- new version + +* Thu May 08 2008 Sergey V Turchin 1.11-alt0.M40.1 +- new version + +* Tue Apr 01 2008 Sergey V Turchin 1.10-alt0.M40.1 +- new version + +* Wed Mar 05 2008 Sergey V Turchin 1.06-alt0.M40.1 +- new version + +* Tue Feb 19 2008 Sergey V Turchin 1.05-alt0.M40.1 +- new version + +* Thu Feb 07 2008 Sergey V Turchin 1.04-alt0.M40.1 +- new version + +* Sat Jan 26 2008 Sergey V Turchin 1.02-alt0.M40.1 +- new version + +* Tue Jan 15 2008 Sergey V Turchin 1.01-alt0.M40.1 +- new version +- split to subpackages + +* Wed Jan 09 2008 Sergey V Turchin 1.00-alt0.M40.1 +- new version + +* Wed Dec 12 2007 Sergey V Turchin 0.96-alt0.M40.1 +- new version + +* Thu Dec 06 2007 Sergey V Turchin 0.95-alt0.M40.1 +- new version + +* Wed Nov 28 2007 Sergey V Turchin 0.94-alt0.M40.1 +- new version + +* Sat Sep 08 2007 Sergey V Turchin 0.81-0.1.M40 +- initial specfile +