rpms/anet
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgraded to version 0.2.3.

Browse source
This commit is contained in:
Björn Persson 2014-01-29 12:51:08 +01:00
commit f7a8a8e07a
5 changed files with 10 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1 +1,2 @@
/libanet-0.2.2.tar.bz2
/libanet-0.2.3.tar.bz2

55
anet-0.2.2-directories.patch
View file

@ -1,55 +0,0 @@
diff --git a/Makefile b/Makefile
index 11fced6..c5e4354 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,13 @@ NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
GMAKE_OPTS = -p -R -j$(NUM_CPUS)
+# GNU-style directory variables
+prefix = ${PREFIX}
+exec_prefix = ${prefix}
+includedir = ${prefix}/include
+libdir = ${exec_prefix}/lib
+gprdir = ${prefix}/lib/gnat
+
all: build_lib
build_lib:
@@ -48,24 +55,24 @@ examples:
install: install_lib install_$(LIBRARY_KIND)
install_lib: build_lib
- install -d $(PREFIX)/lib/gnat
- install -d $(PREFIX)/lib/anet
- install -d $(PREFIX)/include/anet
- install -m 644 $(SRCDIR)/*.ad[bs] $(PREFIX)/include/anet
- install -m 444 $(LIBDIR)/$(LIBRARY_KIND)/*.ali $(PREFIX)/lib/anet
- install -m 644 $(GPR_FILES) $(PREFIX)/lib/gnat
+ install -d $(DESTDIR)$(gprdir)
+ install -d $(DESTDIR)$(libdir)/anet
+ install -d $(DESTDIR)$(includedir)/anet
+ install -m 644 $(SRCDIR)/*.ad[bs] $(DESTDIR)$(includedir)/anet
+ install -m 444 $(LIBDIR)/$(LIBRARY_KIND)/*.ali $(DESTDIR)$(libdir)/anet
+ install -m 644 $(GPR_FILES) $(DESTDIR)$(gprdir)
install_static:
- install -m 444 $(LIBDIR)/$(LIBRARY_KIND)/libanet.a $(PREFIX)/lib
+ install -m 444 $(LIBDIR)/$(LIBRARY_KIND)/libanet.a $(DESTDIR)$(libdir)
install_dynamic:
- install -m 444 $(LIBDIR)/$(LIBRARY_KIND)/$(SO_LIBRARY) $(PREFIX)/lib
- cd $(PREFIX)/lib && ln -sf $(SO_LIBRARY) libanet.so
+ install -m 444 $(LIBDIR)/$(LIBRARY_KIND)/$(SO_LIBRARY) $(DESTDIR)$(libdir)
+ cd $(DESTDIR)$(libdir) && ln -sf $(SO_LIBRARY) libanet.so
install_tests: build_tests
- install -v -d $(PREFIX)/$(TESTDIR)
- install -m 755 $(OBJDIR)/$(TESTDIR)/test_runner $(PREFIX)/$(TESTDIR)
- cp -r data $(PREFIX)/$(TESTDIR)
+ install -v -d $(DESTDIR)$(prefix)/$(TESTDIR)
+ install -m 755 $(OBJDIR)/$(TESTDIR)/test_runner $(DESTDIR)$(prefix)/$(TESTDIR)
+ cp -r data $(DESTDIR)$(prefix)/$(TESTDIR)
doc:
@$(MAKE) -C doc

51
anet-0.2.2-install.patch
View file

@ -1,51 +0,0 @@
diff --git a/Makefile b/Makefile
index 6a05213..343892d 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,12 @@ TARBALL = $(ANET).tar.bz2
SO_LIBRARY = libanet.so.$(VERSION)
LIBRARY_KIND = dynamic
+
+# Command variables
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) --mode=644 --preserve-timestamps
+INSTALL_ALI = $(INSTALL) --mode=444
NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
@@ -62,23 +70,23 @@ examples:
install: install_lib install_$(LIBRARY_KIND)
install_lib: build_lib
- install -d $(DESTDIR)$(gprdir)
- install -d $(DESTDIR)$(libdir)/anet
- install -d $(DESTDIR)$(includedir)/anet
- install -m 644 $(SRCDIR)/*.ad[bs] $(DESTDIR)$(includedir)/anet
- install -m 444 $(LIBDIR)/$(LIBRARY_KIND)/*.ali $(DESTDIR)$(libdir)/anet
- install -m 644 $(GPR_FILES) $(DESTDIR)$(gprdir)
+ $(INSTALL) -d $(DESTDIR)$(gprdir)
+ $(INSTALL) -d $(DESTDIR)$(libdir)/anet
+ $(INSTALL) -d $(DESTDIR)$(includedir)/anet
+ $(INSTALL_DATA) $(SRCDIR)/*.ad[bs] $(DESTDIR)$(includedir)/anet
+ $(INSTALL_ALI) $(LIBDIR)/$(LIBRARY_KIND)/*.ali $(DESTDIR)$(libdir)/anet
+ $(INSTALL_DATA) $(GPR_FILES) $(DESTDIR)$(gprdir)
install_static:
- install -m 444 $(LIBDIR)/$(LIBRARY_KIND)/libanet.a $(DESTDIR)$(libdir)
+ $(INSTALL_DATA) $(LIBDIR)/$(LIBRARY_KIND)/libanet.a $(DESTDIR)$(libdir)
install_dynamic:
- install -m 444 $(LIBDIR)/$(LIBRARY_KIND)/$(SO_LIBRARY) $(DESTDIR)$(libdir)
+ $(INSTALL_PROGRAM) $(LIBDIR)/$(LIBRARY_KIND)/$(SO_LIBRARY) $(DESTDIR)$(libdir)
cd $(DESTDIR)$(libdir) && ln -sf $(SO_LIBRARY) libanet.so
install_tests: build_tests
- install -v -d $(DESTDIR)$(prefix)/$(TESTDIR)
- install -m 755 $(OBJDIR)/$(TESTDIR)/test_runner $(DESTDIR)$(prefix)/$(TESTDIR)
+ $(INSTALL) -v -d $(DESTDIR)$(prefix)/$(TESTDIR)
+ $(INSTALL_PROGRAM) $(OBJDIR)/$(TESTDIR)/test_runner $(DESTDIR)$(prefix)/$(TESTDIR)
cp -r data $(DESTDIR)$(prefix)/$(TESTDIR)
doc:

21
anet.spec
View file

@ -1,20 +1,14 @@
Name: anet
Version: 0.2.2
Release: 2%{?dist}
Version: 0.2.3
Release: 1%{?dist}
Summary: Ada Networking Library
Group: System Environment/Libraries
License: GPLv2+ with exceptions
URL: http://www.codelabs.ch/anet/
Source: http://www.codelabs.ch/download/libanet-0.2.2.tar.bz2
Source: http://www.codelabs.ch/download/libanet-0.2.3.tar.bz2
# Fedora-specific patch to use the directory project:
Patch1: anet-0.2.2-directories_gpr.patch
# Patch to add directory variables so that libdir and gprdir can be set:
# http://git.codelabs.ch/?p=anet.git;a=commit;h=98e3e17133f6cc018a18e1aa62139d17d641bfac
Patch2: anet-0.2.2-directories.patch
# Patch to install the shared library with execute permission:
# http://git.codelabs.ch/?p=anet.git;a=commit;h=52994d0b350aa75b28e1c4df866474d5d3a3bed6
Patch3: anet-0.2.2-install.patch
BuildRequires: gcc-gnat fedora-gnat-project-common chrpath asciidoc
# Build only on architectures where gcc-gnat is available:
@ -56,12 +50,10 @@ för att utveckla program som använder Anet.
%prep
%setup -q -n libanet-%{version}
%patch1 -p 1
%patch2 -p 1
%patch3 -p 1
%build
make GMAKE_OPTS='%{Gnatmake_optflags}'
make GNATFLAGS='%{Gnatmake_optflags}'
# Remove the unnecessary runpath that Gnatmake added.
chrpath --delete lib/dynamic/*.so.*
make doc
@ -73,7 +65,7 @@ make doc
%check
# The testsuite can't be run until we get Ahven packaged.
#make tests GMAKE_OPTS='%{Gnatmake_optflags}'
#make tests GNATFLAGS='%{Gnatmake_optflags}'
%{_rpmconfigdir}/check-rpaths
@ -95,6 +87,9 @@ make doc
%changelog
* Wed Jan 29 2014 Björn Persson <bjorn@rombobjörn.se> - 0.2.3-1
- Upgraded to version 0.2.3.
* Sun Jul 28 2013 Björn Persson <bjorn@rombobjörn.se> - 0.2.2-2
- Use %%doc now that documentation directories are unversioned.

2
sources
View file

@ -1 +1 @@
9663f1bd7630207daebae31630ab63a3 libanet-0.2.2.tar.bz2
76aa432601783bf10f34ba1a8c4d06a4 libanet-0.2.3.tar.bz2