From 73f4d29ce3f21afb3e35135e1de8f7d350384e40 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 13 Jan 2010 22:32:46 +0000 Subject: [PATCH] (trunk) try to help packagers a bit by adding annotation to say which prerequisites are mandatory and which are optional --- configure.ac | 45 +++++++++++++++++++++++++++----------------- transmission.spec.in | 27 ++++++++++++++++---------- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/configure.ac b/configure.ac index 66e12da63..5b7e567f1 100644 --- a/configure.ac +++ b/configure.ac @@ -37,26 +37,37 @@ else fi AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno") -CANBERRA_MINIMUM=0.10 - AC_SUBST(CANBERRA_MINIMUM) +# MANDATORY for libtransmission CURL_MINIMUM=7.16.3 - AC_SUBST(CURL_MINIMUM) -DBUS_GLIB_MINIMUM=0.70 - AC_SUBST(DBUS_GLIB_MINIMUM) -GCONF2_MINIMUM=2.20.0 - AC_SUBST(GCONF2_MINIMUM) -GIO_MINIMUM=2.15.5 - AC_SUBST(GIO_MINIMUM) -GLIB_MINIMUM=2.6.0 - AC_SUBST(GLIB_MINIMUM) -GTK_MINIMUM=2.6.0 - AC_SUBST(GTK_MINIMUM) +AC_SUBST(CURL_MINIMUM) LIBEVENT_MINIMUM=1.4.5 - AC_SUBST(LIBEVENT_MINIUM) -LIBNOTIFY_MINIMUM=0.4.3 - AC_SUBST(LIBNOTIFY_MINIMUM) +AC_SUBST(LIBEVENT_MINIUM) OPENSSL_MINIMUM=0.9.4 - AC_SUBST(OPENSSL_MINIMUM) +AC_SUBST(OPENSSL_MINIMUM) + +# MANDATORY for the GTK+ client +GLIB_MINIMUM=2.6.0 +AC_SUBST(GLIB_MINIMUM) +GTK_MINIMUM=2.6.0 +AC_SUBST(GTK_MINIMUM) + +# OPTIONAL for the GTK+ client +# play the XDG "download done" sound... +CANBERRA_MINIMUM=0.10 +AC_SUBST(CANBERRA_MINIMUM) +# inhibit hibernation when a torrent is active... +DBUS_GLIB_MINIMUM=0.70 +AC_SUBST(DBUS_GLIB_MINIMUM) +# register the GTK+ client as a magnet link handler... +GCONF2_MINIMUM=2.20.0 +AC_SUBST(GCONF2_MINIMUM) +# implement "watch" directories to use new .torrent files... +GIO_MINIMUM=2.15.5 +AC_SUBST(GIO_MINIMUM) +# pop up a "download done" notice... +LIBNOTIFY_MINIMUM=0.4.3 +AC_SUBST(LIBNOTIFY_MINIMUM) + AC_PROG_CC AC_PROG_CXX diff --git a/transmission.spec.in b/transmission.spec.in index 206880f60..0982f43bc 100644 --- a/transmission.spec.in +++ b/transmission.spec.in @@ -14,23 +14,27 @@ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +# MANDATORY for libtransmission BuildRequires: curl-devel >= @CURL_MINIMUM@ -BuildRequires: dbus-glib-devel >= @DBUS_GLIB_MINIMUM@ +BuildRequires: libevent-devel >= @LIBEVENT_MINIMUM@ +BuildRequires: openssl-devel >= @OPENSSL_MINIMUM@ +Requires: curl >= @CURL_MINIMUM@ +Requires: libevent >= @LIBEVENT_MINIMUM@ +Requires: openssl >= @OPENSSL_MINIMUM@ +# MANDATORY for the gtk+ client BuildRequires: glib2-devel >= @GLIB_MINIMUM@ BuildRequires: gtk2-devel >= @GTK_MINIMUM@ -BuildRequires: libcanberra-devel >= @CANBERRA_MINIMUM@ -BuildRequires: libevent-devel >= @LIBEVENT_MINIMUM@ -BuildRequires: libnotify-devel >= @LIBNOTIFY_MINIMUM@ -BuildRequires: openssl-devel >= @OPENSSL_MINIMUM@ - -Requires: curl >= @CURL_MINIMUM@ -Requires: dbus-glib >= @DBUS_GLIB_MINIMUM@ Requires: glib2 >= @GLIB_MINIMUM@ Requires: gtk2 >= @GTK_MINIMUM@ +# OPTIONAL for the gtk+ client... see configure.ac for details +BuildRequires: GConf2-devel >= @GCONF2_MINIMUM@ +BuildRequires: dbus-glib-devel >= @DBUS_GLIB_MINIMUM@ +BuildRequires: libcanberra-devel >= @CANBERRA_MINIMUM@ +BuildRequires: libnotify-devel >= @LIBNOTIFY_MINIMUM@ +Requires: GConf2 >= @GCONF2_MINIMUM@ +Requires: dbus-glib >= @DBUS_GLIB_MINIMUM@ Requires: libcanberra >= @CANBERRA_MINIMUM@ -Requires: libevent >= @LIBEVENT_MINIMUM@ Requires: libnotify >= @LIBNOTIFY_MINIMUM@ -Requires: openssl >= @OPENSSL_MINIMUM@ Provides: %{name} @@ -62,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 13 2010 Charles Kerr +- made the GConf dependency explicit +- annotated the Depends section to show which libraries are optional * Thu Mar 5 2009 Gijs - fixed %files section - added Source0