[pl] Clean spec file
Petr Pisar
ppisar at fedoraproject.org
Thu Mar 8 14:56:37 UTC 2012
commit 715467e16df80ddba4f7bb6887148c2e8e7d581e
Author: Petr Písař <ppisar at redhat.com>
Date: Thu Mar 1 17:29:19 2012 +0100
Clean spec file
pl.spec | 42 +++++-------------------------------------
1 files changed, 5 insertions(+), 37 deletions(-)
---
diff --git a/pl.spec b/pl.spec
index 10824c6..433d8da 100644
--- a/pl.spec
+++ b/pl.spec
@@ -21,17 +21,16 @@ Group: Development/Languages
#packages/http/examples/calc.pl Public Domain
#External: JavaConfig.java GPLv3+
License: Artistic and LGPLv2+ and LGPLv2 and GPLv2 and GPLv2+ and UCD and Public Domain and GPLv3+
-URL: http://www.swi-prolog.org
-Source: http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
-Source1: http://www.swi-prolog.org/download/stable/doc/SWI-Prolog-%{version}.pdf
-Source2: http://www.swi-prolog.org/download/xpce/doc/userguide/userguide.html.tgz
+URL: http://www.swi-prolog.org/
+Source: %{url}download/stable/src/%{name}-%{version}.tar.gz
+Source1: %{url}download/stable/doc/SWI-Prolog-%{version}.pdf
+Source2: %{url}download/xpce/doc/userguide/userguide.html.tgz
Source3: JavaConfig.java
Patch1: %{name}-5.10.5-jpl-configure.patch
Patch2: %{name}-5.10.5-man-files.patch
Patch3: %{name}-5.10.2-jni.patch
Patch4: %{name}-5.10.5-pc.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Base
BuildRequires: gmp-devel
BuildRequires: ncurses-devel
@@ -165,27 +164,6 @@ sed --in-place=.jni2 -e 's#LIBDIR#%{_libdir}#g' packages/jpl/src/java/jpl/fli/Pr
LC_CTYPE=en_US.UTF-8 javac JavaConfig.java
JAVA_HOME=$(java JavaConfig --home)
JAVA_LIBS=$(java JavaConfig --libs-only-L)
-
-#export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong}.%{_arch}
-#%%ifarch x86_64
-#export JAVA_LIB=$JAVA_HOME/jre/lib/amd64
-#%%else
-#%%ifarch sparcv9
-#export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong}
-#%export JAVA_LIB=$JAVA_HOME/jre/lib/sparc
-#%%else
-#%%ifarch sparc64
-#export JAVA_LIB=$JAVA_HOME/jre/lib/sparcv9
-#%%else
-#%%ifarch %{arm}
-#export JAVA_HOME=/usr/lib/jvm/java-%{jdkvershort}-openjdk-%{jdkverlong}
-#export JAVA_LIB=$JAVA_HOME/jre/lib/arm
-#%%else
-#export JAVA_LIB=$JAVA_HOME/jre/lib/%{_arch}
-#%%endif
-#%%endif
-#%%endif
-#%%endif
%else
# Processed by packages/configure
export DISABLE_PKGS="jpl"
@@ -203,7 +181,6 @@ popd
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Library must be executable to get its debuginfo
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/*/libswipl.so.*
@@ -232,10 +209,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/jpl.jar \
mkdir -p $RPM_BUILD_ROOT%{_includedir}/swipl/xpce
mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/include/*.h \
$RPM_BUILD_ROOT%{_includedir}/swipl
-#mv $RPM_BUILD_ROOT%%{_libdir}/swipl-%%{version}/xpce-*/include/* \
-# $RPM_BUILD_ROOT%%{_includedir}/swipl/xpce
rm -rf $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/include
-#rm -rf $RPM_BUILD_ROOT%%{_libdir}/swipl-%%{version}/xpce-*/include
%endif
# Move the binaries into %%{_bindir} directly instead of using links
@@ -251,12 +225,7 @@ find packages/jpl/examples -name "*.class" | xargs rm -f
find packages/jpl/examples -name ".cvsignore" | xargs rm -f
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%doc ReleaseNotes/relnotes-5.10 README COPYING VERSION
%doc customize/dotplrc
%doc %{docdir}/*
@@ -276,7 +245,6 @@ rm -rf $RPM_BUILD_ROOT
# Devel
%exclude %{_libdir}/swipl-%{version}/lib/*/libswipl.so
%exclude %{_libdir}/swipl-%{version}/include
-#%%exclude %%{_libdir}/swipl-%%{version}/xpce-*/include
# Static
%exclude %{_libdir}/swipl-%{version}/lib/*/libswipl.a
%if %{separate_xpce}
@@ -303,7 +271,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
%{_libdir}/swipl-%{version}/include
-#%%{_libdir}/swipl-%%{version}/xpce-*/include
%{_libdir}/swipl-%{version}/lib/*/libswipl.so
%{_libdir}/pkgconfig/swipl.pc
@@ -324,6 +291,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Mar 01 2012 Petr Pisar <ppisar at redhat.com> - 6.0.1-1
- 6.0.1 bump
+- Clean spec file
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list