rpms/pl/devel pl-5.7.11-pc.patch,NONE,1.1 pl.spec,1.62,1.63
Gérard Milmeister
gemi at fedoraproject.org
Wed Aug 19 17:56:59 UTC 2009
Author: gemi
Update of /cvs/pkgs/rpms/pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17162
Modified Files:
pl.spec
Added Files:
pl-5.7.11-pc.patch
Log Message:
move include files to expected place
pl-5.7.11-pc.patch:
pl.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE pl-5.7.11-pc.patch ---
diff -up pl-5.7.11/src/pl.pc.in.pc pl-5.7.11/src/pl.pc.in
--- pl-5.7.11/src/pl.pc.in.pc 2009-08-14 18:00:33.000000000 +0200
+++ pl-5.7.11/src/pl.pc.in 2009-08-14 18:01:03.000000000 +0200
@@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@
+includedir=${libdir}/@PL at -@PLVERSION@/include
PLBASE=${libdir}/@PL at -@PLVERSION@
PLARCH=@ARCH@
Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- pl.spec 26 Jul 2009 18:51:37 -0000 1.62
+++ pl.spec 19 Aug 2009 17:56:58 -0000 1.63
@@ -3,7 +3,7 @@
Name: pl
Version: 5.7.11
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -17,6 +17,7 @@ Patch0: %{name}-5.7.11-rpath.pat
Patch1: %{name}-5.7.11-jpl-configure.patch
Patch2: %{name}-5.7.11-man-files.patch
Patch3: %{name}-5.6.60-jni.patch
+Patch4: %{name}-5.7.11-pc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gmp-devel
@@ -103,6 +104,7 @@ in Prolog. In both setups it provides a
%patch1 -p1 -b .libjvm
%patch2 -p1 -b .man-files
%patch3 -p1 -b .jni
+%patch4 -p1 -b .pc
(
mkdir doc-install
cd doc-install
@@ -166,13 +168,13 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{v
$RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/
# Move the various include files into /usr/include
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include/*.h \
- $RPM_BUILD_ROOT%{_includedir}/%{name}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include/* \
- $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include
+#mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
+#mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include/*.h \
+# $RPM_BUILD_ROOT%{_includedir}/%{name}
+#mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include/* \
+# $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
+#rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include
+#rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include
# Move the binaries into %{_bindir} directly instead of using links
rm -f $RPM_BUILD_ROOT%{_bindir}/*
@@ -205,6 +207,8 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_libdir}/%{name}-%{version}/library/jpl.pl
# Devel
%exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.so
+%exclude %{_libdir}/%{name}-%{version}/include
+%exclude %{_libdir}/%{name}-%{version}/xpce-*/include
# Static
%exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.a
# XPCE
@@ -226,9 +230,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/*.h
-%{_includedir}/%{name}/xpce
+%{_libdir}/%{name}-%{version}/include
+%{_libdir}/%{name}-%{version}/xpce-*/include
%{_libdir}/%{name}-%{version}/lib/*/libpl.so
%{_libdir}/pkgconfig/pl.pc
@@ -244,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 14 2009 Gerard Milmeister <gemi at bluewin.ch> - 5.7.11-4
+- move include files to expected place
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.7.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list