rpms/gift/devel gift-0.11.8.1-gcc4.patch, NONE, 1.1 gift.spec, NONE, 1.1 giftd.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Dec 20 14:24:42 UTC 2005
Author: rdieter
Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10784/devel
Modified Files:
.cvsignore sources
Added Files:
gift-0.11.8.1-gcc4.patch gift.spec giftd.sh
Log Message:
auto-import gift-0.11.8.1-3 on branch devel from gift-0.11.8.1-3.src.rpm
gift-0.11.8.1-gcc4.patch:
--- NEW FILE gift-0.11.8.1-gcc4.patch ---
--- gift-0.11.8.1/src/plugin.c.gcc4 2004-11-11 20:52:16.000000000 -0600
+++ gift-0.11.8.1/src/plugin.c 2005-06-27 13:56:32.000000000 -0500
@@ -128,11 +128,11 @@
size_t msgwr = 0; \
va_list args; \
if (pfx1) \
- msgwr += snprintf (APPENDMSG, "%s: ", STRING_NOTNULL(pfx1)); \
+ msgwr += snprintf (msg + msgwr, sizeof (msg) - msgwr - 1, "%s: ", STRING_NOTNULL(pfx1)); \
if (pfx2) \
- msgwr += snprintf (APPENDMSG, "[%s]: ", STRING_NOTNULL(pfx2)); \
+ msgwr += snprintf (msg + msgwr, sizeof (msg) - msgwr - 1, "[%s]: ", STRING_NOTNULL(pfx2)); \
va_start (args, fmt); \
- vsnprintf (APPENDMSG, fmt, args); \
+ vsnprintf (msg + msgwr, sizeof (msg) - msgwr - 1, fmt, args); \
va_end (args);
static int wrapper_dbg (Protocol *p, char *fmt, ...)
--- NEW FILE gift.spec ---
%if "%{?fedora}" > "2"
%define _enable_libmagic --enable-libmagic
%endif
%if "%{?rhel}" > "3"
%define _enable_libmagic --enable-libmagic
%endif
Name: gift
Summary: Daemon for communicating with filesharing protocols
Version: 0.11.8.1
Release: 3%{?dist}
License: GPL
Group: System Environment/Daemons
URL: http://gift.sourceforge.net/
Source: http://dl.sourceforge.net/sourceforge/gift/gift-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: gift-0.11.8.1-gcc4.patch
# Wrapper for auto-launch gift-setup for first-time users
Source1: giftd.sh
BuildRequires: libtool
%if "%{?fedora}" >= "4"
BuildRequires: libtool-ltdl-devel
%endif
BuildRequires: libvorbis-devel
BuildRequires: ImageMagick-devel
%{?_enable_libmagic:BuildRequires: file > 4.0 }
%description
giFT is a modular daemon capable of abstracting the communication between
the end user and specific filesharing protocols (peer-to-peer or otherwise).
%package devel
Summary: Headers and library files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
%{summary}.
%prep
%setup -q
%patch1 -p1 -b .gcc4
%build
%configure %{?_enable_libmagic}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
## Move giftd out of the way, replace with wrapper
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mv $RPM_BUILD_ROOT%{_bindir}/giftd $RPM_BUILD_ROOT%{_sbindir}/
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/giftd
## Create/own plugin dir
mkdir -p $RPM_BUILD_ROOT%{_libdir}/giFT
## Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc README AUTHORS COPYING HACKING INSTALL QUICKSTART TODO
%{_bindir}/gift*
%{_sbindir}/giftd
%{_datadir}/giFT/
%{_libdir}/giFT/
%{_libdir}/lib*.so.*
%{_mandir}/man1/*
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc
%changelog
* Wed Dec 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-3
- --enable-libmagic (on platforms where file > 4 available)
* Tue Dec 13 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-2
- Summary: Capitalize
- BR: file (libmagic)
* Thu Dec 08 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-1
- cleanup for Fedora Extras
* Mon Nov 07 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-0.lvn.2
- -devel: BR: pkgconfig
* Mon Nov 29 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-0.lvn.1
- 0.11.8.1
* Wed Nov 17 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8-0.lvn.1
- 0.11.8
* Mon Nov 1 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.7-0.lvn.3
- fix linking (libgiftproto). Ugly, ugly hack... proper fix pending
* Wed Oct 27 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.7-0.lvn.2
- BR: libtool
* Tue Sep 28 2004 Rex Dieter <rexdieter at sf.net> 0.11.7-0.lvn.1
- 0.11.7
* Thu Jul 29 2004 Rex Dieter <rexdieter at sf.net> 0.11.6-0.lvn.2
- use giftd wrapper to auto-launch gift-setup for first-time users
* Thu Jul 29 2004 Rex Dieter <rexdieter at sf.net> 0.11.6-0.lvn.1
- adjust Release tag for livna.org submission
* Fri Jul 23 2004 Rex Dieter <rexdieter at sf.net> 0.11.6-0.fdr.3
- remove include files from main pkg
- create/own plugindir: %%_libdir/giFT
* Thu Jul 22 2004 Rex Dieter <rexdieter at sf.net> 0.11.6-0.fdr.2
- Group: System Environment/Daemons
* Thu Jul 22 2004 Rex Dieter <rexdieter at sf.net> 0.11.6-0.fdr.1
- 0.11.6
- fedora'ize
- -devel sup-pkg
* Mon Dec 29 2003 Dries Verachtert <dries at ulyssis.org> 0.11.5-1.dries
- first packaging for Fedora Core 1
--- NEW FILE giftd.sh ---
#!/bin/bash
GIFTD=/usr/sbin/giftd
# Try first using X(term)
if [ ! -d ~/.giFT ]; then
# naive attempt to run only run one instance per user (hopefully).
LOCKFILE=/var/tmp/gift-setup.${UID}.lock
echo $$ > $LOCKFILE ||:
# Try first using X(term), then fallback to console
if [ ! -z "${DISPLAY}" ]; then
xterm -e gift-setup || gift-setup
else
gift-setup
fi
rm -f $LOCKFILE
fi
# Hopefully we're good to go now
exec ${GIFTD}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Dec 2005 14:23:01 -0000 1.1
+++ .cvsignore 20 Dec 2005 14:24:40 -0000 1.2
@@ -0,0 +1 @@
+gift-0.11.8.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Dec 2005 14:23:01 -0000 1.1
+++ sources 20 Dec 2005 14:24:40 -0000 1.2
@@ -0,0 +1 @@
+1c70477af403af142359d07ee4a03348 gift-0.11.8.1.tar.bz2
More information about the scm-commits
mailing list