rpms/oorexx/devel oorexx-paths.patch, NONE, 1.1 oorexx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Gérard Milmeister (gemi) fedora-extras-commits at redhat.com
Mon Oct 9 20:33:13 UTC 2006


Author: gemi

Update of /cvs/extras/rpms/oorexx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/devel

Modified Files:
	.cvsignore sources 
Added Files:
	oorexx-paths.patch oorexx.spec 
Log Message:
auto-import oorexx-3.1.0-1 on branch devel from oorexx-3.1.0-1.src.rpm

oorexx-paths.patch:

--- NEW FILE oorexx-paths.patch ---
--- ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp.paths	2006-09-25 19:11:07.000000000 +0200
+++ ooRexx-3.1.0/kernel/platform/unix/FileSystem.cpp	2006-09-25 19:12:09.000000000 +0200
@@ -427,6 +427,9 @@
 //  fullname = (PSZ)string_data(imgpath);
 
 //if ( imgpath && fullname )                         /* seg faultn          */
+  if (fullname == 0) {
+    fullname = SearchFileName((PCHAR)"/usr/share/ooRexx/" BASEIMAGE, 'P');
+  }
   if ( fullname != OREF_NULL )
     image = fopen((PSZ)fullname, "rb");/* try to open the file              */
   else
--- ooRexx-3.1.0/Makefile.in.paths	2006-09-25 19:12:21.000000000 +0200
+++ ooRexx-3.1.0/Makefile.in	2006-09-25 19:14:15.000000000 +0200
@@ -60,7 +60,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -415,7 +415,7 @@
 			compile @REXXCAT@ rexx.img \
 			stamp-h.in cscope.files cscope.out $(distdir).tar.gz
 
-SUBDIRS = samples
+SUBDIRS =
 DIST_SUBDIRS = samples
 
 # This defines the current version of ooRexx
@@ -462,7 +462,7 @@
 samples_dir = $(top_srcdir)/samples
 samples_windows_dir = $(top_srcdir)/samples/windows
 samples_unix_dir = $(top_srcdir)/samples/unix
-catdir = $(prefix)/bin
+catdir = $(datadir)/ooRexx
 COMMON_CPPFLAGS = -DORX_VER=$(ORX_MAJOR) -DORX_REL=$(ORX_MINOR) -DORX_MOD=$(ORX_MOD_LVL) -DORX_FIX=0 \
                   -DORX_SYS_STR=\"@ORX_SYS_STR@\" \
                   -DORX_CATDIR=\"$(catdir)\" \
@@ -3170,7 +3170,7 @@
 	echo $(DESTDIR) is destdir
 	echo $(prefix) is prefix
 	echo $(install_sh_PROGRAM)
-	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(prefix)/bin/rexx.img
+	$(install_sh_SCRIPT) rexx.img $(DESTDIR)$(datadir)/ooRexx/rexx.img
 	if test -z "$(GENCAT)"; then \
 		echo "No rexx.cat to install"; \
 	else \
@@ -3181,9 +3181,9 @@
 	$(install_sh_SCRIPT) $(rexutils_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
 	for a in $(samples_dir)/*.rex; do \
 		bn=`basename $$a`; \
-		$(install_sh_SCRIPT) $$a $(DESTDIR)$(prefix)/share/ooRexx/$$bn; \
+		$(install_sh_SCRIPT) $$a $(DESTDIR)$(datadir)/ooRexx/$$bn; \
 	done;
-	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(prefix)/share/ooRexx/readme
+	$(install_sh_SCRIPT) $(samples_dir)/readme $(DESTDIR)$(datadir)/ooRexx/readme
 
 package:
 	./rexx $(top_srcdir)/platform/unix/makepkg.rex @PACKAGETYPE@ $(ORX_MAJOR).$(ORX_MINOR).$(ORX_MOD_LVL) $(target) $(prefix) $(DESTDIR)


--- NEW FILE oorexx.spec ---
Name:           oorexx
Version:        3.1.0
Release:        1%{?dist}
Summary:        Open Object Rexx

Group:          Development/Languages
License:        CPL
URL:            http://www.oorexx.org
Source0:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-%{version}-1.src.tar.gz
Source1:        http://switch.dl.sourceforge.net/sourceforge/oorexx/ooRexx-docs-%{version}-pdf.tar.gz
Patch0:         oorexx-paths.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
Open Object Rexx is an object-oriented scripting language. The
language is designed for "non-programmer" type users, so it is easy to
learn and easy to use, and provides an excellent vehicle to enter the
world of object-oriented programming without much effort.

It extends the procedural way of programming with object-oriented
features that allow you to gradually change your programming style as
you learn more about objects.

%package libs
Summary:        Libraries for ooRexx
Group:          System Environment/Libraries

%description libs
Libraries for ooRexx.


%package docs
Summary:        Documentation for ooRexx
Group:          Development/Languages
Requires:       %{name} = %{version}-%{release}

%description docs
Documentation for ooRexx.


%package devel
Summary:        Header files and libraries for ooRexx
Group:          Development/Languages
Requires:       %{name} = %{version}-%{release}
Requires:       %{name}-libs = %{version}-%{release}

%description devel
Header files and libraries for ooRexx.


%prep
%setup -q -n ooRexx-%{version}
%setup1 -q -n ooRexx-%{version} -a1
%patch0 -p1 -b .paths


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f '{}' ';'
rm -fr samples/**/.deps
rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.csh
rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/rexx.sh
mv $RPM_BUILD_ROOT%{_bindir}/rxftp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
mv $RPM_BUILD_ROOT%{_bindir}/rxregexp.cls $RPM_BUILD_ROOT%{_datadir}/ooRexx
chmod 0644 $RPM_BUILD_ROOT%{_datadir}/ooRexx/*

# remove cruft
rm -f $RPM_BUILD_ROOT%{_datadir}/ooRexx/{*.rex,readme}
find . -name .deps | xargs rm -fr
rm -fr samples/windows

%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc CPLv1.0.txt README.txt readme.pdf
%{_bindir}/rexx
%{_bindir}/rexxc
%{_bindir}/rxdelipc
%{_bindir}/rxmigrate
%{_bindir}/rxqueue
%{_bindir}/rxsubcom
%{_datadir}/ooRexx
%{_mandir}/man*/*


%files docs
%defattr(-,root,root,-)
%doc rexxpg.pdf rexxref.pdf rxftp.pdf rxmath.pdf rxsock.pdf
%doc samples


%files devel
%defattr(-,root,root,-)
%{_includedir}/rexx.h
%{_libdir}/lib*.so
%{_bindir}/oorexx-config


%files libs
%defattr(-,root,root,-)
%doc CPLv1.0.txt
%{_libdir}/lib*.so.*


%changelog
* Mon Sep 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.1.0-1
- new version 3.1.0

* Tue May  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.0.0-1
- First Fedora release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Oct 2006 20:24:21 -0000	1.1
+++ .cvsignore	9 Oct 2006 20:33:13 -0000	1.2
@@ -0,0 +1,2 @@
+ooRexx-3.1.0-1.src.tar.gz
+ooRexx-docs-3.1.0-pdf.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oorexx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Oct 2006 20:24:21 -0000	1.1
+++ sources	9 Oct 2006 20:33:13 -0000	1.2
@@ -0,0 +1,2 @@
+136ae4eb8df72557e10f193b980f9e9f  ooRexx-3.1.0-1.src.tar.gz
+17bc9188b858aedc579f57b7ded73260  ooRexx-docs-3.1.0-pdf.tar.gz




More information about the scm-commits mailing list