diff --git a/ragel-Makefile-install.patch b/ragel-Makefile-install.patch deleted file mode 100644 index bc047d6..0000000 --- a/ragel-Makefile-install.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ragel/Makefile.in.fedora ./ragel/Makefile.in ---- ragel/Makefile.in.fedora 2009-04-11 18:19:45.000000000 -0600 -+++ ragel/Makefile.in 2009-04-11 18:20:04.000000000 -0600 -@@ -109,6 +109,6 @@ clean: - - install: all - install -d $(DESTDIR)$(prefix)/bin -- install -s ragel $(DESTDIR)$(prefix)/bin/ragel -+ install ragel $(DESTDIR)$(prefix)/bin/ragel - - -include $(DEPS) diff --git a/ragel.spec b/ragel.spec index 78f7ae8..bc5ef8d 100644 --- a/ragel.spec +++ b/ragel.spec @@ -1,6 +1,6 @@ Name: ragel Version: 6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Finite state machine compiler Group: Development/Tools @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: transfig, tetex-latex, gcc-objc Requires: gawk -Patch0: ragel-Makefile-install.patch +Patch0: ragel-main.patch %description Ragel compiles finite state machines from regular languages into executable C, @@ -29,21 +29,14 @@ done using inline operators that do not disrupt the regular language syntax. %build # set the names of the other programming commandline programs -%configure RUBY=ruby JAVAC=javac GMCS=gmcs +%configure --docdir=%{_docdir}/%{name}-%{version} RUBY=ruby JAVAC=javac GMCS=gmcs make %{?_smp_mflags} -pushd doc -make %{?_smp_mflags} -popd %install rm -rf %{buildroot} -make prefix=%{buildroot}%{_prefix} install -chmod a-x examples/* -pushd doc -make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} docdir=%{buildroot}%{_docdir}/%{name}-%{version} install -popd +make install DESTDIR=%{buildroot} %clean rm -rf %{buildroot} @@ -52,12 +45,14 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING ragel.vim -%doc examples %doc doc/ragel-guide.pdf %{_bindir}/ragel %{_mandir}/*/* %changelog +* Sun Aug 02 2009 Jeremy Hinegardner - 6.5.2 +- fix build process + * Sun Aug 02 2009 Jeremy Hinegardner - 6.5.1 - Update to 6.5