[svn] r5484 - in trunk/rpms: . qca qca-sasl qca-tls rrdtool
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Thu Jun 7 00:41:24 CEST 2007
Author: dag
Date: 2007-06-07 00:41:23 +0200 (Thu, 07 Jun 2007)
New Revision: 5484
Added:
trunk/rpms/qca-sasl/
trunk/rpms/qca-sasl/qca-sasl.spec
trunk/rpms/qca-tls/
trunk/rpms/qca-tls/qca-tls-1.0-mach.patch
trunk/rpms/qca-tls/qca-tls-1.0-openssl098.patch
trunk/rpms/qca-tls/qca-tls.spec
trunk/rpms/qca/
trunk/rpms/qca/qca-1.0-mach.patch
trunk/rpms/qca/qca.spec
Modified:
trunk/rpms/rrdtool/rrdtool.spec
Log:
Updates
Added: trunk/rpms/qca/qca-1.0-mach.patch
===================================================================
--- trunk/rpms/qca/qca-1.0-mach.patch (rev 0)
+++ trunk/rpms/qca/qca-1.0-mach.patch 2007-06-06 22:41:23 UTC (rev 5484)
@@ -0,0 +1,10 @@
+--- ./qca.pro.mach 2004-11-22 11:15:24.061984966 +0100
++++ ./qca.pro 2004-11-22 11:15:31.483010203 +0100
+@@ -2,6 +2,7 @@
+
+ TEMPLATE = lib
+ CONFIG += qt thread release
++CONFIG += no_fixpath
+ TARGET = qca
+
+ MOC_DIR = .moc
Added: trunk/rpms/qca/qca.spec
===================================================================
--- trunk/rpms/qca/qca.spec (rev 0)
+++ trunk/rpms/qca/qca.spec 2007-06-06 22:41:23 UTC (rev 5484)
@@ -0,0 +1,70 @@
+# $Id$
+# Authority: dag
+
+Summary: Qt Cryptographic Architecture
+Name: qca
+Version: 1.0
+Release: 1
+License: LGPL
+Group: System Environment/Libraries
+URL: http://delta.affinix.com/qca/
+
+Source: http://delta.affinix.com/download/qca/qca-%{version}.tar.bz2
+Patch: qca-1.0-mach.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: qt-devel >= 1:3.0
+
+%description
+QCA aims to provide a straightforward and cross-platform crypto API, using Qt
+datatypes and conventions. QCA separates the API from the implementation,
+using plugins known as Providers.
+
+The advantage of this model is to allow applications to avoid linking to or
+explicitly depending on any particular cryptographic library. This allows one
+to easily change or upgrade crypto implementations without even needing to
+recompile the application.
+
+%package devel
+Summary: Header files, libraries and development documentation for %{name}.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%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.
+
+%prep
+%setup
+%patch0 -p0 -b .mach
+%{__perl} -pi.orig -e 's|target\.path=\$PREFIX/lib|target.path=\$PREFIX/%{_lib}|g' qcextra
+
+%build
+source %{_sysconfdir}/profile.d/qt.sh
+./configure --prefix="%{_prefix}" --qtdir="$QTDIR"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install INSTALL_ROOT="%{buildroot}"
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc COPYING README TODO
+%{_libdir}/libqca.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%{_includedir}/qca.h
+%{_libdir}/libqca.so
+
+%changelog
+* Wed Jun 06 2007 Dag Wieers <dag at wieers.com> - 1.0-1
+- initial package. (using DAR)
Property changes on: trunk/rpms/qca/qca.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: trunk/rpms/qca-sasl/qca-sasl.spec
===================================================================
--- trunk/rpms/qca-sasl/qca-sasl.spec (rev 0)
+++ trunk/rpms/qca-sasl/qca-sasl.spec 2007-06-06 22:41:23 UTC (rev 5484)
@@ -0,0 +1,48 @@
+# $Id$
+# Authority: dag
+
+Summary: SASL plugin for the Qt Cryptographic Architecture
+Name: qca-sasl
+Version: 1.0
+Release: 1
+License: LGPL
+Group: Applications/Internet
+URL: http://delta.affinix.com/qca/
+
+Source: http://delta.affinix.com/download/qca/qca-sasl-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: qt-devel >= 1:3.0, cyrus-sasl-devel >= 2.0
+
+%description
+This is a plugin to provide SSL/SASL capability to programs that use the Qt
+Cryptographic Architecture (QCA). QCA is a library providing an easy API
+for several cryptographic algorithms to Qt programs. This package only
+contains the SASL plugin.
+
+%prep
+%setup
+
+%build
+source %{_sysconfdir}/profile.d/qt.sh
+./configure --qtdir="$QTDIR"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}$QTDIR/plugins/crypto/
+%{__make} install INSTALL_ROOT="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc COPYING README
+%dir %{_libdir}/qt-*/
+%dir %{_libdir}/qt-*/plugins/
+%{_libdir}/qt-*/plugins/crypto/
+
+%changelog
+* Wed Jun 06 2007 Dag Wieers <dag at wieers.com> - 1.0-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/qca-sasl/qca-sasl.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: trunk/rpms/qca-tls/qca-tls-1.0-mach.patch
===================================================================
--- trunk/rpms/qca-tls/qca-tls-1.0-mach.patch (rev 0)
+++ trunk/rpms/qca-tls/qca-tls-1.0-mach.patch 2007-06-06 22:41:23 UTC (rev 5484)
@@ -0,0 +1,10 @@
+--- ./qca-tls.pro.mach 2004-06-10 11:55:22.411187448 +0200
++++ ./qca-tls.pro 2004-06-10 11:55:43.460987392 +0200
+@@ -2,6 +2,7 @@
+
+ TEMPLATE = lib
+ CONFIG += qt thread release plugin
++CONFIG += no_fixpath
+ TARGET = qca-tls
+
+ !exists(qcaprovider.h) {
Added: trunk/rpms/qca-tls/qca-tls-1.0-openssl098.patch
===================================================================
--- trunk/rpms/qca-tls/qca-tls-1.0-openssl098.patch (rev 0)
+++ trunk/rpms/qca-tls/qca-tls-1.0-openssl098.patch 2007-06-06 22:41:23 UTC (rev 5484)
@@ -0,0 +1,26 @@
+--- ./qca-tls.cpp.ossl098 2003-12-10 17:53:57.000000000 +0100
++++ ./qca-tls.cpp 2005-11-13 22:21:50.000000000 +0100
+@@ -454,7 +454,11 @@
+ if(!r) {
+ // try this other public function, for whatever reason
+ p = (void *)in;
++#ifdef OSSL_097
++ r = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&p, len);
++#else
+ r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p, len);
++#endif
+ }
+ if(r) {
+ if(pub) {
+@@ -798,7 +802,11 @@
+
+ bool createFromDER(const char *in, unsigned int len)
+ {
++#ifdef OSSL_097
++ const unsigned char *p = (const unsigned char *)in;
++#else
+ unsigned char *p = (unsigned char *)in;
++#endif
+ X509 *t = d2i_X509(NULL, &p, len);
+ if(!t)
+ return false;
Added: trunk/rpms/qca-tls/qca-tls.spec
===================================================================
--- trunk/rpms/qca-tls/qca-tls.spec (rev 0)
+++ trunk/rpms/qca-tls/qca-tls.spec 2007-06-06 22:41:23 UTC (rev 5484)
@@ -0,0 +1,58 @@
+# $Id$
+# Authority: dag
+
+%{?dist: %{expand: %%define %dist 1}}
+
+%{!?dist:%define _with_openssl098 1}
+%{?el5:%define _with_openssl098 1}
+
+Summary: TLS plugin for the Qt Cryptographic Architecture
+Name: qca-tls
+Version: 1.0
+Release: 1
+License: LGPL
+Group: Applications/Internet
+URL: http://delta.affinix.com/qca/
+
+Source: http://delta.affinix.com/download/qca/qca-tls-%{version}.tar.bz2
+Patch: qca-tls-1.0-mach.patch
+Patch1: qca-tls-1.0-openssl098.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: qt-devel >= 1:3.0, openssl-devel
+%{?_with_openssl098:BuildRequires: openssl-devel >= 0.9.8}
+
+%description
+This is a plugin to provide SSL/TLS capability to programs that use the Qt
+Cryptographic Architecture (QCA). QCA is a library providing an easy API
+for several cryptographic algorithms to Qt programs. This package only
+contains the TLS plugin.
+
+%prep
+%setup
+%patch0 -p0 -b .mach
+%{?_with_openssl098:%patch1 -p0 -b .openssl098}
+
+%build
+source %{_sysconfdir}/profile.d/qt.sh
+./configure --qtdir="$QTDIR"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}$QTDIR/plugins/crypto/
+%{__make} install INSTALL_ROOT="%{buildroot}"
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc COPYING README
+%dir %{_libdir}/qt-*/
+%dir %{_libdir}/qt-*/plugins/
+%{_libdir}/qt-*/plugins/crypto/
+
+%changelog
+* Wed Jun 06 2007 Dag Wieers <dag at wieers.com> - 1.0-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/qca-tls/qca-tls.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/rrdtool/rrdtool.spec
===================================================================
--- trunk/rpms/rrdtool/rrdtool.spec 2007-06-06 13:38:54 UTC (rev 5483)
+++ trunk/rpms/rrdtool/rrdtool.spec 2007-06-06 22:41:23 UTC (rev 5484)
@@ -6,27 +6,41 @@
%{?el3:%define _without_python 1}
%{?rh9:%define _without_python 1}
+%{?rh9:%define _without_ruby 1}
%{?rh9:%define _without_tcltk_devel 1}
+%{?rh7:%define _without_python 1}
+%{?rh7:%define _without_ruby 1}
+%{?rh7:%define _without_tcltk_devel 1}
+
+%{?el2:%define _without_python 1}
+%{?el2:%define _without_ruby 1}
+%{?el2:%define _without_tcltk_devel 1}
+
%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
%define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
%define python_version %(%{__python} -c 'import string, sys; print string.split(sys.version, " ")[0]')
+%define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+%define ruby_archdir %(ruby -rrbconfig -e "puts Config::CONFIG['archdir']")
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
-Version: 1.2.18
+Version: 1.2.23
Release: 1
License: GPL
Group: Applications/Databases
URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
-Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
+Source0: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
+Patch0: rrdtool-1.2.13-php.patch
+Patch1: rrdtool-1.2.19-python.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, openssl-devel, libart_lgpl-devel >= 2.0, cgilib-devel
+BuildRequires: gcc-c++, openssl-devel, cgilib-devel, libart_lgpl-devel >= 2.0
BuildRequires: libpng-devel, zlib-devel, freetype-devel
%{!?_without_python:BuildRequires: python-devel >= 2.3}
+%{!?_without_ruby:BuildRequires: ruby-devel}
%{!?_without_tcltk_devel:BuildRequires: tcl-devel, tk-devel}
%{?_without_tcltk_devel:BuildRequires: tcl, tk}
Requires: perl >= %(rpm -q --qf '%%{epoch}:%%{version}' perl)
@@ -54,7 +68,8 @@
Summary: Perl RRDtool bindings
Group: Development/Languages
Requires: %{name} = %{version}
-Obsoletes: rrdtool-perl <= %{version}
+Obsoletes: rrdtool-perl <= %{version}-%{release}
+Provides: rrdtool-perl = %{version}-%{release}
%description -n perl-rrdtool
The Perl RRDtool bindings
@@ -63,7 +78,8 @@
Summary: TCL bindings
Group: Development/Languages
Requires: %{name} = %{version}
-Obsoletes: rrdtool-tcl <= %{version}
+Obsoletes: rrdtool-tcl <= %{version}-%{release}
+Provides: rrdtool-tcl = %{version}-%{release}
%description -n tcl-rrdtool
The TCL RRDtool bindings
@@ -74,6 +90,8 @@
BuildRequires: python
Requires: python >= %{python_version}
Requires: %{name} = %{version}
+Obsoletes: rrdtool-python <= %{version}-%{release}
+Provides: rrdtool-python = %{version}-%{release}
%description -n python-rrdtool
Python RRDtool bindings.
@@ -82,45 +100,82 @@
Summary: RRDtool module for PHP
Group: Development/Languages
Requires: %{name} = %{version}, php >= 4.0
+Obsoletes: rrdtool-php <= %{version}-%{release}
+Provides: rrdtool-php = %{version}-%{release}
%description -n php-rrdtool
The php-%{name} package includes a dynamic shared object (DSO) that adds
RRDtool bindings to the PHP HTML-embedded scripting language.
+%package -n ruby-rrdtool
+Summary: RRDtool module for Ruby
+Group: Development/Languages
+Requires: %{name} = %{version}, ruby-devel
+Obsoletes: rrdtool-ruby <= %{version}-%{release}
+Provides: rrdtool-ruby = %{version}-%{release}
+
+%description -n ruby-rrdtool
+The ruby-%{name} package includes a library that implements RRDtool bindings
+for the Ruby language.
+
%prep
%setup
+#if %{!?_without_php:1}0
+#patch0 -p0 -b .php
+#%{__perl} -pi.orig -e 's|../config.h|../rrd_config.h|g' php4/rrdtool.c
+#endif
+#patch1 -p0 -b .python
### FIXME: Fixes to /usr/lib(64) for x86_64. (Fix upstream)
-%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure Makefile.in
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure Makefile.in php4/configure php4/ltconfig*
+### Fix to find correct python dir on lib64
+%{__perl} -pi.orig -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' configure
+
%build
%configure \
+%{?_without_python:--disable-python} \
+%{?_without_ruby:--disable-ruby} \
+ --disable-static \
+%{?_without_tcl:--disable-tcl} \
--enable-perl-site-install \
- --with-perl-options='INSTALLDIRS="vendor" DESTDIR="" PREFIX="%{buildroot}%{_prefix}"'
+%{!?_without_python:--enable-python} \
+%{!?_without_ruby:--enable-ruby} \
+ --enable-ruby-site-install \
+%{!?_without_tcl:--enable-tcl} \
+ --enable-tcl-site \
+ --with-perl-options='INSTALLDIRS="vendor" DESTDIR="" PREFIX="%{buildroot}%{_prefix}"' \
+ --with-pic \
+ --with-tcllib="%{_libdir}"
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{buildroot}" \
- pkglibdir="%{_datadir}/tclrrd1.2.11" \
- pythondir="%{python_sitearch}"
-### FIXME: pkglibdir ends up being "/usr/lib /usr/share/tclrrd1.2.11" on EL4 (Fix upstream)
-### FIXME: pythondir is /usr/lib on 64bit too, should be /usr/lib64 (Fix upstream)
+%{__make} install DESTDIR="%{buildroot}"
### FIXME: Another dirty hack to install perl modules with old and new perl-ExtUtils-MakeMaker (Fix upstream)
%{__rm} -rf %{buildroot}%{buildroot}
%{__make} -C bindings/perl-piped install INSTALLDIRS="vendor" DESTDIR="" PREFIX="%{buildroot}%{_prefix}"
%{__make} -C bindings/perl-shared install INSTALLDIRS="vendor" DESTDIR="" PREFIX="%{buildroot}%{_prefix}"
+### FIXME: Another dirty hack to install ruby files if they're available
+if [ -f bindings/ruby/RRD.so ]; then
+ %{__install} -Dp -m0755 bindings/ruby/RRD.so %{buildroot}%{ruby_sitearch}/RRD.so
+ %{__rm} -rf %{buildroot}%{ruby_archdir}
+fi
+
### We only want .txt and .html files for the main documentation
%{__mkdir_p} rpm-doc/docs/
%{__cp} -ap doc/*.txt doc/*.html rpm-doc/docs/
+### Clean up examples dir
%{__rm} -f examples/Makefile* examples/*.in
+find examples/ -type f -exec chmod 0644 {} \;
+find examples/ -type f -exec %{__perl} -pi -e 's|^#! \@perl\@|#!%{__perl}|gi' {} \;
+find examples/ -name "*.pl" -exec %{__perl} -pi -e 's|\015||gi' {} \;
### Clean up buildroot
-%{__rm} -rf %{buildroot}%{perl_archlib} \
- %{buildroot}%{perl_vendorarch}/auto/*{,/*{,/*}}/.packlist
+%{__rm} -rf %{buildroot}%{perl_archlib} %{buildroot}%{perl_vendorarch}/auto/*{,/*{,/*}}/.packlist
%{__rm} -f %{buildroot}%{perl_vendorarch}/ntmake.pl
%clean
@@ -129,7 +184,6 @@
%files
%defattr(-, root, root, 0755)
%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT NEWS README THREADS TODO
-### FIXME: examples/ includes scripts that require perl-rrdtool (circular dependency)
%doc examples/ rpm-doc/docs/
%doc %{_mandir}/man1/*.1*
%{_bindir}/rrdcgi
@@ -142,16 +196,14 @@
%files devel
%defattr(-, root, root, 0755)
%{_includedir}/rrd.h
-%{_libdir}/librrd.a
-%{_libdir}/librrd_th.a
+%{_libdir}/librrd.so
+%{_libdir}/librrd_th.so
%exclude %{_libdir}/librrd.la
%exclude %{_libdir}/librrd_th.la
-%{_libdir}/librrd.so
-%{_libdir}/librrd_th.so
%files -n perl-rrdtool
%defattr(-, root, root, 0755)
-%doc examples/
+%doc bindings/perl-shared/MANIFEST bindings/perl-shared/README
%doc %{_mandir}/man3/RRDp.3*
%doc %{_mandir}/man3/RRDs.3*
%{perl_vendorlib}/RRDp.pm
@@ -160,19 +212,32 @@
%files -n tcl-rrdtool
%defattr(-, root, root, 0755)
+%doc bindings/tcl/README
%{_libdir}/tclrrd%{version}.so
-#%{_datadir}/tclrrd%{version}/ifOctets.tcl
-#%{_datadir}/tclrrd%{version}/pkgIndex.tcl
-%{_datadir}/tclrrd1.2.11/ifOctets.tcl
-%{_datadir}/tclrrd1.2.11/pkgIndex.tcl
+%{_libdir}/rrdtool/ifOctets.tcl
+%{_libdir}/rrdtool/pkgIndex.tcl
%if %{!?_without_python:1}0
%files -n python-rrdtool
%defattr(-, root, root, 0755)
+%doc bindings/python/ACKNOWLEDGEMENT bindings/python/AUTHORS bindings/python/COPYING bindings/python/README
%{python_sitearch}/rrdtoolmodule.so
%endif
+%if %{!?_without_ruby:1}0
+%files -n ruby-rrdtool
+%defattr(-, root, root, 0755)
+%doc bindings/ruby/CHANGES bindings/ruby/README
+%{ruby_sitearch}/RRD.so
+%endif
+
%changelog
+* Wed Jun 06 2007 Dag Wieers <dag at wieers.com> - 1.2.23-1
+- Updated to release 1.2.23.
+
+* Wed May 02 2007 Dag Wieers <dag at wieers.com> - 1.2.21-1
+- Updated to release 1.2.21.
+
* Fri Jan 26 2007 Dag Wieers <dag at wieers.com> - 1.2.18-1
- Updated to release 1.2.18.
More information about the svn-commits
mailing list