dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libpreludedb
-# $Id$
-NAME := libpreludedb
-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)

libpreludedb.spec

@@ -3,10 +3,10 @@
 
 Name:		libpreludedb		           
 Version:	0.9.14.1 
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
-License:	GPL
+License:	GPLv2+
 URL:		http://prelude-ids.org/
 Source0:	http://prelude-ids.org/download/releases/%{name}-%{version}.tar.gz	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,7 @@ Python bindings for libpreludedb.
 Summary: Perl bindings for libpreludedb
 Group: System Environment/Libraries
 Requires: libpreludedb = %{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 Perl bindings for libpreludedb.
@@ -81,10 +82,12 @@ Perl bindings for libpreludedb.
 
 %build
 %configure	--with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \
+		--with-perl-installdirs=vendor \
 		--disable-static
 
 # removing rpath
 sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile
+sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
 
 make 
 
@@ -92,19 +95,17 @@ make
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-mkdir -p %{buildroot}%{perl_vendorarch}
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
 cp -p ChangeLog README NEWS COPYING LICENSE.README HACKING.README \
 	%{buildroot}%{_defaultdocdir}/%{name}-%{version}
-mv %{buildroot}%{perl_sitearch}/* %{buildroot}%{perl_vendorarch}
-rm -f %{buildroot}/%{perl_archlib}/perllocal.pod
 rm -f %{buildroot}/%{_libdir}/%{name}.la
 rm -f %{buildroot}/%{_libdir}/%{name}/plugins/formats/classic.la
 rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/mysql.la
 rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/pgsql.la
 rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/sqlite3.la
-rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/.packlist
-rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/PreludeDB.bs
+chmod 755 %{buildroot}%{python_sitearch}/_preludedb.so
+find %{buildroot} -type f \( -name .packlist -o -name perllocal.pod \) -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
 
 %clean
 rm -rf %{buildroot}
@@ -138,11 +139,12 @@ rm -rf %{buildroot}
 %doc %{_defaultdocdir}/%{name}-%{version}/html/
 
 %files python
+%defattr(-,root,root)
 %{python_sitearch}/*
 
 %files perl
 %defattr(0755,root,root)
-%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/auto/PreludeDB/
 %attr(0644,root,root) %{perl_vendorarch}/PreludeDB.pm
 
 %files mysql
@@ -163,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 04 2008 Steve Grubb <sgrubb@redhat.com> - 0.9.14.1-3
+- Fix perl bindings (#453935)
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.14.1-2
 - Autorebuild for GCC 4.3