[svn] r5144 - in trunk/rpms: . eid-belgium python-distutils scons

Sun Feb 11 11:22:18 CET 2007

Author: dag
Date: 2007-02-11 11:22:16 +0100 (Sun, 11 Feb 2007)
New Revision: 5144

Added:
   trunk/rpms/python-distutils/
   trunk/rpms/python-distutils/python-distutils.spec
Modified:
   trunk/rpms/eid-belgium/eid-belgium.spec
   trunk/rpms/scons/scons.spec
Log:
Updates

Modified: trunk/rpms/eid-belgium/eid-belgium.spec
===================================================================

--- trunk/rpms/eid-belgium/eid-belgium.spec	2007-02-10 00:54:00 UTC (rev 5143)
+++ trunk/rpms/eid-belgium/eid-belgium.spec	2007-02-11 10:22:16 UTC (rev 5144)
@@ -20,7 +20,8 @@
 
 #Buildarch: noarch
 BuildRequires: scons, wxGTK-devel >= 2.4, openssl-devel >= 0.9.7, pcsc-lite-devel >= 1.2.9
-#BuildRequires: j2re, qt-devel >= 3.3.3
+BuildRequires: qt-devel >= 3.3.3
+#BuildRequires: j2re
 Provides: belpic = %{version}-%{release}
 Obsoletes: belpic <= %{version}-%{release}
 Provides: beid = %{version}-%{release}
@@ -65,13 +66,15 @@
 %{__perl} -pi.orig -e 's|/usr/local/share\b|%{_datadir}|g' src/eidviewer/beidgui.conf
 
 %build
-scons configure debug=full prefix="%{_prefix}"
-scons debug=full prefix="%{_prefix}"
+source "/etc/profile.d/qt.sh"
+scons configure prefix="%{_prefix}"
+scons prefix="%{_prefix}"
 
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -d -m0755 %{buildroot}%{_bindir}
-scons install debug=full prefix="%{buildroot}%{_prefix}" libdir="%{buildroot}%{_libdir}" || :
+source "/etc/profile.d/qt.sh"
+scons install prefix="%{buildroot}%{_prefix}" libdir="%{buildroot}%{_libdir}"
 
 #%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
 #desktop-file-install --vendor net                  \
@@ -84,7 +87,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGES INSTALL README VERSION doc/*.rtf
+%doc CHANGES INSTALL README VERSION doc/*.rtf doc/*.doc
 %doc %{_mandir}/man1/*.1*
 %config(noreplace) %{_sysconfdir}/beidbase.conf
 %config(noreplace) %{_sysconfdir}/beidgui.conf
@@ -95,18 +98,14 @@
 %{_bindir}/beidcrld
 %{_bindir}/beidpcscd
 %{_bindir}/beidgui
-%{_libdir}/*.so.*
-%{_libdir}/pkcs11/
 %{_datadir}/beid/
 %{_datadir}/locale/beidgui_de.mo
 %{_datadir}/locale/beidgui_fr.mo
 %{_datadir}/locale/beidgui_nl.mo
-
-%files devel
-%defattr(-, root, root, 0755)
-%doc doc/*.doc
 %{_includedir}/beid/
 %{_libdir}/*.so
+%{_libdir}/*.so.*
+%{_libdir}/pkcs11/
 
 %changelog
 * Fri Feb 09 2007 Dag Wieers <dag at wieers.com> - 2.5.9-1

Added: trunk/rpms/python-distutils/python-distutils.spec
===================================================================
--- trunk/rpms/python-distutils/python-distutils.spec	                        (rev 0)
+++ trunk/rpms/python-distutils/python-distutils.spec	2007-02-11 10:22:16 UTC (rev 5144)
@@ -0,0 +1,52 @@
+# $Id$
+# Authority: dag
+
+# ExclusiveDist: el2 rh7
+
+%define python_version %(%{__python} -c 'import sys, string; print string.split(sys.version, " ")[0]')
+#%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
+
+%define real_name Distutils
+
+Summary: System for processing plaintext documentation
+Name: python-distutils
+Version: 1.0.2
+Release: 1
+Group: Development/Libraries
+License: Public Domain, BSD, Python License, GPL - see COPYING.txt
+URL: http://docutils.sourceforge.net/
+
+Source: http://www.python.org/community/sigs/current/distutils-sig/download/Distutils-1.0.2.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+BuildRequires: python-devel <= 1.6
+Requires: python >= %{python_version}, python <= 1.6
+
+%description
+The distutils package provides support for building and installing additional
+modules into a Python installation. The new modules may be either 100%-pure
+Python, or may be extension modules written in C, or may be collections
+of Python packages which include modules coded in both Python and C.
+
+%prep
+%setup -n %{real_name}-%{version}
+
+%build
+CFLAGS="%{optflags}" %{__python} setup.py build
+
+%install
+%{__rm} -rf %{buildroot}
+%{__python} setup.py install --skip-build --root "%{buildroot}"
+	
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc CHANGES.txt README.txt TODO USAGE.txt
+%{_libdir}/python1.5/site-packages/distutils/
+
+%changelog
+* Sun Feb 11 2007 Dag Wieers <dag at wieers.com> - 1.0.2-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/python-distutils/python-distutils.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: trunk/rpms/scons/scons.spec
===================================================================
--- trunk/rpms/scons/scons.spec	2007-02-10 00:54:00 UTC (rev 5143)
+++ trunk/rpms/scons/scons.spec	2007-02-11 10:22:16 UTC (rev 5144)
@@ -1,6 +1,11 @@
 # $Id$
 # Authority: dries
 
+%{?dist: %{expand: %%define %dist 1}}
+
+%{rh7:%define _with_python15 1}
+%{el2:%define _with_python15 1}
+
 Summary: Software CONStruction tool, next-generation build tool
 Name: scons
 Version: 0.96.1
@@ -8,13 +13,15 @@
 License: MIT
 Group: Development/Tools
 URL: http://www.scons.org/
+
 Source: http://dl.sf.net/scons/scons-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: python
-BuildRequires: python, python-devel
+
 BuildArch: noarch
+BuildRequires: python-devel >= 1.5
+%{?_with_python15:BuildRequires: python-distutils}
+Requires: python
 
-
 %description
 SCons is an Open Source software construction tool--that is, a
 next-generation build tool. Think of SCons as an improved, cross-platform
@@ -22,38 +29,30 @@
 similar to autoconf/automake and compiler caches such as ccache. In short,
 SCons is an easier, more reliable and faster way to build software.
 
-
 %prep
 %setup
 
-
 %build
 %{__python} setup.py build
 
-
 %install
 %{__rm} -rf %{buildroot}
-%{__python} setup.py install --root=%{buildroot}
-%{__install} -Dp -m 0644 scons.1 %{buildroot}/%{_mandir}/man1/scons.1
-%{__install} -Dp -m 0644 sconsign.1 %{buildroot}/%{_mandir}/man1/sconsign.1
+%{__python} setup.py install --root="%{buildroot}"
+%{__install} -Dp -m0644 scons.1 %{buildroot}%{_mandir}/man1/scons.1
+%{__install} -Dp -m0644 sconsign.1 %{buildroot}%{_mandir}/man1/sconsign.1
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
-
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt
-%{_prefix}/bin/*
+%doc %{_mandir}/man1/*.1*
+%{_prefix}/bin/scons
+%{_prefix}/bin/sconsign
 %{_prefix}/lib/scons/
-%{_mandir}/man1/*
 
-
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.96.1-2.2
-- Rebuild for Fedora Core 5.
-
 * Fri Nov  5 2004 Matthias Saou <http://freshrpms.net/> 0.96.1-2
 - Make the package noarch as it always should have been.
 
@@ -76,4 +75,3 @@
 * Sat May 22 2004 Dries Verachtert <dries at ulyssis.org> 0.95-1
 - Initial package (spec file based on the spec file distributed by Steven
   Knight <knight AT scons DOT org>).
-

