[svn] r6352 - in trunk/rpms: . alevt dante dirac fuse-clamfs nepim
pan zapping zvbi
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Wed Jun 11 01:03:19 CEST 2008
Author: dag
Date: 2008-06-11 00:03:18 +0100 (Wed, 11 Jun 2008)
New Revision: 6352
Added:
trunk/rpms/dante/dante-1.1.19-private.patch
trunk/rpms/pan/pan-0.132-pixbuf.patch
Modified:
trunk/rpms/_template.spec
trunk/rpms/alevt/alevt.spec
trunk/rpms/dante/dante.spec
trunk/rpms/dirac/dirac.spec
trunk/rpms/fuse-clamfs/fuse-clamfs.spec
trunk/rpms/nepim/nepim.spec
trunk/rpms/pan/pan.spec
trunk/rpms/zapping/zapping.spec
trunk/rpms/zvbi/zvbi.spec
Log:
Updates
Modified: trunk/rpms/_template.spec
===================================================================
--- trunk/rpms/_template.spec 2008-06-10 11:41:27 UTC (rev 6351)
+++ trunk/rpms/_template.spec 2008-06-10 23:03:18 UTC (rev 6352)
@@ -52,7 +52,7 @@
%{__autoconf}
autoreconf --force --install --symlink
%configure \
- --disable-schemas-install
+ --disable-schemas-install
%{__make} %{?_smp_mflags}
%install
@@ -63,9 +63,9 @@
%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
desktop-file-install --vendor net \
- --add-category X-Red-Hat-Base \
- --dir %{buildroot}%{_datadir}/applications \
- %{name}.desktop
+ --add-category X-Red-Hat-Base \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{name}.desktop
%post
/sbin/ldconfig 2>/dev/null
@@ -87,6 +87,7 @@
%{_datadir}/applications/*.desktop
%files devel
+%defattr(-, root, root, 0755)
%{_includedir}/*.h
%{_libdir}/*.so
%exclude %{_libdir}/*.a
Modified: trunk/rpms/alevt/alevt.spec
===================================================================
--- trunk/rpms/alevt/alevt.spec 2008-06-10 11:41:27 UTC (rev 6351)
+++ trunk/rpms/alevt/alevt.spec 2008-06-10 23:03:18 UTC (rev 6352)
@@ -5,10 +5,10 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{!?dtag:%define _with_modxorg 1}
-%{?fc7: %define _with_modxorg 1}
-%{?el5: %define _with_modxorg 1}
-%{?fc6: %define _with_modxorg 1}
-%{?fc5: %define _with_modxorg 1}
+%{?fc7: %define _with_modxorg 1}
+%{?el5: %define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
%{?rh7:%define _without_freedesktop 1}
%{?el2:%define _without_freedesktop 1}
@@ -18,8 +18,8 @@
Summary: Teletext/videotext decoder and browser for the bttv driver and X
Name: alevt
-Version: 1.6.1
-Release: 1.2
+Version: 1.6.2
+Release: 1
License: GPL
Group: Applications/Multimedia
URL: http://www.goron.de/~froese/
@@ -57,26 +57,27 @@
%build
%{__make} %{?_smp_mflags} \
- OPT="%{optflags}"
+ OPT="%{optflags}"
%install
%{__rm} -rf %{buildroot}
+#%{__make} install DESTDIR="%{buildroot}"
%{__install} -Dp -m0755 alevt %{buildroot}%{_bindir}/alevt
+%{__install} -Dp -m0755 alevt-cap %{buildroot}%{_bindir}/alevt-cap
%{__install} -Dp -m0755 alevt-date %{buildroot}%{_bindir}/alevt-date
-%{__install} -Dp -m0755 alevt-cap %{buildroot}%{_bindir}/alevt-cap
%{__install} -Dp -m0644 alevt.1x %{buildroot}%{_mandir}/man1/alevt.1x
+%{__install} -Dp -m0644 alevt-cap.1 %{buildroot}%{_mandir}/man1/alevt-cap.1
%{__install} -Dp -m0644 alevt-date.1 %{buildroot}%{_mandir}/man1/alevt-date.1
-%{__install} -Dp -m0644 alevt-cap.1 %{buildroot}%{_mandir}/man1/alevt-cap.1
%{__install} -Dp -m0644 contrib/mini-alevt.xpm %{buildroot}%{_datadir}/pixmaps/alevt.xpm
%if %{?_without_freedesktop:1}0
- %{__install} -Dp -m0644 alevt.desktop %{buildroot}%{_datadir}/gnome/apps/Multimedia/alevt.desktop
+ %{__install} -Dp -m0644 alevt.desktop %{buildroot}%{_datadir}/gnome/apps/Multimedia/alevt.desktop
%else
- %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
- desktop-file-install --vendor %{desktop_vendor} \
- --add-category X-Red-Hat-Base \
- --dir %{buildroot}%{_datadir}/applications \
- alevt.desktop
+ %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
+ desktop-file-install --vendor %{desktop_vendor} \
+ --add-category X-Red-Hat-Base \
+ --dir %{buildroot}%{_datadir}/applications \
+ alevt.desktop
%endif
%clean
@@ -85,15 +86,19 @@
%files
%defattr(-, root, root, 0755)
%doc CHANGELOG COPYRIGHT README alevt.lsm.in
-%doc %{_mandir}/man1/*
-%{_bindir}/*
+%doc %{_mandir}/man1/alevt.1*
+%doc %{_mandir}/man1/alevt-cap.1*
+%doc %{_mandir}/man1/alevt-date.1*
+%{_bindir}/alevt
+%{_bindir}/alevt-cap
+%{_bindir}/alevt-date
%{_datadir}/pixmaps/alevt.xpm
%{?_without_freedesktop:%{_datadir}/gnome/apps/Multimedia/alevt.desktop}
%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-alevt.desktop}
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.6.1-1.2
-- Rebuild for Fedora Core 5.
+* Mon Jun 09 2008 Dag Wieers <dag at wieers.com> - 1.6.2-1
+- Updated to release 1.6.2.
* Sun Jun 06 2004 Dag Wieers <dag at wieers.com> - 1.6.1-1
- Initial package. (using DAR)
Added: trunk/rpms/dante/dante-1.1.19-private.patch
===================================================================
--- trunk/rpms/dante/dante-1.1.19-private.patch (rev 0)
+++ trunk/rpms/dante/dante-1.1.19-private.patch 2008-06-10 23:03:18 UTC (rev 6352)
@@ -0,0 +1,30 @@
+--- libscompat/issetugid.c.orig 2005-12-30 22:23:20.000000000 +0100
++++ libscompat/issetugid.c 2008-06-11 01:02:36.854742920 +0200
+@@ -8,20 +8,21 @@
+
+ #if !HAVE_ISSETUGID
+
++/* Disabled __libc_enable_secure because it is GLIBC_PRIVATE */
+ #if HAVE_LIBC_ENABLE_SECURE
+-extern int __libc_enable_secure;
++//extern int __libc_enable_secure;
+ #endif /* HAVE_LIBC_ENABLE_SECURE */
+
+ int
+ issetugid()
+ {
+ #if HAVE_LIBC_ENABLE_SECURE
+- if (__libc_enable_secure)
+- return 1;
+- else
+- return 0;
++// if (__libc_enable_secure) return 1;
+ #endif /* HAVE_LIBC_ENABLE_SECURE */
+- return 1; /* don't know, better safe than sorry. */
++// return 1; /* don't know, better safe than sorry. */
++ if (getuid() != geteuid()) return 1;
++ if (getgid() != getegid()) return 1;
++ return 0;
+ }
+ #else
+ static void avoid_error __P((void));
Modified: trunk/rpms/dante/dante.spec
===================================================================
--- trunk/rpms/dante/dante.spec 2008-06-10 11:41:27 UTC (rev 6351)
+++ trunk/rpms/dante/dante.spec 2008-06-10 23:03:18 UTC (rev 6352)
@@ -8,12 +8,13 @@
Summary: Free Socks v4/v5 client implementation
Name: dante
Version: 1.1.19
-Release: 1
+Release: 2
License: BSD-type
Group: Applications/Internet
URL: http://www.inet.no/dante/
Source: ftp://ftp.inet.no/pub/socks/dante-%{version}.tar.gz
+Patch0: dante-1.1.19-private.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: flex, bison
@@ -51,15 +52,16 @@
%prep
%setup
+%patch0 -p0 -b .orig
### Example should use /var/log/sockd by default
%{__perl} -pi -e 's|/var/log/lotsoflogs|%{_localstatedir}/log/sockd|' example/sockd.conf
%{__cat} <<EOF >sockd.logrotate
%{_localstatedir}/log/sockd {
- missingok
- copytruncate
- notifempty
+ missingok
+ copytruncate
+ notifempty
}
EOF
@@ -91,49 +93,49 @@
desc="Dante Socks server"
start() {
- echo -n $"Starting $desc ($prog): "
- daemon $prog -D
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
- return $RETVAL
+ echo -n $"Starting $desc ($prog): "
+ daemon $prog -D
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
+ return $RETVAL
}
stop() {
- echo -n $"Shutting down $desc ($prog): "
- killproc $prog
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog
- return $RETVAL
+ echo -n $"Shutting down $desc ($prog): "
+ killproc $prog
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$prog
+ return $RETVAL
}
restart() {
- stop
- start
+ stop
+ start
}
case "$1" in
start)
- start
- ;;
+ start
+ ;;
stop)
- stop
- ;;
+ stop
+ ;;
restart|reload)
- restart
- ;;
+ restart
+ ;;
condrestart)
- [ -e %{_localstatedir}/lock/subsys/$prog ] && restart
- RETVAL=$?
- ;;
+ [ -e %{_localstatedir}/lock/subsys/$prog ] && restart
+ RETVAL=$?
+ ;;
status)
- status $prog
- RETVAL=$?
- ;;
+ status $prog
+ RETVAL=$?
+ ;;
*)
- echo $"Usage: $0 {start|stop|restart|condrestart|status}"
- RETVAL=1
+ echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+ RETVAL=1
esac
exit $RETVAL
@@ -144,7 +146,7 @@
# Socksify any dynamically linked program by issuing:
#
-# dsocksify <program> <arguments>
+# dsocksify <program> <arguments>
LIBRARY="${SOCKS_LIBRARY-%{_libdir}/libdsocks.so}"
LD_PRELOAD="${LD_PRELOAD} ${LIBRARY}"
@@ -160,7 +162,7 @@
#
# chkconfig: - 89 11
# description: Dsocksify is a means to socksify your system transparantly \
-# (using Dante) on start-up after the network is up and running.
+# (using Dante) on start-up after the network is up and running.
#
# processname: dsocksify
#
@@ -171,63 +173,63 @@
source %{_initrddir}/functions
disable() {
- echo $"Warning: your installation is faulty."
- stop
- exit 1
+ echo $"Warning: your installation is faulty."
+ stop
+ exit 1
}
[ ! -r %{_sysconfdir}/socks.conf ] || disable
[ ! -x %{_libdir}/libdsocks.so.0 ] || disable
start() {
- echo -n $"Socksifying system: "
- grep "%{_libdir}/libdsocks.so" /etc/ld.so.preload &>/dev/null
- ret=$?
- if [ ! -f /etc/ld.so.preload -o $ret -ne 0 ]; then
- echo $"%{_libdir}/libdsocks.so.0" >>/etc/ld.so.preload
- success $"dsocksify startup"
- elif [ $ret -eq 0 ]; then
- passed $"dsocksify startup"
- else
- failure $"dsocksify startup"
- fi
- echo
+ echo -n $"Socksifying system: "
+ grep "%{_libdir}/libdsocks.so" /etc/ld.so.preload &>/dev/null
+ ret=$?
+ if [ ! -f /etc/ld.so.preload -o $ret -ne 0 ]; then
+ echo $"%{_libdir}/libdsocks.so.0" >>/etc/ld.so.preload
+ success $"dsocksify startup"
+ elif [ $ret -eq 0 ]; then
+ passed $"dsocksify startup"
+ else
+ failure $"dsocksify startup"
+ fi
+ echo
}
stop() {
- echo -n $"Unsocksifying system: "
- grep "%{_libdir}/libdsocks.so" /etc/ld.so.preload &>/dev/null
- if [ $? -eq 0 ]; then
- cat /etc/ld.so.preload | grep -v "%{_libdir}/libdsocks.so.0" >/etc/ld.so.preload.cache
- mv -f /etc/ld.so.preload.cache /etc/ld.so.preload
- success $"dsocksify shutdown"
- else
- failure $"dsocksify shutdown"
- fi
- if [ ! -s /etc/ld.so.preload ]; then
- rm -f /etc/ld.so.preload
- fi
- echo
+ echo -n $"Unsocksifying system: "
+ grep "%{_libdir}/libdsocks.so" /etc/ld.so.preload &>/dev/null
+ if [ $? -eq 0 ]; then
+ cat /etc/ld.so.preload | grep -v "%{_libdir}/libdsocks.so.0" >/etc/ld.so.preload.cache
+ mv -f /etc/ld.so.preload.cache /etc/ld.so.preload
+ success $"dsocksify shutdown"
+ else
+ failure $"dsocksify shutdown"
+ fi
+ if [ ! -s /etc/ld.so.preload ]; then
+ rm -f /etc/ld.so.preload
+ fi
+ echo
}
restart() {
- stop
- start
+ stop
+ start
}
case "$1" in
start)
- start
- ;;
+ start
+ ;;
stop)
- stop
- ;;
+ stop
+ ;;
restart)
- restart
- ;;
+ restart
+ ;;
*)
- echo $"Usage: $0 {start|stop|restart}"
- RETVAL=1
+ echo $"Usage: $0 {start|stop|restart}"
+ RETVAL=1
esac
exit $RETVAL
@@ -239,7 +241,7 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%{__install} -Dp -m0644 example/socks-simple.conf %{buildroot}%{_sysconfdir}/socks.conf
%{__install} -Dp -m0644 example/sockd.conf %{buildroot}%{_sysconfdir}/sockd.conf
@@ -253,19 +255,16 @@
### FIXME: Set library as executable - prevent ldd from complaining
%{__chmod} +x %{buildroot}%{_libdir}/*.so*
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%postun
-/sbin/ldconfig 2>/dev/null
-
%post server
/sbin/chkconfig --add sockd
%preun server
if [ $1 -eq 0 ]; then
- /sbin/service sockd stop &>/dev/null || :
- /sbin/chkconfig --del sockd
+ /sbin/service sockd stop &>/dev/null || :
+ /sbin/chkconfig --del sockd
fi
%postun server
@@ -291,7 +290,8 @@
%files server
%defattr(-, root, root, 0755)
%doc example/sockd*.conf
-%doc %{_mandir}/man[58]/sockd.*
+%doc %{_mandir}/man5/sockd.conf.5*
+%doc %{_mandir}/man8/sockd.8*
%config(noreplace) %{_sysconfdir}/sockd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/sockd
%config %{_initrddir}/sockd
@@ -300,14 +300,17 @@
%files devel
%defattr(-, root, root, 0755)
%doc doc/rfc* doc/SOCKS4.protocol INSTALL
+%{_libdir}/libsocks.so
+%{_includedir}/socks.h
#%{_libdir}/libdsocks.a
+%exclude %{_libdir}/libsocks.a
%exclude %{_libdir}/libdsocks.la
-%{_libdir}/libsocks.a
%exclude %{_libdir}/libsocks.la
-%{_libdir}/libsocks.so
-%{_includedir}/socks.h
%changelog
+* Wed Jun 11 2008 Dag Wieers <dag at wieers.com> - 1.1.19-2
+- Get rid of GLIBC_PRIVATE caused by using __libc_enable_secure.
+
* Sat Apr 29 2006 Dag Wieers <dag at wieers.com> - 1.1.19-1
- Updated to release 1.1.19.
Modified: trunk/rpms/dirac/dirac.spec
===================================================================
--- trunk/rpms/dirac/dirac.spec 2008-06-10 11:41:27 UTC (rev 6351)
+++ trunk/rpms/dirac/dirac.spec 2008-06-10 23:03:18 UTC (rev 6352)
@@ -34,17 +34,18 @@
%prep
%setup
-#%{__perl} -pi.orig -e 's|CXXFLAGS = -g -pedantic -Wall -Werror|CXXFLAGS = -g -pedantic -Wall|' decoder/Makefile.in
+### Disable -Werror in configure (since --disable-debug does not do this)
+%{__perl} -pi.orig -e 's|-Werror||' configure
%build
%configure CXXFLAGS="%{optflags}" CFLAGS="%{optflags}" \
+ --disable-debug \
--disable-static \
- --enable-debug="no" \
-%ifarch x86_64 \
+%ifarch x86_64
--enable-mmx="yes" \
-%else \
+%else
--enable-mmx="no" \
-%endif \
+%endif
--enable-overlay
%{__make} %{?_smp_mflags}
Modified: trunk/rpms/fuse-clamfs/fuse-clamfs.spec
===================================================================
--- trunk/rpms/fuse-clamfs/fuse-clamfs.spec 2008-06-10 11:41:27 UTC (rev 6351)
+++ trunk/rpms/fuse-clamfs/fuse-clamfs.spec 2008-06-10 23:03:18 UTC (rev 6352)
@@ -6,7 +6,7 @@
Summary: FUSE-based user-space file system for Linux with on-access anti-virus file scanning
Name: fuse-clamfs
Version: 0.9.1
-Release: 1
+Release: 2
License: GPL
Group: System Environment/Kernel
URL: http://clamfs.sourceforge.net/
@@ -29,7 +29,7 @@
%build
%configure \
- --disable-static
+ --disable-static
%{__make} %{?_smp_mflags}
%install
@@ -46,5 +46,8 @@
%{_bindir}/clamfs
%changelog
+* Tue Jun 10 2008 Dag Wieers <dag at wieers.com> - 0.9.1-2
+- Rebuild against commoncpp2-1.6.2.
+
* Sat May 12 2007 Dag Wieers <dag at wieers.com> - 0.9.1-1
- Initial package. (using DAR)
Modified: trunk/rpms/nepim/nepim.spec
===================================================================
--- trunk/rpms/nepim/nepim.spec 2008-06-10 11:41:27 UTC (rev 6351)
+++ trunk/rpms/nepim/nepim.spec 2008-06-10 23:03:18 UTC (rev 6352)
@@ -3,7 +3,7 @@
Summary: Network pipemeter is a network benchmark utility
Name: nepim
-Version: 0.40
+Version: 0.48
Release: 1
License: GPL
Group: Applications/Internet
@@ -42,5 +42,8 @@
%{_bindir}/nepim
%changelog
+* Tue Jun 10 2008 Dag Wieers <dag at wieers.com> - 0.48-1
+- Updated to release 0.48.
+
* Fri Aug 17 2007 Dag Wieers <dag at wieers.com> - 0.40-1
- Initial package. (using DAR)
Added: trunk/rpms/pan/pan-0.132-pixbuf.patch
===================================================================
--- trunk/rpms/pan/pan-0.132-pixbuf.patch (rev 0)
+++ trunk/rpms/pan/pan-0.132-pixbuf.patch 2008-06-10 23:03:18 UTC (rev 6352)
@@ -0,0 +1,172 @@
+--- pan/gui/body-pane.orig.cc 2007-08-01 13:00:00.000000000 -0400
++++ pan/gui/body-pane.cc 2007-08-16 16:14:09.000000000 -0400
+@@ -803,44 +803,137 @@
+ * Generates a GtkPixmap object from a given GMimePart that contains an image.
+ * Used for displaying attached pictures inline.
+ */
+- GdkPixbuf* get_pixbuf_from_gmime_part (const GMimePart * part)
++
++ GdkPixbuf*
++ get_pixbuf_from_gmime_part(
++ const GMimePart* part)
+ {
+- GdkPixbufLoader * l (gdk_pixbuf_loader_new ());
+- GError * err (0);
+
+- // populate the loader
+- GMimeDataWrapper * wrapper (g_mime_part_get_content_object (part));
+- if (wrapper)
+- {
+- GMimeStream * mem_stream (g_mime_stream_mem_new ());
+- g_mime_data_wrapper_write_to_stream (wrapper, mem_stream);
+- GByteArray * buffer (GMIME_STREAM_MEM(mem_stream)->buffer);
+- if (buffer->len)
+- gdk_pixbuf_loader_write (l, (guchar*)buffer->data, buffer->len, &err);
+- g_object_unref (mem_stream);
+- g_object_unref (wrapper);
++ GError* gdkError = NULL;
++
++ GMimeDataWrapper* wrapper(
++ g_mime_part_get_content_object(
++ part
++ )
++ );
++
++ if (wrapper == NULL) {
++ return(NULL);
+ }
+-
+- // create the pixbuf
+- GdkPixbuf * pixbuf (0);
+- if (!err)
+- pixbuf = gdk_pixbuf_loader_get_pixbuf (l);
+- else {
+- Log::add_err (err->message);
+- g_clear_error (&err);
++
++ GMimeStream* mem_stream(
++ g_mime_stream_mem_new()
++ );
++
++ g_mime_data_wrapper_write_to_stream(
++ wrapper,
++ mem_stream
++ );
++
++ GByteArray* buffer(
++ GMIME_STREAM_MEM(mem_stream)->buffer
++ );
++
++ GdkPixbufLoader* pixbufLoader(
++ gdk_pixbuf_loader_new()
++ );
++
++ // Feed the loader at a rate it hopefully can always handle properly
++
++ guchar* bufferPointer = (guchar*)buffer->data;
++ gsize bufferRemaining = buffer->len;
++
++ while (bufferRemaining > 0) {
++
++ gsize blockSize = (bufferRemaining > 8192) ? 8192 : bufferRemaining;
++
++ gboolean writeResult = gdk_pixbuf_loader_write(
++ pixbufLoader,
++ bufferPointer,
++ blockSize,
++ &gdkError
++ );
++
++ if (gdkError) {
++
++ Log::add_err(
++ gdkError->message
++ );
++
++ g_clear_error(
++ &gdkError
++ );
++
++ break;
++
++ }
++
++ if (writeResult != TRUE) {
++
++ Log::add_err(
++ "Pixbuf writer unable to accept complete data"
++ );
++
++ }
++
++ bufferPointer += blockSize;
++ bufferRemaining -= blockSize;
++
++ }
++
++ // Release Source Objects
++
++ g_object_unref(
++ mem_stream
++ );
++
++ g_object_unref(
++ wrapper
++ );
++
++ // Close the loader to flush any pending operations
++
++ gdk_pixbuf_loader_close(
++ pixbufLoader,
++ &gdkError
++ );
++
++ if (gdkError) {
++
++ Log::add_err(
++ gdkError->message
++ );
++
++ g_clear_error(
++ &gdkError
++ );
++
++ }
++
++ // Acquire Pixbuf reference
++
++ GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf(
++ pixbufLoader
++ );
++
++ if (pixbuf) {
++
++ g_object_ref(
++ G_OBJECT(pixbuf)
++ );
++
+ }
+
+- // cleanup
+- gdk_pixbuf_loader_close (l, &err);
+- if (err) {
+- Log::add_err (err->message);
+- g_clear_error (&err);
+- }
+- if (pixbuf)
+- g_object_ref (G_OBJECT(pixbuf));
+- g_object_unref (G_OBJECT(l));
+- return pixbuf;
++ // Release Loader
++
++ g_object_unref(
++ G_OBJECT(pixbufLoader)
++ );
++
++ return(pixbuf);
++
+ }
++
+ }
+
+ void
Modified: trunk/rpms/pan/pan.spec
===================================================================
--- trunk/rpms/pan/pan.spec 2008-06-10 11:41:27 UTC (rev 6351)
+++ trunk/rpms/pan/pan.spec 2008-06-10 23:03:18 UTC (rev 6352)
@@ -12,13 +12,14 @@
Summary: The Pan Newsreader
Name: pan
Version: 0.132
-Release: 1
+Release: 2
Epoch: 1
License: GPL
Group: Applications/Internet
URL: http://pan.rebelbase.com/
Source: http://pan.rebelbase.com/download/releases/%{version}/source/pan-%{version}.tar.bz2
+Patch0: pan-0.132-pixbuf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: glib2-devel >= 2.0.4, gtk2-devel >= 2.0.5, libxml2-devel >= 2.4.22
@@ -36,26 +37,28 @@
%prep
%setup
+%patch0 -b .pixbuf
+%{__perl} -pi.orig -e 's|StartupNotify=false|StartupNotify=true|' pan.desktop.in
+
%build
%configure \
- --program-prefix="%{?_program_prefix}"
-%{__make} %{?_smp_mflags} \
- LDFLAGS="-s"
+ --program-prefix="%{?_program_prefix}"
+%{__make} %{?_smp_mflags} LDFLAGS="-s"
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%find_lang %{name}
%if %{!?_without_freedesktop:1}0
desktop-file-install --vendor %{desktop_vendor} \
- --delete-original \
- --add-category Application \
- --add-category Network \
- --add-category X-Red-Hat-Base \
- --dir %{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/pan.desktop
+ --delete-original \
+ --add-category Application \
+ --add-category Network \
+ --add-category X-Red-Hat-Base \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/pan.desktop
%endif
%clean
@@ -69,6 +72,9 @@
%{_datadir}/pixmaps/pan.png
%changelog
+* Tue Jun 10 2008 Dag Wieers <dag at wieers.com> - 0.132-2
+- Added patch from Fedora.
+
* Thu Mar 13 2008 Heiko Adams <info-2007 at fedora-blog.de> - 0.132-1
- Updated to release 0.132.
Modified: trunk/rpms/zapping/zapping.spec
===================================================================
--- trunk/rpms/zapping/zapping.spec 2008-06-10 11:41:27 UTC (rev 6351)
+++ trunk/rpms/zapping/zapping.spec 2008-06-10 23:03:18 UTC (rev 6352)
@@ -15,7 +15,7 @@
Summary: TV viewer for GNOME
Name: zapping
Version: 0.10
-Release: 0.3%{?prever:.%{prever}}
+Release: 0.4%{?prever:.%{prever}}
License: GPL
Group: Applications/Multimedia
URL: http://zapping.sourceforge.net/
@@ -85,6 +85,9 @@
%changelog
+* Mon Jun 09 2008 Dag Wieers <dag at wieers.com> - 0.10-0.4.cvs6
+- Rebuild against zvbi-0.2.30.
+
* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.10-0.3.cvs6
- Update to 0.10cvs6.
Modified: trunk/rpms/zvbi/zvbi.spec
===================================================================
--- trunk/rpms/zvbi/zvbi.spec 2008-06-10 11:41:27 UTC (rev 6351)
+++ trunk/rpms/zvbi/zvbi.spec 2008-06-10 23:03:18 UTC (rev 6352)
@@ -4,14 +4,14 @@
%{?dtag: %{expand: %%define %dtag 1}}
%{!?dtag:%define _with_modxorg 1}
-%{?el5: %define _with_modxorg 1}
-%{?fc7: %define _with_modxorg 1}
-%{?fc6: %define _with_modxorg 1}
-%{?fc5: %define _with_modxorg 1}
+%{?el5: %define _with_modxorg 1}
+%{?fc7: %define _with_modxorg 1}
+%{?fc6: %define _with_modxorg 1}
+%{?fc5: %define _with_modxorg 1}
Summary: Raw VBI, Teletext and Closed Caption decoding library
Name: zvbi
-Version: 0.2.29
+Version: 0.2.30
Release: 1
License: GPL
Group: Applications/Multimedia
@@ -85,6 +85,9 @@
%exclude %{_libdir}/libzvbi-chains.la
%changelog
+* Mon Jun 09 2008 Dag Wieers <dag at wieers.com> - 0.2.30-1
+- Updated to release 0.2.30.
+
* Tue Feb 26 2008 Dag Wieers <dag at wieers.com> - 0.2.29-1
- Updated to release 0.2.29.
More information about the svn-commits
mailing list