From 48b5622f22f58bf4e5eee93f3aad49e40f33d1ad9735711c9626890769a6068f Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sat, 4 Jul 2009 08:41:36 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gwenhywfar?expand=0&rev=9

---
 gwenhywfar-2.6.2.tar.bz2 |  3 --
 gwenhywfar-3.8.3.tar.bz2 |  3 ++
 gwenhywfar.changes       |  7 ++++
 gwenhywfar.diff          | 29 ---------------
 gwenhywfar.spec          | 77 ++++++++++++----------------------------
 5 files changed, 33 insertions(+), 86 deletions(-)
 delete mode 100644 gwenhywfar-2.6.2.tar.bz2
 create mode 100644 gwenhywfar-3.8.3.tar.bz2
 delete mode 100644 gwenhywfar.diff

diff --git a/gwenhywfar-2.6.2.tar.bz2 b/gwenhywfar-2.6.2.tar.bz2
deleted file mode 100644
index 04977fe..0000000
--- a/gwenhywfar-2.6.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:462f80ce492ac3d7acdfae6ca0f5ff309f8c2d89e54c6424280b682301a99c6b
-size 895074
diff --git a/gwenhywfar-3.8.3.tar.bz2 b/gwenhywfar-3.8.3.tar.bz2
new file mode 100644
index 0000000..6178c36
--- /dev/null
+++ b/gwenhywfar-3.8.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:495d6dbcc536a007fb9f61fe53a86c23d99480739508a167f55d90cd4342d883
+size 1062819
diff --git a/gwenhywfar.changes b/gwenhywfar.changes
index 87e91c7..14e49f1 100644
--- a/gwenhywfar.changes
+++ b/gwenhywfar.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 24 19:35:29 CEST 2009 - mkudlvasr@suse.cz
+
+- update to version 3.8.3
+  * lots of bugs fixed, lots of new features
+- removed patch0 (tests/gwenhywfar.c). not needed anymore
+
 -------------------------------------------------------------------
 Thu Jan 24 11:32:18 CET 2008 - coolo@suse.de
 
diff --git a/gwenhywfar.diff b/gwenhywfar.diff
deleted file mode 100644
index 75dca64..0000000
--- a/gwenhywfar.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- test/gwentest.c.orig	2008-01-24 11:28:26.000000000 +0100
-+++ test/gwentest.c	2008-01-24 11:29:16.000000000 +0100
-@@ -2926,7 +2926,7 @@ int testNlHttpConnect4(int argc, char **
-   }
-   fprintf(stderr, "Connected.\n");
- 
--  fd=open(outFile, O_CREAT | O_WRONLY);
-+  fd=open(outFile, O_CREAT | O_WRONLY, 0600);
-   if (fd==-1) {
-     fprintf(stderr, "Could not create outFile\n");
-     return 2;
-@@ -3213,7 +3213,7 @@ int testNlSslConnect2(int argc, char **a
-   }
-   fprintf(stderr, "Connected.\n");
- 
--  fd=open(outFile, O_CREAT | O_WRONLY);
-+  fd=open(outFile, O_CREAT | O_WRONLY,0600);
-   if (fd==-1) {
-     fprintf(stderr, "Could not create outFile\n");
-     return 2;
-@@ -3467,7 +3467,7 @@ int testNlFileConnect1(int argc, char **
-   }
-   fprintf(stderr, "Connected.\n");
- 
--  fd=open(outFile, O_CREAT | O_WRONLY);
-+  fd=open(outFile, O_CREAT | O_WRONLY, 0600);
-   if (fd==-1) {
-     fprintf(stderr, "Could not create outFile\n");
-     return 2;
diff --git a/gwenhywfar.spec b/gwenhywfar.spec
index 87b56ea..eb8af35 100644
--- a/gwenhywfar.spec
+++ b/gwenhywfar.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gwenhywfar (Version 2.6.2)
+# spec file for package gwenhywfar (Version 3.8.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,16 +19,16 @@
 
 
 Name:           gwenhywfar
-BuildRequires:  doxygen graphviz graphviz-gd libopenssl-devel libxml2-devel pkg-config xorg-x11-fonts
-Version:        2.6.2
-Release:        128
+BuildRequires:  doxygen graphviz graphviz-gd libgcrypt-devel libopenssl-devel libxml2-devel pkg-config xorg-x11-fonts
+BuildRequires:  fdupes gnutls-devel
+Version:        3.8.3
+Release:        1
 Url:            http://gwenhywfar.sourceforge.net/
 Group:          System/Libraries
 License:        LGPL v2.1 or later
 Summary:        A Multiplatform Helper Library for Other Libraries
 Source:         %{name}-%{version}.tar.bz2
-Patch0:         gwenhywfar.diff
-Requires:       libgwenhywfar38 = %{version}
+Requires:       libgwenhywfar47 = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -46,13 +46,13 @@ Authors:
     Martin Preuss <martin@libchipcard.de>
     Christian Stimming
 
-%package -n libgwenhywfar38
+%package -n libgwenhywfar47
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Summary:        A Multiplatform Helper Library for Other Libraries
 Requires:       %{name} >= %{version}
 
-%description -n libgwenhywfar38
+%description -n libgwenhywfar47
 Gwenhywfar is a base library used to provide OS abstraction functions
 for Linux, FreeBSD, OpenBSD, NetBSD, and Windows.  It also includes
 some often needed functions (for example, for handling and parsing of
@@ -90,7 +90,6 @@ Authors:
 
 %prep
 %setup -q
-%patch0
 
 %build
 autoreconf -f -i
@@ -107,10 +106,19 @@ make srcdoc %{?jobs:-j%jobs}
 %install
 %makeinstall
 %makeinstall install-srcdoc
+# we don't want another 'gwenhywfar' dir below docpath
+pushd $RPM_BUILD_ROOT%{_docdir}/%{name}/apidoc
+    %__mv %{name}/* ./
+    rm -rf %{name}
+popd
 %find_lang %{name}
-rm $RPM_BUILD_ROOT%{_libdir}/gwenhywfar/plugins/*/*/*.*a $RPM_BUILD_ROOT%{_libdir}/*.*a
+%__rm $RPM_BUILD_ROOT%{_libdir}/gwenhywfar/plugins/*/*/*.*a $RPM_BUILD_ROOT%{_libdir}/*.*a
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-cp -a AUTHORS COPYING ChangeLog NEWS README TODO $RPM_BUILD_ROOT%{_docdir}/%{name}
+%__cp -a AUTHORS COPYING ChangeLog NEWS README TODO $RPM_BUILD_ROOT%{_docdir}/%{name}
+pushd $RPM_BUILD_ROOT%{_docdir}/%{name}/apidoc
+    `find -maxdepth 1 -type f -empty -print0 | xargs -0 echo %__rm -f`
+popd
+%fdupes $RPM_BUILD_ROOT%{_docdir}/%{name}/apidoc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,9 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-%post -n libgwenhywfar38 -p /sbin/ldconfig
+%post -n libgwenhywfar47 -p /sbin/ldconfig
 
-%postun -n libgwenhywfar38 -p /sbin/ldconfig
+%postun -n libgwenhywfar47 -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr (-, root, root)
@@ -129,10 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}
 %dir %{_libdir}/gwenhywfar
 %{_libdir}/gwenhywfar/*
-%{_sysconfdir}/*.crt
+%{_datadir}/gwenhywfar
 %exclude %{_docdir}/%{name}/apidoc
 
-%files -n libgwenhywfar38
+%files -n libgwenhywfar47
 %defattr (-, root, root)
 %{_libdir}/*.so.*
 
@@ -149,42 +157,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gwenhywfar.pc
 
 %changelog
-* Thu Jan 24 2008 coolo@suse.de
-- fixing open call
-* Fri Nov 09 2007 crrodriguez@suse.de
-- update to version 2.6.2
-  * Release is only interesting for windows or NetBSD users
-- disable static libraries
-- remove "la" files
-- remove unnedded dependency on libopenssl-devel in the -devel package
-* Fri Jul 27 2007 sbrabec@suse.cz
-- Updated to version 2.6.1:
-  * Minor bugs have been fixed.
-  * Cross-compiling is now supported.
-  * Some missing list functions have been added.
-  * Decreases the verbosity.
-  * Makes gwenhywfar completely relocatable using binreloc.
-- Split package according to shared library packaging policy.
-- Build with libxml2.
-- Build and create api docs.
-* Mon Oct 02 2006 sbrabec@suse.cz
-- Updated to version 2.4.1:
-  * bug fixes
-  * removed debugging messages
-  * clean up the API
-* Fri Sep 15 2006 jhargadon@suse.de
-- update to version 2.4.0
-- This release adds GWEN_DBIO plugin which writes GWEN_DB's as XML files
-* Tue Jun 20 2006 stbinner@suse.de
-- Update to version 2.3.0:
-  * Adds a new module for fast lookup of objects via integer IDs.
-  * Adds a storage module to be used by further projects.
-* Thu May 11 2006 sbrabec@suse.cz
-- Updated to version 2.2.0.
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Mon Jan 16 2006 sbrabec@suse.cz
-- Updated to version 1.19.2.
-* Wed Oct 19 2005 sbrabec@suse.cz
-- New SuSE package, version 1.18.0.
-  Based on spec file from Rajesh Singh <rajeshsingh.geo@yahoo.com>.