[packages/libint2] - libint 2.3.1 packaged as libint2 (parallel installable with 1.x)

qboosh qboosh at pld-linux.org
Sat May 27 18:51:08 CEST 2017


commit cf9e6e8e13c6274f6e94dd6c5d1af6897d50b793
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 27 18:52:02 2017 +0200

    - libint 2.3.1 packaged as libint2 (parallel installable with 1.x)

 libint-link.patch           | 22 ----------------
 libint2-verbose.patch       | 26 +++++++++++++++++++
 libint.spec => libint2.spec | 61 +++++++++++++++++++++------------------------
 3 files changed, 54 insertions(+), 55 deletions(-)
---
diff --git a/libint.spec b/libint2.spec
similarity index 70%
rename from libint.spec
rename to libint2.spec
index 9d19893..3eba9b1 100644
--- a/libint.spec
+++ b/libint2.spec
@@ -1,19 +1,22 @@
 Summary:	Evaluation of certain two-body molecular integrals over Cartesian Gaussian functions
 Summary(pl.UTF-8):	Obliczanie całek dwuelementowych cząsteczek po kartezjańskich funkcjach Gaussa
-Name:		libint
-Version:	1.2.1
+Name:		libint2
+Version:	2.3.1
 Release:	1
 License:	GPL v3+
 Group:		Libraries
 #Source0Download: https://github.com/evaleev/libint/releases
-Source0:	https://github.com/evaleev/libint/archive/release-1-2-1/%{name}-%{version}.tar.gz
-# Source0-md5:	e34f4a677241bde114dc5282a802a067
-Patch0:		%{name}-link.patch
+Source0:	https://github.com/evaleev/libint/archive/v%{version}/libint-%{version}.tar.gz
+# Source0-md5:	34adc4c971372a51b13bb7fd257b7c68
+Patch0:		%{name}-verbose.patch
 URL:		http://libint.valeyev.net/
-BuildRequires:	autoconf >= 2.52
+BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake
-BuildRequires:	libstdc++-devel >= 3.0
-BuildRequires:	libtool >= 2:1.5
+BuildRequires:	boost-devel
+BuildRequires:	eigen3
+BuildRequires:	gmp-c++-devel
+BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	libtool >= 2:2
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,7 +50,7 @@ Summary:	Header files for libint library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libint
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libstdc++-devel >= 3.0
+Requires:	libstdc++-devel >= 6:4.7
 
 %description devel
 Header files for libint library.
@@ -68,30 +71,31 @@ Static libint library.
 Statyczna biblioteka libint.
 
 %prep
-%setup -q -n libint-release-1-2-1
+%setup -q -n libint-%{version}
 %patch0 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal} -I lib/autoconf
 %{__autoconf}
+CPPFLAGS="%{rpmcppflags} -I/usr/include/eigen3"
 %configure \
 	--enable-shared
 
-sed -i -e 's/^CFLAGS =.*/CFLAGS = %{rpmcflags}/;s/^CXXFLAGS =.*/CXXFLAGS = %{rpmcxxflags}/' src/lib/MakeVars
-
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	includedir=$RPM_BUILD_ROOT%{_includedir} \
-	libdir=$RPM_BUILD_ROOT%{_libdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 # help rpm to find deps
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libint2.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -100,28 +104,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES LICENSE README
-%attr(755,root,root) %{_libdir}/libderiv.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libderiv.so.1
-%attr(755,root,root) %{_libdir}/libint.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libint.so.1
-%attr(755,root,root) %{_libdir}/libr12.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libr12.so.1
+%doc CHANGES CITATION LICENSE README.md
+%attr(755,root,root) %{_libdir}/libint2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libint2.so.2
+%{_datadir}/libint
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libderiv.so
-%attr(755,root,root) %{_libdir}/libint.so
-%attr(755,root,root) %{_libdir}/libr12.so
-%{_libdir}/libderiv.la
-%{_libdir}/libint.la
-%{_libdir}/libr12.la
-%{_includedir}/libderiv
-%{_includedir}/libint
-%{_includedir}/libr12
+%attr(755,root,root) %{_libdir}/libint2.so
+%{_includedir}/libint2
+%{_includedir}/libint2.h
+%{_includedir}/libint2.hpp
+%{_pkgconfigdir}/libint2.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libderiv.a
-%{_libdir}/libint.a
-%{_libdir}/libr12.a
+%{_libdir}/libint2.a
diff --git a/libint-link.patch b/libint-link.patch
deleted file mode 100644
index 0644035..0000000
--- a/libint-link.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libint-1.1.2/src/lib/libderiv/Makefile.library.orig	2003-12-05 18:33:19.000000000 +0100
-+++ libint-1.1.2/src/lib/libderiv/Makefile.library	2006-07-23 17:33:43.765183250 +0200
-@@ -23,7 +23,7 @@
- 
- # this is how shared library is made
- $(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
--	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
-+	$(LTLINK) $(CXX) -o $@ $^ $(TOPDIR)/lib/libint.la $(LTLINKLIBOPTS)
- 
- $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
- 	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
---- libint-1.1.2/src/lib/libr12/Makefile.library.orig	2003-08-01 01:49:45.000000000 +0200
-+++ libint-1.1.2/src/lib/libr12/Makefile.library	2006-07-23 17:34:23.035637500 +0200
-@@ -47,7 +47,7 @@
- 
- # this is how shared library is made
- $(TOPDIR)/lib/$(NAME).la: $(LIBOBJ)
--	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)
-+	$(LTLINK) $(CXX) -o $@ $^ $(TOPDIR)/lib/libint.la $(LTLINKLIBOPTS)
- 
- $(TOPDIR)/include/$(NAME)/$(NAME).h: $(NAME).h
- 	$(INSTALL) $(INSTALLDIROPT) $(TOPDIR)/include/$(NAME)
diff --git a/libint2-verbose.patch b/libint2-verbose.patch
new file mode 100644
index 0000000..9cd6ff8
--- /dev/null
+++ b/libint2-verbose.patch
@@ -0,0 +1,26 @@
+--- libint-2.3.1/lib/MakeSuffixRules.orig	2017-05-03 15:11:21.000000000 +0200
++++ libint-2.3.1/lib/MakeSuffixRules	2017-05-27 17:23:50.878344283 +0200
+@@ -1,19 +1,19 @@
+ 
+ %.o:: %.c
+ 	$(info CC $@)
+-	@$(CC) $(CPPFLAGS) $(CFLAGS) -c $< $(OUTPUT_OPTION)
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< $(OUTPUT_OPTION)
+ 
+ %.o:: %.cc
+ 	$(info CXX $@)
+-	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< $(OUTPUT_OPTION)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< $(OUTPUT_OPTION)
+ 
+ %.lo:: %.cc
+ 	$(info CXX $@)
+-	@$(LTCOMP) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< $(OUTPUT_OPTION)
++	$(LTCOMP) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< $(OUTPUT_OPTION)
+ 
+ %.lo:: %.c
+ 	$(info CC $@)
+-	@$(LTCOMP) $(CC) $(CPPFLAGS) $(CFLAGS) -c $< $(OUTPUT_OPTION)
++	$(LTCOMP) $(CC) $(CPPFLAGS) $(CFLAGS) -c $< $(OUTPUT_OPTION)
+ 
+ ifdef BIBTEX
+ ifdef PDFLATEX
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libint2.git/commitdiff/cf9e6e8e13c6274f6e94dd6c5d1af6897d50b793



More information about the pld-cvs-commit mailing list