rpms/gwenhywfar/devel gwenhywfar-3.4.1-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 gwenhywfar.spec, 1.28, 1.29 sources, 1.8, 1.9 gwenhywfar-2.3.0-pkgconfig.patch, 1.2, NONE

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/gwenhywfar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25408

Modified Files:
	.cvsignore gwenhywfar.spec sources 
Added Files:
	gwenhywfar-3.4.1-pkgconfig.patch 
Removed Files:
	gwenhywfar-2.3.0-pkgconfig.patch 
Log Message:
Update to 3.4.1


gwenhywfar-3.4.1-pkgconfig.patch:

--- NEW FILE gwenhywfar-3.4.1-pkgconfig.patch ---
diff -up gwenhywfar-3.4.1/gwenhywfar-config.in.in.pkgconfig gwenhywfar-3.4.1/gwenhywfar-config.in.in
--- gwenhywfar-3.4.1/gwenhywfar-config.in.in.pkgconfig	2008-07-31 13:56:05.000000000 -0400
+++ gwenhywfar-3.4.1/gwenhywfar-config.in.in	2008-09-09 11:25:23.000000000 -0400
@@ -1,31 +1,26 @@
 # $Id$
 # Author of this file: Martin Preuss<martin at libchipcard.de>
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
 bindir=@bindir@
 
-libdir=@libdir@
-
 result=""
 
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result -I at gwenhywfar_headerdir@"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--libraries)
-	    result="$result @gwenhywfar_ldflags@ @gwenhywfar_libs@"
+	    result="$result $(pkg-config --libs gwenhywfar)"
 	    ;;
 	--bindir)
 	    result="$result @gwenhywfar_bindir@"
 	    ;;
 	--headers)
-	    result="$result @gwenhywfar_headerdir@/gwenhywfar"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--plugins)
-	    result="$result @gwenhywfar_plugindir@"
+	    result="$result $(pkg-config --variable=plugindir gwenhywfar)"
 	    ;;
 	--vmajor)
 	    result="$result @GWENHYWFAR_VERSION_MAJOR@"
diff -up gwenhywfar-3.4.1/gwenhywfar.pc.in.pkgconfig gwenhywfar-3.4.1/gwenhywfar.pc.in
--- gwenhywfar-3.4.1/gwenhywfar.pc.in.pkgconfig	2008-07-31 13:56:05.000000000 -0400
+++ gwenhywfar-3.4.1/gwenhywfar.pc.in	2008-09-09 11:21:51.000000000 -0400
@@ -22,5 +22,4 @@ Description: A multi-platform helper lib
 
 Version: @VERSION@
 Libs: @gwenhywfar_ldflags@ @gwenhywfar_libs@
-Cflags: -I at gwenhywfar_headerdir@
-
+Cflags: -I at gwenhywfar_headerdir@ -I at libdir@/gwenhywfar/include


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenhywfar/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Jan 2008 03:45:19 -0000	1.8
+++ .cvsignore	9 Sep 2008 17:01:51 -0000	1.9
@@ -1 +1 @@
-gwenhywfar-2.6.2.tar.gz
+gwenhywfar-3.4.1.tar.gz


Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenhywfar/devel/gwenhywfar.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gwenhywfar.spec	14 Feb 2008 19:25:33 -0000	1.28
+++ gwenhywfar.spec	9 Sep 2008 17:01:51 -0000	1.29
@@ -1,15 +1,15 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
-Version: 2.6.2
-Release: 2%{?dist}
+Version: 3.4.1
+Release: 1%{?dist}
 Source: http://download.sourceforge.net/gwenhywfar/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: LGPLv2+
-Patch: gwenhywfar-2.3.0-pkgconfig.patch
+Patch: gwenhywfar-3.4.1-pkgconfig.patch
 Patch2: gwen-open.patch
 URL: http://sourceforge.net/projects/gwenhywfar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel gettext
+BuildRequires: gnutls-devel gettext libgcrypt-devel
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -32,7 +32,6 @@
 %setup -q
 # Port gwenhywfar-config to pkgconfig
 %patch -p1 -b .pkgconfig
-%patch2 -p1 -b .open
 
 %build
 %configure --disable-static --with-openssl-libs=%{_libdir}
@@ -46,13 +45,7 @@
 
 find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/gwenhywfar/include
-mv $RPM_BUILD_ROOT/%{_includedir}/gwenhywfar/types.h $RPM_BUILD_ROOT/%{_libdir}/gwenhywfar/include/gwenhywfar-types-target.h
-
-cat > $RPM_BUILD_ROOT/%{_includedir}/gwenhywfar/types.h << EOF
-/* Wrapper for target-specific types file. */
-#include <gwenhywfar-types-target.h>
-EOF
+%find_lang %{name}
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -61,25 +54,25 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS README COPYING ChangeLog
-%config(noreplace) /etc/gwen-public-ca.crt
 %{_libdir}/*.so.*
 %{_libdir}/%{name}
-%exclude %{_libdir}/%{name}/include
-%{_datadir}/locale/*/LC_MESSAGES/gwenhywfar.mo
+%{_datadir}/%{name}
 
 %files devel
 %defattr(-,root,root)
 %{_bindir}/*
-%{_includedir}/gwenhywfar
-%{_libdir}/%{name}/include
+%{_includedir}/gwenhywfar3
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_datadir}/aclocal/gwenhywfar.m4
 
 %changelog
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> - 3.4.1-1
+- update to 3.4.1
+
 * Thu Feb 14 2008 Bill Nottingham <notting at redhat.com> - 2.6.2-2
 - rebuild with gcc-4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenhywfar/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jan 2008 03:45:19 -0000	1.8
+++ sources	9 Sep 2008 17:01:51 -0000	1.9
@@ -1 +1 @@
-fec3bc3653b7809cc44526b6fed52ab2  gwenhywfar-2.6.2.tar.gz
+c1bee825e06cf81e6811b3e788f67b44  gwenhywfar-3.4.1.tar.gz


--- gwenhywfar-2.3.0-pkgconfig.patch DELETED ---