rpms/librx/devel librx.spec, NONE, 1.1 rx-1.5-shared.patch, NONE, 1.1 rx-1.5-texinfo.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tom Callaway (spot) fedora-extras-commits at redhat.com
Sat Apr 23 22:39:08 UTC 2005 

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	librx.spec rx-1.5-shared.patch rx-1.5-texinfo.patch 
Log Message:
auto-import librx-1.5-1 on branch devel from librx-1.5-1.src.rpm


--- NEW FILE librx.spec ---
Summary: POSIX regexp functions
Name: librx
Version: 1.5
Release: 1
License: GPL
URL: http://www.gnu.org/software/rx/rx.html
Group: Applications/Text
Source0: ftp://ftp.gnu.org/gnu/rx/rx-%{version}.tar.bz2
Patch0: rx-1.5-shared.patch
Patch1: rx-1.5-texinfo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Rx is, among other things, an implementation of the interface
specified by POSIX for programming with regular expressions.  Some
other implementations are GNU regex.c and Henry Spencer's regex
library.

%package devel
Summary: POSIX regexp functions, developers library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Rx is, among other things, an implementation of the interface
specified by POSIX for programming with regular expressions.  Some
other implementations are GNU regex.c and Henry Spencer's regex
library.

This package contains files needed for development with librx.

%prep
%setup -q -n rx-%{version}
%patch0 -p1
%patch1 -p1 -b .texipatch

%build
%configure
make %{?_smp_mflags}
make doc/rx.info

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
make install DESTDIR=${RPM_BUILD_ROOT}
install -m 644 doc/rx.info ${RPM_BUILD_ROOT}%{_infodir}
rm -rf ${RPM_BUILD_ROOT}%{_libdir}/librx.la

%clean
rm -rf ${RPM_BUILD_ROOT}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/rx.info \ 
    %{_infodir}/dir 2>/dev/null || :

%postun devel
if [ "$1" = 0 ]; then
  /sbin/install-info --delete %{_infodir}/rx.info \
    %{_infodir}/dir 2>/dev/null || :
fi

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc ANNOUNCE BUILDING COOKOFF rx/ChangeLog
%{_includedir}/*
%{_infodir}/*
%{_libdir}/*.so
%{_libdir}/*.a

%changelog
* Sat Apr 23 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-1
- new package, based on Alexey Voinov's package from AltLinux

rx-1.5-shared.patch:

--- NEW FILE rx-1.5-shared.patch ---
diff -Naurk.orig rx-1.5/configure.in.orig rx-1.5/configure.in
--- rx-1.5/configure.in.orig	Fri Nov 22 08:39:12 1996
+++ rx-1.5/configure.in	Wed Apr 24 10:41:41 2002
@@ -1,4 +1,5 @@
 AC_INIT(Makefile.in)
+AC_PROG_LIBTOOL
 
 all_subdirs=`cat $srcdir/*/PLUGIN/REQ $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
 req_subdirs=`cat $srcdir/*/PLUGIN/REQ /dev/null | tsort | xargs echo`
@@ -47,4 +48,5 @@
 
 
 AC_SUBST(existingdirs)
+AC_SUBST(LIBTOOL_DEPS)
 AC_OUTPUT(Makefile)
diff -Naurk.orig rx-1.5/rx/Makefile.in.orig rx-1.5/rx/Makefile.in
--- rx-1.5/rx/Makefile.in.orig	Fri Nov 22 15:47:49 1996
+++ rx-1.5/rx/Makefile.in	Wed Apr 24 10:48:19 2002
@@ -40,6 +40,10 @@
 AR_FLAGS = rc
 RANLIB = @RANLIB@
 opt_objs=@opt_objs@
+LIBTOOL = libtool
+DESTDIR =
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+
 
 source= hashrexp.c rx.c rxanal.c rxbasic.c rxbitset.c rxcset.c rxdbug.c rxgnucomp.c rxhash.c rxnfa.c rxnode.c rxposix.c rxsimp.c rxspencer.c rxstr.c rxsuper.c rxunfa.c rgx.c
 
@@ -50,10 +54,11 @@
 	  ../doc/rx.texi ../doc/rx.info ../doc/texinfo.tex
 distfiles=$(source) $(headers) $(ancillery)
 libobjs= hashrexp.o rx.o rxanal.o rxbasic.o rxbitset.o rxcset.o rxdbug.o rxgnucomp.o rxhash.o rxnfa.o rxnode.o rxposix.o rxsimp.o rxspencer.o rxstr.o rxsuper.o rxunfa.o
+liblobjs= hashrexp.lo rx.lo rxanal.lo rxbasic.lo rxbitset.lo rxcset.lo rxdbug.lo rxgnucomp.lo rxhash.lo rxnfa.lo rxnode.lo rxposix.lo rxsimp.lo rxspencer.lo rxstr.lo rxsuper.lo rxunfa.lo
 gen_c_files=rgx.x
 
 .SUFFIXES:
-.SUFFIXES: .o .c .h .ps .dvi .info .texinfo .scm .cd .x
+.SUFFIXES: .lo .o .c .h .ps .dvi .info .texinfo .scm .cd .x
 
 .c.x:
 	$(CC) $(ALL_CFLAGS) -DSCM_MAGIC_SNARFER -E $< | grep "^%%%" | sed -e "s/^%%%//" > $@ ; \
@@ -61,22 +66,27 @@
 .c.o:
 	$(CC) -c $(ALL_CFLAGS) $(DEFS) -I$(srcdir) $<
 
-all: librx.a
+.c.lo:
+	$(LIBTOOL) $(CC) -c $(ALL_CFLAGS) $(DEFS) -I$(srcdir) $< -o $@
+
+all: librx.la
 
 install: all
-	test -d $(libdir) || mkdir $(libdir)
-	test -d $(includedir) || mkdir $(includedir)
-	$(INSTALL) librx.a $(libdir)/librx.a
-	$(RANLIB) $(libdir)/librx.a
-	$(INSTALL) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h
+	$(INSTALL) $(srcdir)/inst-rxposix.h $(DESTDIR)$(includedir)/rxposix.h
+	$(LIBTOOL) $(INSTALL) -c librx.la $(DESTDIR)$(libdir)
 
 
 uninstall:
 	-rm -f $(libdir)/librx.a
+	-rm -f $(libdir)/librx.la
+	-rm -f $(libdir)/librx.so
+	-rm -f $(libdir)/librx.so.0
+	-rm -f $(libdir)/librx.so.0.0.0
 	-rm -f $(includedir)/rxposix.h
 
 clean:
-	-rm -f $(libobjs) librx.a  $(opt_objs) 
+	-rm -f $(libobjs) $(liblobjs) librx.a  $(opt_objs)
+	-rm -rf .libs
 
 distclean: clean
 	-rm Makefile config.status config.log rgx.x
@@ -116,6 +126,9 @@
 	$(AR) $(AR_FLAGS) librx.a $(libobjs) $(opt_objs)
 	$(RANLIB) librx.a
 
+librx.la: $(liblobjs) $(opt_objs)
+	$(LIBTOOL) $(CC) $(ALL_CFLAGS) $(DEFS) -I$(srcdir) -o $@ $(liblobjs) -rpath $(libdir)
+
 
 depends:
 	touch $(gen_c_files) scmconfig.h
@@ -150,3 +163,6 @@
 rxunfa.o : rxunfa.c rxall.h rx.h rxhash.h rxbitset.h rxunfa.h _rx.h rxcset.h \
   rxnfa.h rxnode.h 
 rgx.o : rgx.c rgx.x
+
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status --recheck

rx-1.5-texinfo.patch:

--- NEW FILE rx-1.5-texinfo.patch ---
diff -Naurk.texipatch rx-1.5/doc/rx.texi.texipatch rx-1.5/doc/rx.texi
--- rx-1.5/doc/rx.texi.texipatch	Wed Jan 15 23:31:37 1997
+++ rx-1.5/doc/rx.texi	Tue Apr 30 20:51:08 2002
@@ -3,6 +3,12 @@
 @setfilename rx.info
 @settitle Rx
 @setchapternewpage odd
+
+ at dircategory Development/C
+ at direntry
+* Rx: (rx)		POSIX regexp functions.
+ at end direntry
+
 @c %**end of header
 
 @c  This title page illustrates only one of the
@@ -367,7 +373,7 @@
 @end example
 
 Subexpressions also have a special meaning with regard to backreferences
-and substitutions (see @xref{Backreferences}).
+and substitutions. @xref{Backreferences}.
 
 
 @node  Repeated Subexpressions, Optional Subexpressions, Subexpressions, Posix Basic Regular Expressions


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/librx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2005 22:38:41 -0000	1.1
+++ .cvsignore	23 Apr 2005 22:39:06 -0000	1.2
@@ -0,0 +1 @@
+rx-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/librx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2005 22:38:41 -0000	1.1
+++ sources	23 Apr 2005 22:39:06 -0000	1.2
@@ -0,0 +1 @@
+104aa2da75400fefc1680242a5ea665c  rx-1.5.tar.bz2

More information about the fedora-extras-commits mailing list