rpms/4Suite/devel 4Suite-1.0a4-root.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 4Suite.spec, 1.16, 1.17 sources, 1.5, 1.6 4Suite-1.0a3-python24.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/4Suite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29814

Modified Files:
	.cvsignore 4Suite.spec sources 
Added Files:
	4Suite-1.0a4-root.patch 
Removed Files:
	4Suite-1.0a3-python24.patch 
Log Message:
* Sat Mar 19 2005 Miloslav Trmac <mitr at redhat.com> - 1.0-6.a4
- Update to 4Suite-1.0a4


4Suite-1.0a4-root.patch:
 Install.py |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE 4Suite-1.0a4-root.patch ---
--- 4Suite-1.0a4/Ft/Lib/DistExt/Install.py.root	2005-03-19 23:53:08.217728736 +0100
+++ 4Suite-1.0a4/Ft/Lib/DistExt/Install.py	2005-03-19 23:53:38.227166608 +0100
@@ -8,6 +8,8 @@
     command_name = 'install'
 
     user_options = [
+        ('root=', None,
+         "install everything relative to this alternate root directory"),
         # Byte-compilation options -- see install_lib.py for details, as
         # these are duplicated from there (but only install_lib does
         # anything with them).


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/4Suite/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2004 02:31:31 -0000	1.5
+++ .cvsignore	19 Mar 2005 23:49:26 -0000	1.6
@@ -1 +1 @@
-4Suite-1.0a3.tar.bz2
+4Suite-1.0a4.tar.bz2


Index: 4Suite.spec
===================================================================
RCS file: /cvs/dist/rpms/4Suite/devel/4Suite.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- 4Suite.spec	16 Mar 2005 21:38:11 -0000	1.16
+++ 4Suite.spec	19 Mar 2005 23:49:26 -0000	1.17
@@ -3,9 +3,9 @@
 Summary: A collections of XML-related technologies for python
 Name: 4Suite
 Version: 1.0
-Release: 6
-Source: ftp://ftp.fourthought.com/pub/4Suite/%{name}-%{version}a3.tar.bz2 
-Patch0: 4Suite-1.0a3-python24.patch
+Release: 6.a4
+Source: ftp://ftp.fourthought.com/pub/4Suite/4Suite-1.0a4.tar.bz2
+Patch0: 4Suite-1.0a4-root.patch
 License: Apacheish
 Group: Development/Libraries
 Requires: python, PyXML >= 0.7, Distutils
@@ -38,41 +38,34 @@
 specification for the XPointer 1.0 Candidate Recommendation.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1 -b .python24
+%setup -q -n 4Suite-1.0a4
+%patch0 -p1
 
 %build
-export PYTHONPATH=/usr/%{_lib}/python%pyver/site-packages/:/usr/%{_lib}/python%pyver/:/usr/lib/python%pyver/site-packages/:/usr/lib/python%pyver/
-CFLAGS="$RPM_OPT_FLAGS" python  setup.py build
+export CFLAGS="$RPM_OPT_FLAGS"
+python setup.py config --system
+python setup.py build
 
 %install
 rm -fr $RPM_BUILD_ROOT
-export PYTHONPATH=/usr/%{_lib}/python%pyver/site-packages/:/usr/%{_lib}/python%pyver/:/usr/lib/python%pyver/site-packages/:/usr/lib/python%pyver/
-python setup.py install --root=$RPM_BUILD_ROOT --record=installed_files
-
-# Generate optimized bytecode
-python -O /usr/%{_lib}/python%pyver/compileall.py $RPM_BUILD_ROOT/usr/%{_lib}/python%pyver/site-packages
-
-find $RPM_BUILD_ROOT/usr/%{_lib}/python%pyver -name "*pyo" | grep -v _xmlplus/__init__.pyo | sed "s|$RPM_BUILD_ROOT||" >> installed_files
-find $RPM_BUILD_ROOT/usr/%{_lib}/python%pyver/site-packages/Ft -type d \
-	| sed "s|^$RPM_BUILD_ROOT|%%dir |" >> installed_files
-
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-find $RPM_BUILD_ROOT/usr/%{_lib}/python%pyver/site-packages/Ft/Share/Bin \
-	-name '4*' | sed "s|$RPM_BUILD_ROOT||" \
-	| while read file; do ln -s "$file" $RPM_BUILD_ROOT%{_bindir}; done
-
-# Remove unwanted .mo files in site-packages dir...
-find $RPM_BUILD_ROOT/usr/%{_lib}/python%{pyver}/site-packages -name "*.mo" | xargs rm -f
+python setup.py install -O1 --root=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f installed_files
+%files
 %defattr(-,root,root)
-%{_bindir}/4*
+%config /etc/4Suite
+/usr/bin/4*
+/usr/lib/4Suite
+%{_libdir}/python%pyver/site-packages/Ft
+/usr/share/4Suite
+/var/lib/4Suite
 
 %changelog
+* Sat Mar 19 2005 Miloslav Trmac <mitr at redhat.com> - 1.0-6.a4
+- Update to 4Suite-1.0a4
+
 * Wed Mar 16 2005 Elliot Lee <sopwith at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/4Suite/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2004 02:31:31 -0000	1.5
+++ sources	19 Mar 2005 23:49:26 -0000	1.6
@@ -1 +1 @@
-272ba618ff69042b1513ccf0d70f956d  4Suite-1.0a3.tar.bz2
+7a5de1ac3d336b7198b741be83d0722e  4Suite-1.0a4.tar.bz2


--- 4Suite-1.0a3-python24.patch DELETED ---