dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ocaml-cil
-# $Id$
-NAME := ocaml-cil
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ocaml-cil.spec

@@ -3,7 +3,7 @@
 
 Name:           ocaml-cil
 Version:        1.3.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
@@ -73,8 +73,8 @@ The %{name}-doc package contains documentation for users of %{name}.
 Summary:        Support programs for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       perl >= 5.8
 Provides:       perl(CilConfig) = %{version}
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 
 %description    cilly
@@ -122,15 +122,12 @@ rm -rf $RPM_BUILD_ROOT
 # This sets $archos to something like 'x86_LINUX':
 archos=`ls obj`
 
-# This sets $privlib to something like '/usr/lib/perl5/5.8.8':
-eval `perl -V:privlib`
-
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 
 # CIL's make install rule is totally borked.
-mkdir -p $DESTDIR$privlib
-install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR$privlib
+mkdir -p $DESTDIR%{perl_vendorlib}
+install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR%{perl_vendorlib}
 mkdir -p $OCAMLFIND_DESTDIR
 ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a}
 
@@ -169,21 +166,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files doc
+%defattr(-,root,root,-)
 %doc README LICENSE doc/*
 
 %files cilly
 %defattr(-,root,root,-)
 %doc README LICENSE
-/usr/lib/perl5/*/CilConfig.pm
-/usr/lib/perl5/*/Cilly.pm
-/usr/lib/perl5/*/KeptFile.pm
-/usr/lib/perl5/*/OutputFile.pm
-/usr/lib/perl5/*/TempFile.pm
+%{perl_vendorlib}/CilConfig.pm
+%{perl_vendorlib}/Cilly.pm
+%{perl_vendorlib}/KeptFile.pm
+%{perl_vendorlib}/OutputFile.pm
+%{perl_vendorlib}/TempFile.pm
 %{_bindir}/cilly
 %{_libexecdir}/cil
 
 
 %changelog
+* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-5
+- Fix Perl paths (rhbz#453759).
+
 * Wed Nov  7 2007 Richard W.M. Jones <rjones@redhat.com> - 1.3.6-4
 - ExcludeArch ppc - CIL doesn't build on PPC as it turns out.