rpms/python-polybori/devel import.log, NONE, 1.1 polybori-0.5-dont-build-libcudd.diff, NONE, 1.1 python-polybori.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Conrad Meyer konradm at fedoraproject.org
Sat Apr 4 00:42:13 UTC 2009


Author: konradm

Update of /cvs/pkgs/rpms/python-polybori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8403/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log polybori-0.5-dont-build-libcudd.diff 
	python-polybori.spec 
Log Message:
Import.



--- NEW FILE import.log ---
python-polybori-0_5-5_fc10:HEAD:python-polybori-0.5-5.fc10.src.rpm:1238805520

polybori-0.5-dont-build-libcudd.diff:

--- NEW FILE polybori-0.5-dont-build-libcudd.diff ---
--- SConstruct.orig	2008-09-23 13:40:37.000000000 -0700
+++ SConstruct	2008-12-12 23:14:27.000000000 -0800
@@ -390,16 +390,16 @@
 # exclude the following files
 for fname in ['util/saveimage.c', 'util/test*.c']:
     for file in glob(CuddPath(fname)):
         cudd_resources.remove(file)
 
-cudd_shared = shared_object(cudd_resources)
+#cudd_shared = shared_object(cudd_resources)
 
-libCudd = env.StaticLibrary(CuddPath(cudd_name), cudd_resources)
-DefaultBuild(libCudd)
+#libCudd = env.StaticLibrary(CuddPath(cudd_name), cudd_resources)
+#DefaultBuild(libCudd)
 
-shared_resources += cudd_shared
+#shared_resources += cudd_shared
 
 def SymlinkReadableLibname(files):
     """ Generate symbolik link with more readable library name."""
     
     suffix = env.subst('$SHLIBVERSIONSUFFIX')
@@ -432,11 +432,11 @@
     slib = VersionatedSharedLibrary
 #if env['PLATFORM']=="darwin":
 #    slib=env.LoadableModule
 
 
-libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
+#libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
 
 
 ######################################################################
 # Stuff for building PolyBoRi's C++ part
 ######################################################################
@@ -492,16 +492,16 @@
 CPPPATH=env['CPPPATH']+[GBPath('src')]
 #print env['CCFLAGS']
 #print env['CXXFLAGS']
 for t in tests_pb:
     env.Program(TestsPath(t), 
-        [TestsPath('src', t + ".cc"),  libpb] + libCudd, 
+        [TestsPath('src', t + ".cc"),  libpb], #+ libCudd, 
         CPPPATH=CPPPATH, LIBS = env['LIBS'] + pyconf.libs)
 
 for t in tests_gb:
     env.Program(TestsPath(t), 
-        [TestsPath('src', t + ".cc"), libpb, gb]+ libCudd, 
+        [TestsPath('src', t + ".cc"), libpb, gb], #+ libCudd, 
         CPPPATH=CPPPATH)
 
 
 LIBS = env['LIBS']+['boost_python']+USERLIBS
 
@@ -566,11 +566,11 @@
     for (f,n) in installable_python_modules:
         DefaultBuild(env.Install(polybori_modules, f))
 
 
     
-    to_append_for_profile = [libpb, gb] + libCudd
+    to_append_for_profile = [libpb, gb] #+ libCudd
     #to_append_for_profile=File('/lib/libutil.a')
     env.Program(PyPBPath('profiled'), wrapper_files+to_append_for_profile,
             LDMODULESUFFIX=".so",SHLIBPREFIX="", 
             LIBS = LIBS + ["python" + str(pyconf.version)] + USERLIBS + pyconf.libs,
             CPPPATH=CPPPATH, CPPDEFINES=env["CPPDEFINES"]+["PB_STATIC_PROFILING_VERSION"])
@@ -745,11 +745,11 @@
         srcdistri = presrcdistri
                 
     env.AlwaysBuild(srcdistri)
     env.Alias('distribute', srcdistri)
     
-devellibs = [libpb,gb] + libCudd + libpbShared + libgbShared + libCuddShared
+devellibs = [libpb,gb] + libpbShared + libgbShared
 readabledevellibs = SymlinkReadableLibname(devellibs)
 
 # Installation for development purposes
 if 'devel-install' in COMMAND_LINE_TARGETS:
     DevelInstPath = PathJoiner(env['DEVEL_PREFIX'])
@@ -757,13 +757,13 @@
     SymlinkReadableLibname(env.Install(DevelInstPath('lib'), devellibs))
     
     env.Install(DevelInstPath('include/polybori'), glob(PBPath('include/*.h')))
     env.Install(DevelInstPath('include/polybori/groebner'),
                 glob(GBPath('src/*.h')))
-    env.Install(DevelInstPath('include/cudd'), cudd_headers)
-    if not(external_m4ri):
-        env.Install(DevelInstPath('include/polybori/M4RI'), glob('M4RI/*.h'))
+    #env.Install(DevelInstPath('include/cudd'), cudd_headers)
+    #if not(external_m4ri):
+    #    env.Install(DevelInstPath('include/polybori/M4RI'), glob('M4RI/*.h'))
     env.Alias('devel-install', DevelInstPath())
 
 
 env.Append(COPYALL_PATTERNS = ['*'])
 


--- NEW FILE python-polybori.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-polybori
Version:        0.5
Release:        5%{?dist}
Summary:        Framework for Boolean Rings
Group:          Development/Libraries
License:        GPLv2+
URL:            http://polybori.sourceforge.net/
Source0:        http://downloads.sourceforge.net/polybori/polybori-%{version}.tar.gz
Patch0:         polybori-0.5-dont-build-libcudd.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  boost-devel
BuildRequires:  cudd-devel
BuildRequires:  cudd-static
BuildRequires:  doxygen
BuildRequires:  latex2html
BuildRequires:  m4ri-devel
BuildRequires:  python-devel
BuildRequires:  scons
Requires:       python-imaging
Requires:       ipython


%description
PolyBoRi is a special purpose computer algebra system for computations in
Boolean Rings. The core is a C++ library, which provides high-level data
types for Boolean polynomials and related structures. As a unique
approach, binary decision diagrams are used as internal storage type for
polynomial structures. On top of this, we provide a Python interface for
parsing of complex polynomial systems, as well as for sophisticated and
extendable strategies for Groebner base computation.


%package        docs
Summary:        Documentation for %{name}
Group:          Documentation


%description    docs
Documentation for %{name}.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel
Requires:       cudd-devel


%description    devel
Development headers and libraries for %{name}.


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}


%description    static
Static libraries for %{name}.


%prep
%setup -q -n polybori-%{version}
%patch0 -b .orig

# Remove private copy of system lib (cudd)
rm -rf Cudd
sed -i -e 's|#include "cuddInt.h"|#include <cuddInt.h>|' \
  polybori/include/CCuddCore.h

# Remove private copy of system lib (m4ri)
rm -rf M4RI

# Remove private copy of system lib (singular)
rm -rf Singular

sed -i '1,1d' pyroot/polybori/disttar.py

# Try to avoid stripping shared objects at link time.
# Also link in cudd and cuddobj.
sed -i -e 's|^LDFLAGS_LINUX.*-s|LDFLAGS_LINUX = -lcudd -lcuddobj|' \
  polybori/Makefile.in
sed -i -e "s|\['-s'\]|['-lcudd -lcuddobj']|" SConstruct

%ifarch x86_64 ppc64
  sed -i -e "s|DevelInstPath('lib')|DevelInstPath('lib64')|" SConstruct
%endif

# Fix encoding
iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf-8
touch -r ChangeLog ChangeLog.utf-8
mv ChangeLog.utf-8 ChangeLog



%build
# scons = suck
# we have to build in the install section


%install
rm -rf $RPM_BUILD_ROOT
scons install \
  PREFIX=$RPM_BUILD_ROOT%{_prefix} \
  EPREFIX=$RPM_BUILD_ROOT%{_bindir} \
  INSTALLDIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
  DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name} \
  MANDIR=$RPM_BUILD_ROOT%{_mandir} \
  PYINSTALLPREFIX=$RPM_BUILD_ROOT%{python_sitearch} \
  DEVEL_PREFIX=$RPM_BUILD_ROOT%{_prefix} \
    CFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri" \
   CCFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri" \
  CXXFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri"

scons devel-install \
  PREFIX=$RPM_BUILD_ROOT%{_prefix} \
  EPREFIX=$RPM_BUILD_ROOT%{_bindir} \
  INSTALLDIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \
  DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name} \
  MANDIR=$RPM_BUILD_ROOT%{_mandir} \
  PYINSTALLPREFIX=$RPM_BUILD_ROOT%{python_sitearch} \
  DEVEL_PREFIX=$RPM_BUILD_ROOT%{_prefix} \
    CFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri" \
   CCFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri" \
  CXXFLAGS="%{optflags} -I%{_includedir}/cudd -I%{_includedir}/m4ri"

# Empty header --- seems to be used, keep it for now
#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


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_bindir}/ipbori
%{_mandir}/man1/ipbori.1*
%{_datadir}/%{name}
%{python_sitearch}/polybori
%{_libdir}/lib*.so.*


%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
* Sat Mar 28 2009 Conrad Meyer <konrad at tylerc.org> - 0.5-5
- Add cudd-devel Requires to -devel subpackage.
- Link against cudd at build time.
- Fixed encoding of ChangeLog.

* Tue Mar 24 2009 Conrad Meyer <konrad at tylerc.org> - 0.5-4
- Fix SF.net source0.
- Fix License.
- Fix rpm defines (should be globals).
- Don't strip debugging information.
- Fix Requires.

* Mon Mar 23 2009 Conrad Meyer <konrad at tylerc.org> - 0.5-3
- Remove buildroot from an installed file (thanks, Mamoru).

* Wed Mar 18 2009 Conrad Meyer <konrad at tylerc.org> - 0.5-2
- Add BR on scons.

* Mon Dec 8 2008 Conrad Meyer <konrad at tylerc.org> - 0.5-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-polybori/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2009 16:38:54 -0000	1.1
+++ .cvsignore	4 Apr 2009 00:41:43 -0000	1.2
@@ -0,0 +1 @@
+polybori-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-polybori/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2009 16:38:54 -0000	1.1
+++ sources	4 Apr 2009 00:41:43 -0000	1.2
@@ -0,0 +1 @@
+0c4af11b90b69d0dac4f008b940d7518  polybori-0.5.tar.gz




More information about the fedora-extras-commits mailing list