From: <ela...@us...> - 2009-05-22 04:06:48
|
Revision: 1888 http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1888&view=rev Author: elaine_sun Date: 2009-05-22 04:04:13 +0000 (Fri, 22 May 2009) Log Message: ----------- Bump to 1.61. Remove upstream patches. Modified Paths: -------------- spec-files-extra/trunk/ChangeLog spec-files-extra/trunk/SFEtransmission.spec Removed Paths: ------------- spec-files-extra/trunk/patches/transmission-01-solaris.diff Modified: spec-files-extra/trunk/ChangeLog =================================================================== --- spec-files-extra/trunk/ChangeLog 2009-05-20 06:49:02 UTC (rev 1887) +++ spec-files-extra/trunk/ChangeLog 2009-05-22 04:04:13 UTC (rev 1888) @@ -1,3 +1,9 @@ +2009-05-22 Elaine Xiong <ela...@su...> + + * SFEtransmission.spec: + * patches/transmission-01-solaris.diff: bump to 1.61. Remove + upstream patches. + 2009-05-20 Brian Lu <bri...@su...> * SFEtalloc.spec SFEtdb.spec SFEtevent.spec SFEsamba4.spec SFElibmapi.spec patches/samba4-02-map-rename.diff, Modified: spec-files-extra/trunk/SFEtransmission.spec =================================================================== --- spec-files-extra/trunk/SFEtransmission.spec 2009-05-20 06:49:02 UTC (rev 1887) +++ spec-files-extra/trunk/SFEtransmission.spec 2009-05-22 04:04:13 UTC (rev 1888) @@ -6,16 +6,19 @@ Name: SFEtransmission Summary: Transmission - GTK and console BitTorrent client -Version: 1.22 +Version: 1.61 Source: http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2 -Patch: transmission-01-solaris.diff URL: http://transmission.m0k.org/ SUNW_BaseDir: %{_basedir} BuildRoot: %{_tmppath}/%{source_name}-%{version}-build %include default-depend.inc -BuildRequires: SUNWgnome-base-libs +BuildRequires: SUNWgtk2-devel BuildRequires: SUNWopenssl-include -Requires: SUNWgnome-base-libs +BuildRequires: SUNWgnome-panel-devel +BuildRequires: SUNWdbus-glib-devel +Requires: SUNWgtk2 +Requires: SUNWgnome-panel +Requires: SUNWdbus-glib Requires: SUNWopenssl-libraries Requires: SUNWcurl %if %option_with_gnu_iconv @@ -36,7 +39,6 @@ %prep %setup -q -n %{source_name}-%{version} -%patch0 -p1 %build CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '` @@ -44,18 +46,16 @@ CPUS=1 fi -export CFLAGS="%optflags -mt -I/usr/sfw/include" -export CXXFLAGS="%cxx_optflags -mt -I/usr/sfw/include" +export CFLAGS="%optflags -mt -D__inline=inline -xc99" %if %option_with_gnu_iconv export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl" export CXXFLAGS="$CXXFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl" %endif -export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib" - ./configure --prefix=%{_prefix} \ --datadir=%{_datadir} \ --mandir=%{_mandir} \ + --disable-wx \ --program-prefix="" make -j$CPUS @@ -89,6 +89,8 @@ %{_datadir}/applications/* %dir %attr (0755, root, other) %{_datadir}/pixmaps %{_datadir}/pixmaps/* +%dir %attr (0755, root, other) %{_datadir}/transmission +%{_datadir}/transmission/* %dir %attr (0755, root, other) %{_datadir}/icons %dir %attr (-, root, other) %{_datadir}/icons/hicolor %dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16 @@ -118,6 +120,8 @@ %endif %changelog +* Fri May 22 2009 - ela...@su... +- Bump to 1.61. Remove upstream patches. * Wed Jun 25 2008 - dar...@su... - Bump to 1.2.2 and remove upstream patch for compiler. Add patch for solaris getgateway implementation. Deleted: spec-files-extra/trunk/patches/transmission-01-solaris.diff =================================================================== --- spec-files-extra/trunk/patches/transmission-01-solaris.diff 2009-05-20 06:49:02 UTC (rev 1887) +++ spec-files-extra/trunk/patches/transmission-01-solaris.diff 2009-05-22 04:04:13 UTC (rev 1888) @@ -1,113 +0,0 @@ -diff -up transmission-1.22/third-party/libnatpmp/getgateway.c.orig transmission-1.22/third-party/libnatpmp/getgateway.c ---- transmission-1.22/third-party/libnatpmp/getgateway.c.orig 2008-06-13 23:00:51.000000000 +0100 -+++ transmission-1.22/third-party/libnatpmp/getgateway.c 2008-06-25 22:07:53.085644461 +0100 -@@ -23,6 +23,13 @@ - #include <sys/socket.h> - #include <net/route.h> - #endif -+#if defined(sun) && defined(__SVR4) -+#include <unistd.h> -+#include <string.h> -+#include <sys/socket.h> -+#include <net/if.h> -+#include <net/route.h> -+#endif - #include "getgateway.h" - - #ifdef __linux__ -@@ -115,3 +122,94 @@ int getdefaultgateway(in_addr_t * addr) - return r; - } - #endif -+ -+#if defined(sun) && defined(__SVR4) -+ -+#define SUCCESS (0) -+#define FAILED (-1) -+ -+#define NEXTADDR(w, u) \ -+ if (rtm_addrs & (w)) {\ -+ l = sizeof(struct sockaddr); memmove(cp, &(u), l); cp += l;\ -+ } -+ -+ -+#define rtm m_rtmsg.m_rtm -+ -+struct { -+ struct rt_msghdr m_rtm; -+ char m_space[512]; -+} m_rtmsg; -+ -+int getdefaultgateway(in_addr_t *addr) -+{ -+ int s, seq, l, rtm_addrs, i; -+ pid_t pid; -+ struct sockaddr so_dst, so_mask; -+ char *cp = m_rtmsg.m_space; -+ struct sockaddr *gate = NULL, *sa; -+ struct rt_msghdr *msg_hdr; -+ -+ pid = getpid(); -+ seq = 0; -+ rtm_addrs = RTA_DST | RTA_NETMASK; -+ -+ memset(&so_dst, 0, sizeof(so_dst)); -+ memset(&so_mask, 0, sizeof(so_mask)); -+ memset(&rtm, 0, sizeof(struct rt_msghdr)); -+ -+ rtm.rtm_type = RTM_GET; -+ rtm.rtm_flags = RTF_UP | RTF_GATEWAY; -+ rtm.rtm_version = RTM_VERSION; -+ rtm.rtm_seq = ++seq; -+ rtm.rtm_addrs = rtm_addrs; -+ -+ so_dst.sa_family = AF_INET; -+ so_mask.sa_family = AF_INET; -+ -+ NEXTADDR(RTA_DST, so_dst); -+ NEXTADDR(RTA_NETMASK, so_mask); -+ -+ rtm.rtm_msglen = l = cp - (char *)&m_rtmsg; -+ -+ s = socket(PF_ROUTE, SOCK_RAW, 0); -+ -+ if (write(s, (char *)&m_rtmsg, l) < 0) { -+ close(s); -+ return FAILED; -+ } -+ -+ do { -+ l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg)); -+ } while (l > 0 && (rtm.rtm_seq != seq || rtm.rtm_pid != pid)); -+ -+ close(s); -+ -+ msg_hdr = &rtm; -+ -+ cp = ((char *)(msg_hdr + 1)); -+ if (msg_hdr->rtm_addrs) { -+ for (i = 1; i; i <<= 1) -+ if (i & msg_hdr->rtm_addrs) { -+ sa = (struct sockaddr *)cp; -+ if (i == RTA_GATEWAY ) -+ gate = sa; -+ -+ cp += sizeof(struct sockaddr); -+ } -+ } -+ else { -+ return FAILED; -+ } -+ -+ -+ if (gate != NULL ) { -+ *addr = ntohl(((struct sockaddr_in *)gate)->sin_addr.s_addr); -+ return SUCCESS; -+ } -+ else { -+ return FAILED; -+ } -+} -+#endif /* defined(sun) && defined(__SVR4) */ -+ - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |