packages: openconnect/openconnect.spec, openconnect/openconnect-Makefile.pa...

megabajt megabajt at pld-linux.org
Wed May 4 17:53:07 CEST 2011 

Author: megabajt                     Date: Wed May  4 15:53:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.02

---- Files affected:
packages/openconnect:
   openconnect.spec (1.3 -> 1.4) , openconnect-Makefile.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/openconnect/openconnect.spec
diff -u packages/openconnect/openconnect.spec:1.3 packages/openconnect/openconnect.spec:1.4
--- packages/openconnect/openconnect.spec:1.3	Thu Apr 15 20:56:58 2010
+++ packages/openconnect/openconnect.spec	Wed May  4 17:53:01 2011
@@ -1,16 +1,16 @@
 # $Revision$, $Date$
 Summary:	Client for Cisco's AnyConnect SSL VPN
+Summary(pl.UTF-8):	Klient Cisco AnyConnect SSL VPN
 Name:		openconnect
-Version:	2.23
+Version:	3.02
 Release:	1
 License:	LGPL v2
 Group:		Applications
 Source0:	ftp://ftp.infradead.org/pub/openconnect/%{name}-%{version}.tar.gz
-# Source0-md5:	5ed49f23c642a29848cb2dbcfa96dfce
+# Source0-md5:	c12688474f432a6d590958cc1c1ff076
 Patch0:		%{name}-Makefile.patch
 URL:		http://www.infradead.org/openconnect.html
-BuildRequires:	GConf2-devel
-BuildRequires:	gtk+2-devel
+BuildRequires:	libproxy-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
@@ -19,6 +19,24 @@
 %description
 OpenConnect is a client for Cisco's AnyConnect SSL VPN.
 
+%description -l pl.UTF-8
+OpenConnect jest klientem Cisco AnyConnect SSL VPN.
+
+%package devel
+Summary:	Development files for OpenConnect
+Summary(pl.UTF-8):	Pliki programistyczne dla OpenConnect
+Group:		Development/Libraries
+Requires:	libproxy-devel
+Requires:	libxml2-devel
+Requires:	openssl-devel
+Requires:	zlib-devel
+
+%description devel
+Development files for OpenConnect.
+
+%description devel -l pl.UTF-8
+Pliki programistyczne dla OpenConnect.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -26,19 +44,16 @@
 %build
 %{__make} \
 	CC="%{__cc}" \
-	RPM_OPT_FLAGS="%{rpmcflags}" \
+	RPM_OPT_FLAGS="%{rpmcppflags} %{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}/man8
 
-%{__make} install \
+%{__make} install install-lib \
 	LIBDIR=%{_libdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install openconnect.8 $RPM_BUILD_ROOT%{_mandir}/man8/
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -46,15 +61,23 @@
 %defattr(644,root,root,755)
 %doc AUTHORS README.DTLS README.SecurID TODO
 %attr(755,root,root) %{_bindir}/openconnect
-%attr(755,root,root) %{_libdir}/nm-openconnect-auth-dialog
 %{_mandir}/man8/openconnect.8*
 
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/libopenconnect.a
+%{_includedir}/openconnect.h
+%{_pkgconfigdir}/openconnect.pc
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/05/04 15:53:01  megabajt
+- updated to 3.02
+
 Revision 1.3  2010/04/15 18:56:58  megabajt
 - updated to 2.23
 

================================================================
Index: packages/openconnect/openconnect-Makefile.patch
diff -u packages/openconnect/openconnect-Makefile.patch:1.1 packages/openconnect/openconnect-Makefile.patch:1.2
--- packages/openconnect/openconnect-Makefile.patch:1.1	Sat Nov 28 19:16:33 2009
+++ packages/openconnect/openconnect-Makefile.patch	Wed May  4 17:53:01 2011
@@ -1,19 +1,19 @@
-diff -urN openconnect-2.11/Makefile openconnect-2.11.new/Makefile
---- openconnect-2.11/Makefile	2009-11-17 16:01:13.000000000 +0100
-+++ openconnect-2.11.new/Makefile	2009-11-28 19:04:08.049921000 +0100
-@@ -15,35 +15,35 @@
+--- openconnect-3.02/Makefile.orig	2011-05-04 18:53:39.109630396 +0200
++++ openconnect-3.02/Makefile	2011-05-04 17:45:05.059718203 +0200
+@@ -15,23 +15,23 @@ endif
  # dir; there's no need to install it anywhere (we link it statically).
  ifdef OPENSSL
  SSL_CFLAGS += -I$(OPENSSL)/include
--SSL_LDFLAGS += -lz $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a -ldl
-+SSL_LIBS += -lz $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a -ldl
+-SSL_LDFLAGS += $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a
++SSL_LIBS += $(OPENSSL)/libssl.a $(OPENSSL)/libcrypto.a
  else
- ifeq ($(wildcard /usr/include/openssl),)
- $(error "No OpenSSL in /usr/include/openssl. Cannot continue");
+ SSL_CFLAGS += $(shell pkg-config --cflags libssl)
+-SSL_LDFLAGS += $(shell pkg-config --libs libssl)
+-ifeq ($(SSL_LDFLAGS),)
++SSL_LIBS += $(shell pkg-config --libs libssl)
++ifeq ($(SSL_LIBS),)
+ $(error "No OpenSSL support. Cannot continue");
  endif
- SSL_CFLAGS += -I/usr/include/openssl
--SSL_LDFLAGS += -lcrypto -lssl
-+SSL_LIBS += -lcrypto -lssl
  endif
  
  XML2_CFLAGS += $(shell xml2-config --cflags) 
@@ -24,56 +24,27 @@
  $(error "No libxml2 support. Cannot continue");
  endif
  
- GTK_CFLAGS += $(shell pkg-config --cflags gtk+-x11-2.0 gthread-2.0 2>/dev/null)
--GTK_LDFLAGS += $(shell pkg-config --libs gtk+-x11-2.0 gthread-2.0 2>/dev/null)
--ifeq ($(GTK_LDFLAGS),)
-+GTK_LIBS += $(shell pkg-config --libs gtk+-x11-2.0 gthread-2.0 2>/dev/null)
-+ifeq ($(GTK_LIBS),)
- MISSINGPKGS += gtk+-x11-2.0
- endif
- 
- GCONF_CFLAGS += $(shell pkg-config --cflags gconf-2.0 2>/dev/null)
--GCONF_LDFLAGS += $(shell pkg-config --libs gconf-2.0 2>/dev/null)
--ifeq ($(GCONF_LDFLAGS),)
-+GCONF_LIBS += $(shell pkg-config --libs gconf-2.0 2>/dev/null)
-+ifeq ($(GCONF_LIBS),)
- MISSINGPKGS += gconf-2.0
- endif
- 
  CFLAGS := $(OPT_FLAGS) $(SSL_CFLAGS) $(XML2_CFLAGS) $(EXTRA_CFLAGS)
--LDFLAGS := $(SSL_LDFLAGS) $(XML2_LDFLAGS) $(EXTRA_LDFLAGS)
-+LIBS := $(SSL_LIBS) $(XML2_LIBS) $(EXTRA_LIBS)
+-LDFLAGS := -lz $(SSL_LDFLAGS) $(XML2_LDFLAGS) $(EXTRA_LDFLAGS)
++LIBS := -lz $(SSL_LIBS) $(XML2_LIBS) $(EXTRA_LIBS)
  
  ifdef SSL_UI
  CFLAGS += -DSSL_UI
-@@ -67,7 +67,7 @@
+@@ -45,7 +45,7 @@ endif
+ 
+ ifneq ($(LIBPROXY_HDR),)
+ CFLAGS += -DOPENCONNECT_LIBPROXY -DLIBPROXY_HDR=\"$(LIBPROXY_HDR)\"
+-LDFLAGS += -lproxy
++LIBS += -lproxy
+ endif
+ 
+ OPENCONNECT_OBJS := xml.o main.o $(SSL_UI)
+@@ -68,7 +68,7 @@ version.c: $(patsubst %.o,%.c,$(VERSION_
  	@./version.sh
  
- openconnect: $(OPENCONNECT_OBJS) $(CONNECTION_OBJS) $(AUTH_OBJECTS)
+ openconnect: $(OPENCONNECT_OBJS) $(CONNECTION_OBJS) libopenconnect.a
 -	$(CC) -o $@ $^ $(LDFLAGS)
 +	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  
- ifeq ($(MISSINGPKGS),)
- maybe-auth-dialog: nm-openconnect-auth-dialog
-@@ -77,7 +77,7 @@
- endif
- 
- nm-openconnect-auth-dialog: nm-auth-dialog.o $(AUTH_OBJECTS)
--	$(CC) -o $@ $^ $(LDFLAGS) $(GTK_LDFLAGS) $(GCONF_LDFLAGS) $(XML2_LDFLAGS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(GTK_LIBS) $(GCONF_LIBS) $(XML2_LIBS)
- 
  %.o: %.c
  	$(CC) -c -o $@ $(CFLAGS) $(CFLAGS_$@) $< -MD -MF .$@.dep
-@@ -92,10 +92,10 @@
- 	rm -f *~
- 
- install: all
--	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/libexec
-+	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)$(LIBDIR)
- 	install -m0755 openconnect $(DESTDIR)/usr/bin
- ifeq ($(MISSINGPKGS),)
--	install -m0755 nm-openconnect-auth-dialog $(DESTDIR)/usr/libexec
-+	install -m0755 nm-openconnect-auth-dialog $(DESTDIR)$(LIBDIR)
- endif
- 
- include /dev/null $(wildcard .*.o.dep)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openconnect/openconnect.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openconnect/openconnect-Makefile.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list