Author: qboosh Date: Sun Nov 13 11:32:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- finish spec
- updated glibc patch (more fixes)
- added apache2 patch (updates for modern apr/apache 2 API)
- added install patch (fixes make install)
- -libs/-devel/-static packages contain API, main contains applications,
apache-mod_ipp is apache module
---- Files affected:
packages/papi:
papi-glibc.patch (1.1 -> 1.2) , papi.spec (1.1 -> 1.2) , papi-apache2.patch
(NONE -> 1.1) (NEW), papi-install.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/papi/papi-glibc.patch
diff -u packages/papi/papi-glibc.patch:1.1 packages/papi/papi-glibc.patch:1.2
--- packages/papi/papi-glibc.patch:1.1 Tue Apr 13 23:09:46 2010
+++ packages/papi/papi-glibc.patch Sun Nov 13 12:32:17 2011
@@ -23,3 +23,14 @@
/*
* This will handle the following forms:
+--- papi-1.0_beta/configure.in.orig 2006-03-12 07:15:33.000000000 +0100
++++ papi-1.0_beta/configure.in 2011-11-13 09:40:56.380634763 +0100
+@@ -29,7 +29,7 @@
+ AC_PROG_GCC_TRADITIONAL
+
+ dnl Check for libraries
+-AC_SEARCH_LIBS(rresvport,socket,,nsl)
++AC_SEARCH_LIBS(rresvport,socket nsl)
+ AC_SEARCH_LIBS(rresvport_af,nsl socket,[AC_DEFINE(HAVE_RRESVPORT_AF, 1,
+ [define if you have rresvport_af])],)
+ AC_SEARCH_LIBS(getipnodebyname,nsl socket,[AC_DEFINE(HAVE_GETIPNODEBYNAME, 1,
================================================================
Index: packages/papi/papi.spec
diff -u packages/papi/papi.spec:1.1 packages/papi/papi.spec:1.2
--- packages/papi/papi.spec:1.1 Tue Apr 13 23:09:46 2010
+++ packages/papi/papi.spec Sun Nov 13 12:32:17 2011
@@ -1,97 +1,211 @@
# $Revision$, $Date$
-Summary: -
-Summary(pl.UTF-8): -
+Summary: Free Standards Group Open Printing API and applications
implementation
+Summary(pl.UTF-8): Implementacja API i aplikacji Free Standards Group Open
Printing
Name: papi
Version: 1.0
%define subver beta
Release: 0.%{subver}.1
-License: GPL/LGPL/MIT/CDDL(?)
-Group: Libraries
+License: CDDL, MIT (libpapi-cups), LGPL v2+ (NSS for printers)
+Group: Applications/Printing
Source0:
http://downloads.sourceforge.net/openprinting/%{name}-%{version}_%{subver}.tar.bz2
# Source0-md5: 7e6f769de88d581fdb78a538d97e6373
Patch0: %{name}-glibc.patch
+Patch1: %{name}-apache2.patch
+Patch2: %{name}-install.patch
URL: http://openprinting.sourceforge.net/
BuildRequires: apache-devel >= 2.0
BuildRequires: apr-devel >= 1:1.0
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: cups-devel
+BuildRequires: libmagic-devel
+BuildRequires: libtool
+Requires: %{name}-libs = %{version}-%{release}
+Provides: printingclient
+Provides: printingdaemon
+Obsoletes: printingclient
+Obsoletes: printingdaemon
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _libexecdir %{_libdir}/papi
+
%description
+The Free Standards Group Open Printing API provides a standards based
+interface for applications to interact with print services. This
+implementation contains support for servers with LPD (RFC 1179) and/or
+IPP (RFC 2910/2911) protocol interfaces and name service storage of
+configuration data. There are also implementations of many common BSD
+and SysV printing commands.
%description -l pl.UTF-8
+Free Standards Group Open Printing API to oparty na standardach
+interfejs pozwalający aplikacjom współpracować z usługami drukowania.
+Ta implementacja zawiera obsługę serwerów obsługujących protokoły LPD
+(RFC 1179) i/lub IPP (RFC 2910/2911) oraz przechowywanie danych
+konfiguracyjnych z obsługą NSS. Zapewnia także implementację wielu
+często używanych poleceń BSD i SysV obsługujących drukowanie.
+
+%package -n apache-mod_ipp
+Summary: IPP (Internet Printing Protocol) module for Apache
+Summary(pl.UTF-8): Moduł IPP (Internet Printing Protocol) dla Apache'a
+Group: Networking/Daemons/HTTP
+Requires: %{name}-libs = %{version}-%{release}
+Requires: apache-base >= 2
+Provides: apache(mod_ipp) = %{version}-%{release}
+
+%description -n apache-mod_ipp
+IPP (Internet Printing Protocol) module for Apache.
+
+%description -n apache-mod_ipp -l pl.UTF-8
+Moduł IPP (Internet Printing Protocol) dla Apache'a.
+
+%package libs
+Summary: Free Standards Group Open Printing API libraries
+Summary(pl.UTF-8): Biblioteki Free Standards Group Open Printing API
+Group: Libraries
+
+%description libs
+Free Standards Group Open Printing API libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki Free Standards Group Open Printing API.
%package devel
-Summary: Header files for libpapi library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libpapi
+Summary: Header files for Free Standards Group Open Printing API
libraries
+Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Free Standards Group Open
Printing API
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
-Header files for libpapi library.
+Header files for Free Standards Group Open Printing API libraries.
%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki libpapi.
+Pliki nagłówkowe bibliotek Free Standards Group Open Printing API.
%package static
-Summary: Static libpapi library
-Summary(pl.UTF-8): Statyczna biblioteka libpapi
+Summary: Static Free Standards Group Open Printing API libraries
+Summary(pl.UTF-8): Statyczne Biblioteki Free Standards Group Open Printing
API
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
-Static libpapi library.
+Static Free Standards Group Open Printing API libraries.
%description static -l pl.UTF-8
-Statyczna biblioteka libpapi.
+Statyczne Biblioteki Free Standards Group Open Printing API.
%prep
%setup -q -n %{name}-%{version}_%{subver}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
-# if ac/am/lt/* rebuilding is necessary, do it in this order and add
-# appropriate BuildRequires
-#%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__autoheader}
-#%{__automake}
-CPPFLAGS=$(apr-1-config --includes)
-%configure
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+CPPFLAGS="$(apr-1-config --cppflags) $(apu-1-config --includes)"
+# debug.h and http.h are too common, use include subdir
+%configure \
+ --includedir=%{_includedir}/papi \
+ --enable-static
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-# create directories if necessary
-#install -d $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# modules dlopened by psm-*.so
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/psm-*.{la,a}
+
+# apache module
+install -d $RPM_BUILD_ROOT%{_libdir}/apache
+mv $RPM_BUILD_ROOT%{_libdir}/mod_ipp.so $RPM_BUILD_ROOT%{_libdir}/apache
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mod_ipp.{la,a}
+
+# keep only source form of examples, move to standard place
+install -d $RPM_BUILD_ROOT%{_examplesdir}
+mv $RPM_BUILD_ROOT%{_datadir}/examples/src
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/examples
+
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
-%doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%{_datadir}/%{name}
+%attr(755,root,root) %{_bindir}/cancel
+%attr(755,root,root) %{_bindir}/lp
+%attr(755,root,root) %{_bindir}/lpq
+%attr(755,root,root) %{_bindir}/lpr
+%attr(755,root,root) %{_bindir}/lprm
+%attr(755,root,root) %{_bindir}/lpstat
+%attr(755,root,root) %{_sbindir}/accept
+%attr(755,root,root) %{_sbindir}/disable
+%attr(755,root,root) %{_sbindir}/enable
+%attr(755,root,root) %{_sbindir}/in.lpd
+%attr(755,root,root) %{_sbindir}/lpc
+%attr(755,root,root) %{_sbindir}/lpmove
+%attr(755,root,root) %{_sbindir}/reject
+%attr(2755,root,lp) %{_libdir}/papi/lpd-port
+%attr(755,root,root) %{_libdir}/papi/psm-ipp.so
+%attr(755,root,root) %{_libdir}/papi/psm-lpd.so
+%{_mandir}/man1/accept.1m*
+%{_mandir}/man1/cancel.1*
+%{_mandir}/man1/disable.1*
+%{_mandir}/man1/enable.1*
+%{_mandir}/man1/lp.1*
+%{_mandir}/man1/lpc.1b*
+%{_mandir}/man1/lpmove.1m*
+%{_mandir}/man1/lpq.1b*
+%{_mandir}/man1/lpr.1b*
+%{_mandir}/man1/lprm.1b*
+%{_mandir}/man1/lpstat.1*
+%{_mandir}/man1/reject.1m*
+%{_mandir}/man5/psm-ipp.5*
+
+%files -n apache-mod_ipp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apache/mod_ipp.so
+
+%files libs
+%defattr(644,root,root,755)
+%doc ChangeLog README TODO
+%attr(755,root,root) %{_libdir}/libipp-core.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libipp-core.so.0
+%attr(755,root,root) %{_libdir}/libipp-listener.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libipp-listener.so.0
+%attr(755,root,root) %{_libdir}/libpapi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpapi.so.0
+%attr(755,root,root) %{_libdir}/libpapi-common.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpapi-common.so.0
+%dir %{_libdir}/papi
%files devel
%defattr(644,root,root,755)
-%doc devel-doc/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/foo
-%{_aclocaldir}/*.m4
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/libipp-core.so
+%attr(755,root,root) %{_libdir}/libipp-listener.so
+%attr(755,root,root) %{_libdir}/libpapi.so
+%attr(755,root,root) %{_libdir}/libpapi-common.so
+%{_libdir}/libipp-core.la
+%{_libdir}/libipp-listener.la
+%{_libdir}/libpapi.la
+%{_libdir}/libpapi-common.la
+%{_includedir}/papi
+%{_examplesdir}/%{name}-%{version}
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libipp-core.a
+%{_libdir}/libipp-listener.a
+%{_libdir}/libpapi.a
+%{_libdir}/libpapi-common.a
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -99,5 +213,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2011/11/13 11:32:17 qboosh
+- finish spec
+- updated glibc patch (more fixes)
+- added apache2 patch (updates for modern apr/apache 2 API)
+- added install patch (fixes make install)
+- -libs/-devel/-static packages contain API, main contains applications,
apache-mod_ipp is apache module
+
Revision 1.1 2010/04/13 21:09:46 qboosh
- very, very raw, no time to finish atm
================================================================
Index: packages/papi/papi-apache2.patch
diff -u /dev/null packages/papi/papi-apache2.patch:1.1
--- /dev/null Sun Nov 13 12:32:22 2011
+++ packages/papi/papi-apache2.patch Sun Nov 13 12:32:17 2011
@@ -0,0 +1,45 @@
+--- papi-1.0_beta/source/mod_ipp/mod_ipp.c.orig 2006-02-14
07:36:49.000000000 +0100
++++ papi-1.0_beta/source/mod_ipp/mod_ipp.c 2011-11-13 09:58:27.920669971
+0100
+@@ -27,7 +27,7 @@
+ #include "papi.h"
+ #ifndef APACHE_RELEASE /* appears to only exist in Apache 1.X */
+ #define APACHE2
+-#include "apr_compat.h"
++#define ap_table_get apr_table_get
+ #endif
+
+ #include <papi.h>
+@@ -170,7 +170,7 @@
+ va_end(args);
+
+ #ifdef APACHE2
+- ap_log_rerror(file, line, level, NULL, r, message);
++ ap_log_rerror(file, line, level, APR_SUCCESS, r, message);
+ #else
+ ap_log_rerror(file, line, level, r, message);
+ #endif
+@@ -264,6 +264,7 @@
+ config->default_svc);
+ }
+
++#ifndef APACHE2
+ /*
+ * For Trusted Solaris, pass the fd number of the socket connection
+ * to the backend so the it can be forwarded to the backend print
+@@ -272,6 +273,7 @@
+ */
+ (void) papiAttributeListAddInteger(&request, PAPI_ATTR_EXCL,
+ "peer-socket", ap_bfileno(r->connection->client, B_RD));
++#endif
+
+ /* process the request */
+ status = ipp_process_request(request, &response, read_data, r);
+@@ -375,7 +377,7 @@
+
+ /*ARGSUSED0*/
+ static const char *
+-ipp_operation(cmd_parms *cmd, void *cfg, char *op, char *toggle)
++ipp_operation(cmd_parms *cmd, void *cfg, const char *op, const char *toggle)
+ {
+ IPPListenerConfig *config = (IPPListenerConfig *)cfg;
+ papi_status_t status;
================================================================
Index: packages/papi/papi-install.patch
diff -u /dev/null packages/papi/papi-install.patch:1.1
--- /dev/null Sun Nov 13 12:32:23 2011
+++ packages/papi/papi-install.patch Sun Nov 13 12:32:17 2011
@@ -0,0 +1,26 @@
+--- papi-1.0_beta/docs/man/Makefile.am.orig 2006-03-12 07:30:42.000000000
+0100
++++ papi-1.0_beta/docs/man/Makefile.am 2011-11-13 12:17:58.690950257 +0100
+@@ -5,17 +5,14 @@
+ # $Id$
+ #
+
+-man_MANS_in = lpq.1b.in lpr.1b.in lprm.1b.in lpc.1b.in
+-man_MANS_in += lpstat.1.in lp.1.in cancel.1.in enable.1.in disable.1.in
+-man_MANS_in += lpmove.1m.in accept.1m.in reject.1m.in
+-man_MANS_in += psm-ipp.5.in
++mans1_in = lpq.1b.in lpr.1b.in lprm.1b.in lpc.1b.in
++mans1_in += lpstat.1.in lp.1.in cancel.1.in enable.1.in disable.1.in
++mans1_in += lpmove.1m.in accept.1m.in reject.1m.in
++mans5_in = psm-ipp.5.in
+
+
+-man_MANS=$(man_MANS_in:%.in=%)
+-man_MANS += lpq.1b lpr.1b lprm.1b lpc.1b
+-man_MANS += lpstat.1 lp.1 cancel.1 enable.1 disable.1
+-man_MANS += lpmove.1m accept.1m reject.1m
+-man_MANS += psm-ipp.5
++man1_MANS=$(mans1_in:%.in=%)
++man5_MANS=$(mans5_in:%.in=%)
+
+ SUFFIXES = .in
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/papi/papi-glibc.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/papi/papi.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
