[svn] r6238 - in trunk/rpms: . alpine dkms icmpinfo icmpush
imapsync incron inkscape libidn libwpd libwpg mercurial
xine-lib xournal
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Thu Mar 27 18:23:28 CET 2008
Author: dag
Date: 2008-03-27 17:23:26 +0000 (Thu, 27 Mar 2008)
New Revision: 6238
Added:
trunk/rpms/icmpush/
trunk/rpms/icmpush/icmpush-debian.patch
trunk/rpms/icmpush/icmpush.spec
trunk/rpms/incron/
trunk/rpms/incron/incron-0.5.7-gcc43.patch
trunk/rpms/incron/incron.spec
trunk/rpms/libwpd/
trunk/rpms/libwpd/libwpd.spec
trunk/rpms/libwpg/
trunk/rpms/libwpg/libwpg.spec
Modified:
trunk/rpms/alpine/alpine.spec
trunk/rpms/dkms/dkms.spec
trunk/rpms/icmpinfo/icmpinfo.spec
trunk/rpms/imapsync/imapsync.spec
trunk/rpms/inkscape/inkscape.spec
trunk/rpms/libidn/libidn.spec
trunk/rpms/mercurial/mercurial.spec
trunk/rpms/xine-lib/xine-lib.spec
trunk/rpms/xournal/xournal.spec
Log:
Updates
Modified: trunk/rpms/alpine/alpine.spec
===================================================================
--- trunk/rpms/alpine/alpine.spec 2008-03-27 15:02:22 UTC (rev 6237)
+++ trunk/rpms/alpine/alpine.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -3,13 +3,15 @@
Summary: Alternative Pine mail user agent implementation
Name: alpine
-Version: 1.00
+Version: 1.10
Release: 1
License: Apache License
Group: Applications/Internet
URL: http://www.washington.edu/alpine/
-Source: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.gz
+Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.gz
+Source1: pine.conf
+Source2: pine.conf.fixed
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: inews, aspell, openldap-devel, openssl-devel, krb5-devel, pam-devel
@@ -36,8 +38,10 @@
%build
touch imap/ip6
%configure \
- --with-passfile=".pinepwd" \
- --with-spellcheck-prog="aspell"
+ --with-spellcheck-prog="aspell" \
+ --with-system-pinerc="%{_sysconfdir}/pine.conf" \
+ --with-system-fixed-pinerc="%{_sysconfdir}/pine.conf.fixed"
+# --with-passfile=".pinepwd" \
%{__make} %{?_smp_mflags}
%install
@@ -57,6 +61,9 @@
%{__install} -Dp -m0644 doc/rpdump.1 %{buildroot}%{_mandir}/man1/rpdump.1
%{__install} -Dp -m0644 imap/src/mailutil/mailutil.1 %{buildroot}%{_mandir}/man1/mailutil.1
+%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pine.conf
+%{__install} -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pine.conf.fixed
+
%{__ln_s} -f alpine %{buildroot}%{_bindir}/pine
%{__ln_s} -f alpine.1.gz %{buildroot}%{_mandir}/man1/pine.1.gz
@@ -73,6 +80,8 @@
%doc %{_mandir}/man1/pine.1*
%doc %{_mandir}/man1/rpdump.1*
%doc %{_mandir}/man1/rpload.1*
+%config %{_sysconfdir}/pine.conf
+%config(noreplace) %{_sysconfdir}/alpine.conf
%{_bindir}/alpine
%{_bindir}/mailutil
%{_bindir}/pico
@@ -85,6 +94,14 @@
%{_sbindir}/mlock
%changelog
+* Thu Mar 20 2008 Dag Wieers <dag at wieers.com> - 1.10-2
+- Restore original pine.conf location.
+
+* Tue Mar 18 2008 Dag Wieers <dag at wieers.com> - 1.10-1
+- Updated to release 1.10.
+- Included original pine.conf, lacking anything better.
+- Disable --passfile, use platform-specific password caching.
+
* Fri Dec 21 2007 Dag Wieers <dag at wieers.com> - 1.00-1
- Updated to release 1.00.
Modified: trunk/rpms/dkms/dkms.spec
===================================================================
--- trunk/rpms/dkms/dkms.spec 2008-03-27 15:02:22 UTC (rev 6237)
+++ trunk/rpms/dkms/dkms.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -10,7 +10,7 @@
Summary: Dynamic Kernel Module Support Framework
Name: dkms
-Version: 2.0.17.6
+Version: 2.0.19
Release: 1
License: GPL
Group: System Environment/Kernel
@@ -72,6 +72,9 @@
%{_localstatedir}/lib/dkms/
%changelog
+* Wed Mar 26 2008 Dag Wieers <dag at wieers.com> - 2.0.19-1
+- Updated to release 2.0.19.
+
* Thu Mar 06 2008 Dag Wieers <dag at wieers.com> - 2.0.17.6-1
- Updated to release 2.0.17.6.
- Added make as a requirement. (Manuel Wolfshant)
Modified: trunk/rpms/icmpinfo/icmpinfo.spec
===================================================================
--- trunk/rpms/icmpinfo/icmpinfo.spec 2008-03-27 15:02:22 UTC (rev 6237)
+++ trunk/rpms/icmpinfo/icmpinfo.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -40,8 +40,5 @@
%{_sbindir}/icmpinfo
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 1.11-1.2
-- Rebuild for Fedora Core 5.
-
* Sun May 08 2005 Dag Wieers <dag at wieers.com> - 1.11-1
- Initial package. (using DAR)
Added: trunk/rpms/icmpush/icmpush-debian.patch
===================================================================
--- trunk/rpms/icmpush/icmpush-debian.patch (rev 0)
+++ trunk/rpms/icmpush/icmpush-debian.patch 2008-03-27 17:23:26 UTC (rev 6238)
@@ -0,0 +1,178 @@
+--- icmpush-2.2.orig/mtu.c
++++ icmpush-2.2/mtu.c
+@@ -76,7 +76,7 @@
+ == -1 )
+ {
+ if ( more_verbose )
+- fprintf(stderr, "setsockopt -> %s\n", sys_errlist[errno] );
++ fprintf(stderr, "setsockopt -> %s\n", strerror(errno) );
+ return 1;
+ }
+
+@@ -84,7 +84,7 @@
+ == -1 )
+ {
+ if ( more_verbose )
+- fprintf( stderr,"connect -> %s\n", sys_errlist[errno] );
++ fprintf( stderr,"connect -> %s\n", strerror(errno) );
+ return 1;
+ }
+
+@@ -92,7 +92,7 @@
+ if ( getsockname( sock_rt, (struct sockaddr *)&iface_out, &len ) == -1 )
+ {
+ if ( more_verbose )
+- fprintf(stderr,"getsockname -> %s\n", sys_errlist[errno] );
++ fprintf(stderr,"getsockname -> %s\n", strerror(errno) );
+ return 1;
+ }
+
+@@ -134,7 +134,7 @@
+ {
+ if ( more_verbose )
+ fprintf(stderr, "When trying socket() to kernel -> %s",
+- sys_errlist[errno]);
++ strerror(errno));
+ return MTU_DFL;
+ }
+
+@@ -143,7 +143,7 @@
+ if (ioctl( sock_disp, SIOCGIFCONF, &ifc) < 0)
+ {
+ if ( more_verbose )
+- fprintf(stderr, "SIOCGIFCONF -> %s", sys_errlist[errno]);
++ fprintf(stderr, "SIOCGIFCONF -> %s", strerror(errno));
+ return MTU_DFL;
+ }
+ ifaz = ifc.ifc_req;
+@@ -190,7 +190,7 @@
+ if (ioctl( sock_disp, SIOCGIFADDR, &if_aux) < 0)
+ {
+ if ( more_verbose )
+- fprintf(stderr,"SIOCGIFADDR -> %s\n", sys_errlist[errno]);
++ fprintf(stderr,"SIOCGIFADDR -> %s\n", strerror(errno));
+ return 1;
+ }
+
+@@ -201,7 +201,7 @@
+ if (ioctl(sock_disp, SIOCGIFMTU, &if_aux) < 0)
+ {
+ if ( more_verbose )
+- fprintf(stderr,"SIOCGIFMTU -> %s\n", sys_errlist[errno]);
++ fprintf(stderr,"SIOCGIFMTU -> %s\n", strerror(errno));
+ return 1;
+ }
+
+@@ -216,7 +216,7 @@
+ if ( ioctl( sock_disp, SIOCGIFFLAGS, &if_aux ) < 0 )
+ {
+ if ( more_verbose )
+- fprintf(stderr,"SIOCGIFFLAGS -> %s\n", sys_errlist[errno]);
++ fprintf(stderr,"SIOCGIFFLAGS -> %s\n", strerror(errno));
+ return 1;
+ }
+ mi_interfaz->ifaz_flags = if_aux.ifr_flags;
+--- icmpush-2.2.orig/cuenta.c
++++ icmpush-2.2/cuenta.c
+@@ -3,7 +3,7 @@
+ /*****************************************/
+ #include <stdio.h>
+ #include <stdlib.h>
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+ register int i;
+ int final, princ;
+@@ -15,7 +15,7 @@
+ {
+ for ( i = princ; i <= final; i++ )
+ printf("%d ", i);
+- return;
++ return 0;
+ }
+ }
+ #ifdef SPANISH
+@@ -23,4 +23,5 @@
+ #else
+ printf("Use: %s begin# end#\n", argv[0]);
+ #endif
++ return 1;
+ }
+--- icmpush-2.2.orig/parser.c
++++ icmpush-2.2/parser.c
+@@ -296,7 +296,7 @@
+ add_router( packet, router_addr, preference );
+ }
+ else
+- fprintf(stderr, "strtok() error -> %s\n", sys_errlist[errno]);
++ fprintf(stderr, "strtok() error -> %s\n", strerror(errno));
+ args++;
+ continue;
+ }
+@@ -513,7 +513,7 @@
+ init->router = (struct router *)malloc(sizeof(struct router));
+ if ( init->router == NULL )
+ {
+- fprintf(stderr, "Malloc error -> %s\n", sys_errlist[errno]);
++ fprintf(stderr, "Malloc error -> %s\n", strerror(errno));
+ exit(0);
+ }
+ init->num_routers++;
+@@ -537,7 +537,7 @@
+ cursor->next = (struct router *)malloc(sizeof(struct router));
+ if (!cursor)
+ {
+- fprintf(stderr, "Malloc error -> %s\n", sys_errlist[errno]);
++ fprintf(stderr, "Malloc error -> %s\n", strerror(errno));
+ return;
+ }
+ init->num_routers++;
+--- icmpush-2.2.orig/icmpush.c
++++ icmpush-2.2/icmpush.c
+@@ -49,6 +49,7 @@
+ #include <string.h>
+ #include <setjmp.h>
+ #include <stdlib.h>
++#include <time.h>
+
+ #include "compat.h"
+ #include "misc.h"
+@@ -290,17 +291,17 @@
+ if ( setsockopt( sock, SOL_SOCKET, SO_BROADCAST, (char *)&on, sizeof(on) )
+ == -1 )
+ if ( more_verbose)
+- fprintf(stderr,"%s: SO_BROADCAST -> %s\n", prog, sys_errlist[errno] );
++ fprintf(stderr,"%s: SO_BROADCAST -> %s\n", prog, strerror(errno) );
+
+ if ( setsockopt( sock, SOL_SOCKET, SO_RCVBUF, (char *)&tam_sock_buf,
+ sizeof(tam_sock_buf) ) == -1 )
+ if ( more_verbose )
+- fprintf(stderr,"%s: SO_RCVBUF -> %s\n", prog, sys_errlist[errno] );
++ fprintf(stderr,"%s: SO_RCVBUF -> %s\n", prog, strerror(errno) );
+
+ if (setsockopt( sock, SOL_SOCKET, SO_SNDBUF, (char *)&tam_sock_buf,
+ sizeof(tam_sock_buf) ) == -1 )
+ if ( more_verbose )
+- fprintf(stderr,"%s: SO_SNDBUF -> %s\n", prog, sys_errlist[errno] );
++ fprintf(stderr,"%s: SO_SNDBUF -> %s\n", prog, strerror(errno) );
+ }
+
+
+@@ -887,7 +888,7 @@
+ else
+ fprintf(stdout, "%-2d= %s ", entry,
+ inet_ntoa(data_rdisc->router_addr));
+- fprintf(stdout, " Prefer. -> %ld\n",
++ fprintf(stdout, " Prefer. -> %i\n",
+ ntohl(data_rdisc->pref_level.s_addr) );
+ }
+
+@@ -1044,7 +1045,7 @@
+ void salir_con_error( int num_error )
+ {
+ fprintf(stderr,"%s: %s -> %s\n", prog, mensaje_err[num_error][LNG],
+- sys_errlist[errno] );
++ strerror(errno) );
+ exit(num_error);
+ }
+
Added: trunk/rpms/icmpush/icmpush.spec
===================================================================
--- trunk/rpms/icmpush/icmpush.spec (rev 0)
+++ trunk/rpms/icmpush/icmpush.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -0,0 +1,52 @@
+# $Id$
+# Authority: dag
+
+Summary: Send icmp error packets to receive remote system info
+Name: icmpush
+%define real_version 22
+Version: 2.2
+Release: 1
+License: GPL
+Group: Applications/Internet
+URL: http://www.securityfocus.com/data/tools/
+
+Source: http://www.securityfocus.com/data/tools/icmpush%{real_version}.tar.gz
+Patch0: icmpush-debian.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+icmpush is a program that sends icmp error packets and obtains remote info
+through icmp packets. Supports spoof and broadcasting. This new release
+supports the following ICMP error types: Unreach, Parameter Problem, Redirect
+and Source Quench; ICMP information types: Timestamp, Address Mask Request,
+Information Request, Router Solicitation (Router Discovery), Router
+Advertisement (Router Discovery) and Echo Request. This program features an
+excellent interface with a wide number of options (flags) and values. As an
+added bonus, Slayer has included a mini-script called try_reset that tries
+to reset existing telnet or rlogin connections. Your security auditing toolkit
+is not complete without this program! One of the few 5-star programs.
+
+%prep
+%setup
+%patch0 -p1 -b .debian
+
+%build
+%{__make} linuz
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man8/
+%{__make} install INST_DIR="%{buildroot}%{_bindir}" MAN_DIR="%{buildroot}%{_mandir}/man8/"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc BUGS CHANGES COPYING GREETINGS IMPORTANT INSTALL LICENSE README SITES
+%doc %{_mandir}/man8/icmpush.8*
+%{_bindir}/icmpush
+
+%changelog
+* Wed Mar 26 2008 Oliver Hookins <oliver.hookins at anchor.com.au> - 2.2-1
+- Initial packaging of icmpush
Property changes on: trunk/rpms/icmpush/icmpush.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/imapsync/imapsync.spec
===================================================================
--- trunk/rpms/imapsync/imapsync.spec 2008-03-27 15:02:22 UTC (rev 6237)
+++ trunk/rpms/imapsync/imapsync.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -3,7 +3,7 @@
Summary: Tool to migrate across IMAP servers
Name: imapsync
-Version: 1.241
+Version: 1.249
Release: 1
License: GPL
Group: Applications/Internet
@@ -56,6 +56,9 @@
%{__rm} -rf %{buildroot}
%changelog
+* Wed Mar 26 2008 Dag Wieers <dag at wieers.com> - 1.249-1
+- Updated to release 1.249.
+
* Mon Feb 11 2008 Dag Wieers <dag at wieers.com> - 1.241-1
- Updated to release 1.241.
Added: trunk/rpms/incron/incron-0.5.7-gcc43.patch
===================================================================
--- trunk/rpms/incron/incron-0.5.7-gcc43.patch (rev 0)
+++ trunk/rpms/incron/incron-0.5.7-gcc43.patch 2008-03-27 17:23:26 UTC (rev 6238)
@@ -0,0 +1,24 @@
+diff -up incron-0.5.7/appargs.h.orig incron-0.5.7/appargs.h
+--- incron-0.5.7/appargs.h.orig 2008-02-09 13:45:31.000000000 +0100
++++ incron-0.5.7/appargs.h 2008-02-09 13:45:39.000000000 +0100
+@@ -23,7 +23,7 @@
+ #ifndef APPARGS_H_
+ #define APPARGS_H_
+
+-#include <string>
++#include <cstring>
+ #include <map>
+ #include <deque>
+
+diff -up incron-0.5.7/incroncfg.h.orig incron-0.5.7/incroncfg.h
+--- incron-0.5.7/incroncfg.h.orig 2008-02-09 13:45:06.000000000 +0100
++++ incron-0.5.7/incroncfg.h 2008-02-09 13:45:13.000000000 +0100
+@@ -18,7 +18,7 @@
+ #define INCRONCFG_H_
+
+
+-#include <string>
++#include <cstring>
+ #include <map>
+
+ /// Configuration class.
Added: trunk/rpms/incron/incron.spec
===================================================================
--- trunk/rpms/incron/incron.spec (rev 0)
+++ trunk/rpms/incron/incron.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -0,0 +1,154 @@
+# $Id$
+# Authority: dag
+
+Summary: Inotify cron system
+Name: incron
+Version: 0.5.7
+Release: 1
+License: GPL
+Group: System Environment/Base
+URL: http://inotify.aiken.cz/
+
+Source: http://inotify.aiken.cz/download/incron/incron-%{version}.tar.bz2
+Patch0: incron-0.5.7-gcc43.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+Requires: /sbin/chkconfig
+Requires: /sbin/service
+
+%description
+incron is an "inotify cron" system. incron consists of a daemon and a table
+manipulator. One can use it a similar way as the regular cron, but the
+difference is that the inotify cron handles filesystem events rather than
+time periods.
+
+%prep
+%setup
+%patch0 -p1
+
+%{__cat} <<'EOF' >incrond.sysv
+#!/bin/bash
+#
+# Init file for incrond daemon
+#
+# Written by Dag Wieers <dag at wieers.com>
+#
+# chkconfig: - 97 03
+# description: Filesystem event daemon, works like cron, but handles filesystem events
+# instead of time periods and can send notifications via mail, dbus
+# or syslog.
+#
+# processname: incrond
+# config: %{_sysconfdir}/incrond.conf
+# pidfile: %{_localstatedir}/run/incrond.pid
+
+source %{_initrddir}/functions
+
+RETVAL=0
+prog="incrond"
+desc="Filesystem event daemon"
+
+start() {
+ echo -n $"Starting $desc ($prog): "
+ daemon $proc
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/$prog
+}
+
+stop() {
+ echo -n $"Shutting down $desc ($prog): "
+ killproc $proc
+ echo
+ [ $RETVAL -eq 0 ] && rm -f %{_localstatedir}/lock/subsys/$proc
+}
+
+restart() {
+ stop
+ start
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|force-reload|reload)
+ restart
+ ;;
+ condrestart)
+ [ -f /var/lock/subsys/incrond ] && restart
+ ;;
+ status)
+ status incrond
+ RETVAL=$?
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
+ exit 1
+esac
+
+exit $RETVAL
+EOF
+
+%build
+%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
+
+%install
+%{__rm} -rf %{buildroot}
+
+#%{__make} install DESTDIR="%{buildroot}"
+%{__install} -Dp -m0755 incrond %{buildroot}%{_sbindir}/incrond
+%{__install} -Dp -m4755 incrontab %{buildroot}%{_bindir}/incrontab
+%{__install} -Dp -m0755 incrond.sysv %{buildroot}%{_initrddir}/incrond
+
+%{__install} -Dp -m0400 incrontab.1 %{buildroot}%{_mandir}/man1/incrontab.1
+%{__install} -Dp -m0400 incrontab.5 %{buildroot}%{_mandir}/man5/incrontab.5
+%{__install} -Dp -m0400 incron.conf.5 %{buildroot}%{_mandir}/man5/incron.conf.5
+%{__install} -Dp -m0400 incrond.8 %{buildroot}%{_mandir}/man8/incrond.8
+
+%{__install} -Dp -m0644 incron.conf.example %{buildroot}%{_sysconfdir}/incron.conf
+
+%{__install} -d %{buildroot}%{_sysconfdir}/incron.d/
+%{__install} -d %{buildroot}%{_localstatedir}/spool/incron/
+
+%post
+if [ $1 -eq 1 ]; then
+ /sbin/chkconfig --add incrond
+fi
+
+%preun
+if [ $1 -eq 0 ]; then
+ /sbin/service incrond stop &>/dev/null || :
+ /sbin/chkconfig --del incrond
+fi
+
+%postun
+if [ $1 -ge 1 ]; then
+ /sbin/service incrond condrestart &>/dev/null || :
+fi
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc CHANGELOG COPYING LICENSE-* README TODO incron.conf.example
+%doc %{_mandir}/man1/incrontab.1*
+%doc %{_mandir}/man5/incrontab.5*
+%doc %{_mandir}/man5/incron.conf.5*
+%doc %{_mandir}/man8/incrond.8*
+%config(noreplace) %{_sysconfdir}/incron.conf
+%config %{_initrddir}/incrond
+%{_sbindir}/incrond
+%dir %{_localstatedir}/spool/incron/
+%dir %{_sysconfdir}/incron.d/
+
+%defattr(4755, root, root, 0755)
+%{_bindir}/incrontab
+
+%changelog
+* Thu Mar 27 2008 Dag Wieers <dag at wieers.com> - 0.5.7-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/incron/incron.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/inkscape/inkscape.spec
===================================================================
--- trunk/rpms/inkscape/inkscape.spec 2008-03-27 15:02:22 UTC (rev 6237)
+++ trunk/rpms/inkscape/inkscape.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -25,26 +25,34 @@
Summary: Vector drawing application
Name: inkscape
-Version: 0.45.1
-Release: 2
+Version: 0.46
+Release: 1
License: GPL
Group: Applications/Multimedia
URL: http://inkscape.sourceforge.net/
Source: http://dl.sf.net/inkscape/inkscape-%{version}.tar.gz
-Patch0: inkscape-0.44.1-psinput.patch
-Patch1: inkscape-0.45-python.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
#BuildRequires: libsigc++2-devel, gtkmm24-devel, glibmm-devel
-BuildRequires: gtkmm2, lcms-devel
-# >= 2.4
-BuildRequires: libgc-devel, perl(XML::Parser)
-BuildRequires: gcc-c++, pkgconfig
-BuildRequires: gettext, libpng-devel, freetype-devel, zlib-devel
-BuildRequires: gtk2-devel >= 2.8, libxml2-devel, libxslt-devel
-BuildRequires: python-devel, lcms-devel >= 1.13
+BuildRequires: freetype-devel
+BuildRequires: gcc-c++
+BuildRequires: gettext
+BuildRequires: gnome-vfs2-devel >= 2.0
+BuildRequires: gtk2-devel >= 2.8
+BuildRequires: gtkmm2
+BuildRequires: lcms-devel >= 1.13
+BuildRequires: libgc-devel
+BuildRequires: libpng-devel
+BuildRequires: libwpg-devel
+BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
BuildRequires: loudmouth-devel >= 1.0
+BuildRequires: perl(XML::Parser)
+BuildRequires: pkgconfig
+BuildRequires: poppler-devel
+BuildRequires: python-devel
+BuildRequires: zlib-devel
%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
#%{?_without_modxorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGLU}
%{?_without_modxorg:BuildRequires: XFree86-devel, xorg-x11-Mesa-libGLU}
@@ -59,19 +67,17 @@
%prep
%setup
-%patch0 -p1 -b .psinput
-%patch1 -p1 -b .python
-
%build
%configure \
- --enable-inkboard \
- --enable-lcms \
- --enable-static="no" \
- --with-gnome-vfs \
- --with-inkjar \
- --with-perl \
- --with-python \
- --with-xinerama
+ --enable-inkboard \
+ --enable-lcms \
+ --enable-poppler-cairo \
+ --enable-static="no" \
+ --with-gnome-vfs \
+ --with-inkjar \
+ --with-perl \
+ --with-python \
+ --with-xinerama
%{__make} %{?_smp_mflags}
%install
@@ -80,11 +86,11 @@
%find_lang %{name}
%if %{!?_without_freedesktop:1}0
- desktop-file-install --delete-original \
- --vendor %{desktop_vendor} \
- --add-category X-Red-Hat-Base \
- --dir %{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/inkscape.desktop
+ desktop-file-install --delete-original \
+ --vendor %{desktop_vendor} \
+ --add-category X-Red-Hat-Base \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/inkscape.desktop
%endif
%post
@@ -99,16 +105,21 @@
%files -f %{name}.lang
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING* HACKING*txt NEWS README TRANSLATORS
-%doc %{_mandir}/man1/ink*.1*
-%doc %{_mandir}/*/man1/ink*.1*
-%{_bindir}/ink*
-#%{_libdir}/inkscape
+%doc %{_mandir}/man1/inkscape.1*
+%doc %{_mandir}/man1/inkview.1*
+%doc %{_mandir}/*/man1/inkscape.1*
+#%doc %{_mandir}/*/man1/inkview.1*
+%{_bindir}/inkscape
+%{_bindir}/inkview
%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-inkscape.desktop}
%{?_without_freedesktop:%{_datadir}/applications/inkscape.desktop}
%{_datadir}/inkscape/
%{_datadir}/pixmaps/inkscape.png
%changelog
+* Wed Mar 26 2008 Dag Wieers <dag at wieers.com> - 0.46-1
+- Updated to release 0.46.
+
* Sun Jul 29 2007 Dag Wieers <dag at wieers.com> - 0.45-2
- Rebuild against libgc-7.0.
Modified: trunk/rpms/libidn/libidn.spec
===================================================================
--- trunk/rpms/libidn/libidn.spec 2008-03-27 15:02:22 UTC (rev 6237)
+++ trunk/rpms/libidn/libidn.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -2,12 +2,13 @@
# Authority: dag
# Upstream: <bug-libidn$gnu,org>
-# ExcludeDist: el4
+### RHEL4 and newer ship with libidn
+# ExclusiveDist: el2 rh7 rh9 el3
Summary: Internationalized string processing library
Name: libidn
-Version: 0.4.6
-Release: 1.2
+Version: 0.5.6
+Release: 0.1
License: LGPL
Group: System Environment/Libraries
URL: http://josefsson.org/libidn/releases/
@@ -39,12 +40,13 @@
%setup
%build
-%configure
+%configure \
+ --disable-static
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
%find_lang %{name}
%{__make} -C examples distclean
@@ -55,12 +57,9 @@
### Clean up buildroot
%{__rm} -f %{buildroot}%{_datadir}/info/dir
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%postun
-/sbin/ldconfig 2>/dev/null
-
%post devel
/sbin/install-info %{_infodir}/libidn*.info.gz %{_infodir}/dir
@@ -73,25 +72,26 @@
%files -f %{name}.lang
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog contrib COPYING* doc/libidn.html FAQ INSTALL NEWS README* THANKS TODO
-%doc %{_mandir}/man1/*
-%{_bindir}/*
-%{_datadir}/emacs/site-lisp/*.el
-%{_libdir}/*.so.*
+%doc %{_mandir}/man1/idn.1*
+%{_bindir}/idn
+%{_datadir}/emacs/site-lisp/idna.el
+%{_datadir}/emacs/site-lisp/punycode.el
+%{_libdir}/libidn.so.*
%files devel
%defattr(-, root, root, 0755)
%doc doc/*.pdf doc/reference doc/specifications/ examples/ libc/example.c TODO
-%doc %{_mandir}/man3/*
+%doc %{_mandir}/man3/*.3*
%doc %{_infodir}/*.info*
-%{_libdir}/*.a
-%{_libdir}/*.so
+#%{_libdir}/libidn.a
%{_includedir}/*.h
-%{_libdir}/pkgconfig/*.pc
-%exclude %{_libdir}/*.la
+%{_libdir}/libidn.so
+%{_libdir}/pkgconfig/libidn.pc
+%exclude %{_libdir}/libidn.la
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.4.6-1.2
-- Rebuild for Fedora Core 5.
+* Wed Mar 26 2008 Dag Wieers <dag at wieers.com> - 0.5.6-0.1
+- Updated to release 0.5.6.
* Wed May 26 2004 Dag Wieers <dag at wieers.com> - 0.4.6-1
- Updated to release 0.4.6.
Added: trunk/rpms/libwpd/libwpd.spec
===================================================================
--- trunk/rpms/libwpd/libwpd.spec (rev 0)
+++ trunk/rpms/libwpd/libwpd.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -0,0 +1,83 @@
+# $Id$
+# Authority: dag
+
+Summary: Library for reading and converting WordPerfect(tm) documents
+Name: libwpd
+Version: 0.8.14
+Release: 1
+License: LGPL
+Group: System Environment/Libraries
+URL: http://libwpd.sourceforge.net/
+
+Source: http://dl.sf.net/libwpd/libwpd-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: glib2-devel >= 2.0.0, libgsf-devel >= 1.6.0, gcc-c++, libstdc++-devel
+Requires: glib2 >= 2.0.0, libgsf >= 1.6.0
+
+%description
+libwpd is a library for reading and converting WordPerfect(tm) documents.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: glib2-devel >= 2.0.0, libgsf-devel >= 1.6.0
+
+%description devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%package tools
+Summary: Tools to transform WordPerfect Documents into other formats
+Group: Applications/Publishing
+
+%description tools
+Tools to transform WordPerfect Documents into other formats.
+Currently supported: html, raw, text.
+
+%prep
+%setup
+
+%build
+%configure \
+ --disable-static \
+ --without-docs
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc CHANGES COPYING CREDITS HACKING README TODO
+%{_libdir}/libwpd-0.8.so.*
+%{_libdir}/libwpd-stream-0.8.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/libwpd-0.8/
+%{_libdir}/libwpd-0.8.so
+%{_libdir}/libwpd-stream-0.8.so
+%{_libdir}/pkgconfig/libwpd-0.8.pc
+%{_libdir}/pkgconfig/libwpd-stream-0.8.pc
+%exclude %{_libdir}/libwpd-0.8.la
+%exclude %{_libdir}/libwpd-stream-0.8.la
+
+%files tools
+%defattr(-, root, root, 0755)
+%{_bindir}/wpd2html
+%{_bindir}/wpd2raw
+%{_bindir}/wpd2text
+
+%changelog
+* Wed Mar 26 2008 Dag Wieers <dag at wieers.com> - 0.8.14-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/libwpd/libwpd.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: trunk/rpms/libwpg/libwpg.spec
===================================================================
--- trunk/rpms/libwpg/libwpg.spec (rev 0)
+++ trunk/rpms/libwpg/libwpg.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -0,0 +1,81 @@
+# $Id$
+# Authority: dag
+
+Summary: Library for importing and converting Corel WordPerfect(tm) Graphics images
+Name: libwpg
+Version: 0.1.2
+Release: 1
+License: LGPL
+Group: System Environment/Libraries
+URL: http://libwpg.sourceforge.net/
+
+Source: http://dl.sf.net/libwpg/libwpg-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: libwpd-devel >= 0.8.0, gcc-c++, libstdc++-devel, pkgconfig
+
+%description
+libwpg is a library for importing and converting Corel WordPerfect(tm)
+Graphics images.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libwpd-devel >= 0.8.0
+
+%description devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%package tools
+Summary: Tools to transform WordPerfect Graphics into other formats
+Group: Applications/Publishing
+
+%description tools
+Tools to transform WordPerfect Graphics into other formats.
+
+%prep
+%setup
+
+%build
+%configure \
+ --without-docs
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING README
+%{_libdir}/libwpg-0.1.so.*
+%{_libdir}/libwpg-stream-0.1.so.*
+
+%files tools
+%defattr(-, root, root, 0755)
+%{_bindir}/wpg2raw
+%{_bindir}/wpg2svg
+%{_bindir}/wpg2svgbatch.pl
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/libwpg-0.1/
+%{_libdir}/libwpg-0.1.so
+%{_libdir}/libwpg-stream-0.1.so
+%{_libdir}/pkgconfig/libwpg-0.1.pc
+%{_libdir}/pkgconfig/libwpg-stream-0.1.pc
+%exclude %{_libdir}/libwpg-0.1.la
+%exclude %{_libdir}/libwpg-stream-0.1.la
+
+%changelog
+* Wed Mar 26 2008 Dag Wieers <dag at wieers.com> - 0.1.2-1
+- Initial package. (using DAR)
Modified: trunk/rpms/mercurial/mercurial.spec
===================================================================
--- trunk/rpms/mercurial/mercurial.spec 2008-03-27 15:02:22 UTC (rev 6237)
+++ trunk/rpms/mercurial/mercurial.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -29,10 +29,6 @@
%description hgk
With hgk you can browse a repository graphically.
-Add the following to ~/.hgrc and use 'hg view':
-[extensions]
-hgk=
-
%prep
%setup
Modified: trunk/rpms/xine-lib/xine-lib.spec
===================================================================
--- trunk/rpms/xine-lib/xine-lib.spec 2008-03-27 15:02:22 UTC (rev 6237)
+++ trunk/rpms/xine-lib/xine-lib.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -59,7 +59,7 @@
Summary: Core library of the xine multimedia player
Name: xine-lib
-Version: 1.1.10.1
+Version: 1.1.11
Release: 1
License: GPL
Group: Applications/Multimedia
@@ -209,6 +209,9 @@
%exclude %{_libdir}/libxine.la
%changelog
+* Wed Mar 26 2008 Dag Wieers <dag at wieers.com> - 1.1.11-1
+- Updated to release 1.1.11.
+
* Mon Feb 11 2008 Dag Wieers <dag at wieers.com> - 1.1.10.1-1
- Updated to release 1.1.10.1.
Modified: trunk/rpms/xournal/xournal.spec
===================================================================
--- trunk/rpms/xournal/xournal.spec 2008-03-27 15:02:22 UTC (rev 6237)
+++ trunk/rpms/xournal/xournal.spec 2008-03-27 17:23:26 UTC (rev 6238)
@@ -3,7 +3,7 @@
Summary: Stylus oriented notetaking
Name: xournal
-Version: 0.4.1
+Version: 0.4.2
Release: 1
License: GPL
Group: Applications/Productivity
@@ -43,6 +43,9 @@
%{_datadir}/xournal/
%changelog
+* Wed Mar 26 2008 Dag Wieers <dag at wieers.com> - 0.4.2-1
+- Updated to release 0.4.2.
+
* Sat Sep 22 2007 Dag Wieers <dag at wieers.com> - 0.4.1-1
- Updated to release 0.4.1.
More information about the svn-commits
mailing list