[python-polybori] New upstream version.
Jerry James
jjames at fedoraproject.org
Mon May 23 22:25:58 UTC 2011
commit 55def1b5e22630ca12b406b48daac3f23dc217f6
Author: Jerry James <loganjerry at gmail.com>
Date: Mon May 23 16:25:26 2011 -0600
New upstream version.
.gitignore | 2 +-
polybori-dont-build-libcudd.patch | 20 ++++++++++----------
python-polybori.spec | 36 +++++++++++++++++-------------------
sources | 2 +-
4 files changed, 29 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0cbb48a..3217670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-polybori-0.7.tar.gz
+/polybori-0.7.1.tar.gz
diff --git a/polybori-dont-build-libcudd.patch b/polybori-dont-build-libcudd.patch
index 7e82294..0166537 100644
--- a/polybori-dont-build-libcudd.patch
+++ b/polybori-dont-build-libcudd.patch
@@ -1,6 +1,6 @@
---- SConstruct.orig 2011-02-23 07:59:49.000000000 -0700
-+++ SConstruct 2011-04-21 20:14:51.975982531 -0600
-@@ -506,12 +506,12 @@
+--- SConstruct.orig 2011-04-27 05:00:31.000000000 -0600
++++ SConstruct 2011-05-23 16:04:42.723216338 -0600
+@@ -527,12 +527,12 @@
for file in glob(CuddPath(fname)):
cudd_resources.remove(file)
@@ -17,7 +17,7 @@
def SymlinkReadableLibname(files):
""" Generate symbolik link with more readable library name."""
-@@ -548,7 +548,7 @@
+@@ -569,7 +569,7 @@
# slib=env.LoadableModule
@@ -26,7 +26,7 @@
######################################################################
-@@ -610,17 +610,17 @@
+@@ -633,17 +633,17 @@
for t in tests_pb:
env.Program(TestsPath(t),
@@ -47,7 +47,7 @@
CPPPATH=CPPPATH)
testclasses = Split("""BooleEnv BooleSet BooleConstant BoolePolyRing
-@@ -629,7 +629,7 @@
+@@ -652,7 +652,7 @@
testclasses] + [TestsPath('src', "unittests.cc")]
env.Program(TestsPath("unittests"),
@@ -56,7 +56,7 @@
CPPPATH=CPPPATH, LIBS = env['LIBS'] + ["boost_unit_test_framework"],
CPPDEFINES = env['CPPDEFINES'] +
["BOOST_TEST_DYN_LINK"] )
-@@ -640,7 +640,7 @@
+@@ -663,7 +663,7 @@
testclassesorderings] + [TestsPath('src', "unittests_orderings.cc")]
env.Program(TestsPath("unittests_orderings"),
@@ -65,7 +65,7 @@
CPPPATH=CPPPATH, LIBS = env['LIBS'] + ["boost_unit_test_framework"],
CPPDEFINES = env['CPPDEFINES'] +
["BOOST_TEST_DYN_LINK"] )
-@@ -708,7 +708,7 @@
+@@ -731,7 +731,7 @@
@@ -74,7 +74,7 @@
#to_append_for_profile=File('/lib/libutil.a')
env.Program(PyPBPath('profiled'), wrapper_files+to_append_for_profile,
LDMODULESUFFIX=".so",SHLIBPREFIX="",
-@@ -866,7 +866,7 @@
+@@ -890,7 +890,7 @@
env.AlwaysBuild(srcdistri)
env.Alias('distribute', srcdistri)
@@ -83,7 +83,7 @@
readabledevellibs = SymlinkReadableLibname(devellibs)
# Installation for development purposes
-@@ -878,7 +878,7 @@
+@@ -902,7 +902,7 @@
env.Install(DevelInstPath('include/polybori'), glob(PBPath('include/*.h')))
env.Install(DevelInstPath('include/polybori/groebner'),
glob(GBPath('src/*.h')))
diff --git a/python-polybori.spec b/python-polybori.spec
index 01205c8..c66ab89 100644
--- a/python-polybori.spec
+++ b/python-polybori.spec
@@ -1,5 +1,5 @@
Name: python-polybori
-Version: 0.7
+Version: 0.7.1
Release: 1%{?dist}
Summary: Framework for Boolean Rings
Group: Development/Libraries
@@ -29,6 +29,8 @@ Requires: ipython
Requires: python-imaging
Requires: pyparsing
+%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_setup
%description
PolyBoRi is a special purpose computer algebra system for computations in
@@ -79,7 +81,7 @@ Static libraries for %{name}.
%prep
-%setup -q -n polybori-%{version}
+%setup -q -n polybori-0.7
%patch0 -b .orig
%patch1 -b .orig
@@ -126,37 +128,33 @@ scons %{?_smp_mflags} install devel-install \
# of libpolybori (instead of being linked to libpolybori), and the python
# interface PyPolyBoRi.so contains all of the individual object files of both
# libpolybori and libgroebner (instead of being linked to libgroebner).
-g++ -o $RPM_BUILD_ROOT%{_libdir}/libpolybori-0.7.0.so.0.0.0 -shared \
- -Wl,-soname,libpolybori-0.7.0.so.0 polybori/src/*.os -nodefaultlibs \
+g++ -o $RPM_BUILD_ROOT%{_libdir}/libpolybori-%{version}.so.0.0.0 -shared \
+ -Wl,-soname,libpolybori-%{version}.so.0 polybori/src/*.os -nodefaultlibs \
-lcudd -lcuddutil -lstdc++ -lc
-g++ -o $RPM_BUILD_ROOT%{_libdir}/libgroebner-0.7.0.so.0.0.0 -shared \
- -Wl,-soname,libgroebner-0.7.0.so.0 groebner/src/*.os \
- -L$RPM_BUILD_ROOT%{_libdir} -lpolybori-0.7.0 -lgd -lm4ri
+g++ -o $RPM_BUILD_ROOT%{_libdir}/libgroebner-%{version}.so.0.0.0 -shared \
+ -Wl,-soname,libgroebner-%{version}.so.0 groebner/src/*.os \
+ -L$RPM_BUILD_ROOT%{_libdir} -lpolybori-%{version} -lgd -lm4ri
g++ -o $RPM_BUILD_ROOT%{python_sitearch}/polybori/PyPolyBoRi.so -shared \
PyPolyBoRi/*.os -L$RPM_BUILD_ROOT%{_libdir} -lboost_python -lgroebner
# Empty header --- seems to be used, keep it for now
-#rm $RPM_BUILD_ROOT%{_includedir}/polybori/cacheopts.h
+#rm $RPM_BUILD_ROOT%%{_includedir}/polybori/cacheopts.h
# Remove buildroot from a generated file
sed -i -e 's|%{buildroot}||' %{buildroot}%{_datadir}/%{name}/ipbori/ipythonrc-polybori
-# Add missing executable bits
-chmod a+x \
- $RPM_BUILD_ROOT%{python_sitearch}/polybori/general_boolean_polynomial.py \
- $RPM_BUILD_ROOT%{python_sitearch}/polybori/parallel.py \
- $RPM_BUILD_ROOT%{python_sitearch}/polybori/plot.py
-
# Install the desktop file
cp -p %{SOURCE1} .
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
polybori.desktop
+%post -p /sbin/ldconfig
+
+
%posttrans
-/sbin/ldconfig
update-desktop-database -q >& /dev/null || :
@@ -179,30 +177,30 @@ fi
%files gui
-%defattr(-,root,root,-)
%{_bindir}/PolyGUI
%{_datadir}/applications/polybori.desktop
%{_datadir}/%{name}/gui
+%{_mandir}/man1/PolyGUI.1*
%files docs
-%defattr(-,root,root,-)
%{_docdir}/%{name}
%files devel
-%defattr(-,root,root,-)
%doc ChangeLog
%{_libdir}/lib*.so
%{_includedir}/polybori
%files static
-%defattr(-,root,root,-)
%{_libdir}/lib*.a
%changelog
+* Mon May 23 2011 Jerry James <loganjerry at gmail.com> - 0.7.1-1
+- New upstream version
+
* Wed Apr 20 2011 Jerry James <loganjerry at gmail.com> - 0.7-1
- New upstream version
- Drop BuildRoot tag, clean script, and clean at start of install script
diff --git a/sources b/sources
index 9aac8eb..5934988 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0da495597bbf58b6c7f63b7d7be854a6 polybori-0.7.tar.gz
+75d96d234c53dc40ea05a41975b0d80b polybori-0.7.1.tar.gz
More information about the scm-commits
mailing list