From 154e057f6e57f276d830acc309993da0d41e0623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Tue, 2 Mar 2010 22:54:57 +0000 Subject: [PATCH 1/3] Initialize branch F-12 for 4ti2 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 4abefacf72658751ce18a1d2f3aabd49ce6e6bc2 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Wed, 3 Mar 2010 08:33:11 +0000 Subject: [PATCH 2/3] 4ti2: Initial CVS Import for F-12 --- .cvsignore | 2 + 4ti2.module.in | 5 +++ 4ti2.spec | 103 +++++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 2 + 5 files changed, 113 insertions(+) create mode 100644 4ti2.module.in create mode 100644 4ti2.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..bcc4e76 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +4ti2-1.3.2.tar.gz +4ti2_manual.pdf diff --git a/4ti2.module.in b/4ti2.module.in new file mode 100644 index 0000000..c42ec18 --- /dev/null +++ b/4ti2.module.in @@ -0,0 +1,5 @@ +#%Module 1.0 +# +# 4ti2 module for use with 'environment-modules' package: +# +prepend-path PATH @LIBDIR@/bin diff --git a/4ti2.spec b/4ti2.spec new file mode 100644 index 0000000..d490d66 --- /dev/null +++ b/4ti2.spec @@ -0,0 +1,103 @@ +Name: 4ti2 +Version: 1.3.2 +Release: 5%{?dist} +Summary: A software package for problems on linear spaces + +Group: System Environment/Libraries +License: GPLv2+ +URL: http://www.4ti2.de/ +Source0: http://www.4ti2.de/version_%{version}/%{name}-%{version}.tar.gz +Source1: http://www.4ti2.de/4ti2_manual.pdf +Source2: 4ti2.module.in +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: environment-modules +BuildRequires: gmp-devel +BuildRequires: glpk-devel + +%description +A software package for algebraic, geometric and combinatorial +problems on linear spaces. + +This package uses Environment Modules, to load the binaries onto +your PATH you will need to run module load %{name}-%{_arch} + +%prep +%setup -q +cp -p %{SOURCE1} . + +%build +CXXFLAGS="%{optflags} -I%{_includedir}/glpk" \ +CFLAGS="%{optflags} -I%{_includedir}/glpk" \ +./configure --disable-shared --disable-static \ + --prefix=%{_libdir}/%{name} \ + --libdir=%{_libdir}/%{name}/lib/ \ + --bindir=%{_libdir}/%{name}/bin/ +perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool + +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} + +make install-exec DESTDIR=%{buildroot} + +# Make the environment-modules file +mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles/ +# Since we're doing our own substitution here, use our own definitions. +sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;' < %SOURCE2 >%{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch} + +# The libraries are not really fit for use outside the package. +rm -rf %{buildroot}/%{_libdir}/%{name}/lib* + +%check +make check + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc COPYING TODO 4ti2_manual.pdf +%{_datadir}/Modules/modulefiles/%{name}-%{_arch} +%{_libdir}/%{name}/bin/output +%{_libdir}/%{name}/bin/4ti2gmp +%{_libdir}/%{name}/bin/4ti2int32 +%{_libdir}/%{name}/bin/4ti2int64 +%{_libdir}/%{name}/bin/circuits +%{_libdir}/%{name}/bin/genmodel +%{_libdir}/%{name}/bin/gensymm +%{_libdir}/%{name}/bin/graver +%{_libdir}/%{name}/bin/groebner +%{_libdir}/%{name}/bin/hilbert +%{_libdir}/%{name}/bin/markov +%{_libdir}/%{name}/bin/minimize +%{_libdir}/%{name}/bin/normalform +%{_libdir}/%{name}/bin/ppi +%{_libdir}/%{name}/bin/qsolve +%{_libdir}/%{name}/bin/rays +%{_libdir}/%{name}/bin/walk +%{_libdir}/%{name}/bin/zbasis +%{_libdir}/%{name}/bin/zsolve + +%changelog +* Tue Mar 02 2010 Mark Chappell - 1.3.2-5 +- Add note to description about environment modules + +* Tue Mar 02 2010 Mark Chappell - 1.3.2-4 +- Switch to using modules +- Tag with the correct licence (GPLv2+) + +* Thu Feb 25 2010 Mark Chappell - 1.3.2-3 +- Preserve time stamp on 4ti2_manual.pdf +- Whitespace cleanup +- Remove obsolete post and portun calls +- Manually specify binaries + +* Thu Feb 25 2010 Mark Chappell - 1.3.2-2 +- Tidy up inconsistant use of macros +- Remove empty devel package +- Include 4ti2 manual + +* Wed Feb 17 2010 M D Chappell - 1.3.2-1 +- Initial build diff --git a/import.log b/import.log new file mode 100644 index 0000000..80eefe6 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ti2-1_3_2-5_fc12:F-12:4ti2-1.3.2-5.fc12.src.rpm:1267605144 diff --git a/sources b/sources index e69de29..c25f9de 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +93367e63944d8bb18192c4984544ed0d 4ti2-1.3.2.tar.gz +1b6fb847fc0eacddfaaef3d00c8bb7ba 4ti2_manual.pdf From d25a1d0b96e032aa95a08ba4f6a8c0f30933c132 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:07 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a0100a6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 4ti2 -# $Id$ -NAME := 4ti2 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 80eefe6..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -ti2-1_3_2-5_fc12:F-12:4ti2-1.3.2-5.fc12.src.rpm:1267605144