summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2010-02-02 21:42:43 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commitae20c968b2131719f3de93d8e1b11b7a4869624e (patch)
tree8a11a70923d36ed742f5d8c164b197b5a954b10a
parent4b4d28026902ad7946d944cbbcfa6f400224557f (diff)
downloadquagga-AC-branch.zip
quagga-AC-branch.tar.gz
- as-needed fix; rel 8auto/ac/quagga-0_98_6-8AC-branch
Changed files: quagga-as-needed.patch -> 1.1.2.1 quagga.spec -> 1.25.2.16
-rw-r--r--quagga-as-needed.patch19
-rw-r--r--quagga.spec5
2 files changed, 23 insertions, 1 deletions
diff --git a/quagga-as-needed.patch b/quagga-as-needed.patch
new file mode 100644
index 0000000..d1d5497
--- /dev/null
+++ b/quagga-as-needed.patch
@@ -0,0 +1,19 @@
+--- quagga-0.98.6/lib/Makefile.am~ 2005-06-15 14:54:10.000000000 +0300
++++ quagga-0.98.6/lib/Makefile.am 2010-02-02 23:37:42.171148522 +0200
+@@ -2,6 +2,7 @@
+
+ INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
++LIBCAP = @LIBCAP@
+
+ lib_LTLIBRARIES = libzebra.la
+ libzebra_la_LDFLAGS = -version 0:0:0
+@@ -16,7 +17,7 @@
+
+ libzebra_la_DEPENDENCIES = @LIB_REGEX@
+
+-libzebra_la_LIBADD = @LIB_REGEX@
++libzebra_la_LIBADD = @LIB_REGEX@ $(LIBCAP)
+
+ pkginclude_HEADERS = \
+ buffer.h command.h filter.h getopt.h hash.h if.h linklist.h log.h \
diff --git a/quagga.spec b/quagga.spec
index 58f08c2..97b9c44 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -2,7 +2,7 @@ Summary: Routing Software Suite
Summary(pl.UTF-8): Zestaw oprogramowania do routingu
Name: quagga
Version: 0.98.6
-Release: 7
+Release: 8
License: GPL
Group: Networking/Daemons
Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz
@@ -34,6 +34,7 @@ Patch4: %{name}-ospfclient.patch
Patch5: %{name}-vtysh-pam.patch
Patch6: %{name}-blackhole.patch
Patch7: %{name}-largefile.patch
+Patch8: %{name}-as-needed.patch
URL: http://www.quagga.net/
BuildRequires: autoconf >= 2.53
BuildRequires: automake
@@ -189,8 +190,10 @@ Statyczne wersje bibliotek quagga.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
+%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}