rpms/xca/devel xca-0.5.1-langinst.patch, NONE, 1.1 xca-0.5.1-gcc4.patch, NONE, 1.1 xca-0.5.1-db43.patch, NONE, 1.1 xca.spec, 1.5, 1.6 xca-0.4.6-gcc3.patch, 1.1, NONE cxx_except.h, 1.1, NONE cxx_common.h, 1.1, NONE

Enrico Scholz (ensc) fedora-extras-commits at redhat.com
Tue Mar 8 17:17:23 UTC 2005 

Author: ensc

Update of /cvs/extras/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29057

Modified Files:
	xca.spec 
Added Files:
	xca-0.5.1-langinst.patch xca-0.5.1-gcc4.patch 
	xca-0.5.1-db43.patch 
Removed Files:
	xca-0.4.6-gcc3.patch cxx_except.h cxx_common.h 
Log Message:
- updated to 0.5.1
- (re)enabled parallel build
- applied -langinst patch and other ideas from
  https://bugzilla.fedora.us/show_bug.cgi?id=2019 (Ville Skyttä)
- fixed build with gcc4 and db43
- removed old cruft from the specfile


xca-0.5.1-langinst.patch:

--- NEW FILE xca-0.5.1-langinst.patch ---
--- lang/Makefile~	2004-02-18 19:29:50.000000000 +0200
+++ lang/Makefile	2004-08-27 20:09:02.910204474 +0300
@@ -3,7 +3,7 @@
 
 install:
 	install -m 755 -d $(destdir)$(prefix)/share/xca
-	install -m 644 lang/xca_??.qm $(destdir)$(prefix)/share/xca || true
+	install -m 644 xca_??.qm $(destdir)$(prefix)/share/xca || true
 
 include $(TOPDIR)/Local.mak
 

xca-0.5.1-gcc4.patch:

--- NEW FILE xca-0.5.1-gcc4.patch ---
===================================================================
RCS file: /cvsroot/xca/xca/widgets/clicklabel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xca/xca/widgets/clicklabel.cpp	2003/11/26 22:03:18	1.3
+++ xca/xca/widgets/clicklabel.cpp	2005/02/07 21:56:27	1.4
@@ -45,7 +45,7 @@
  * http://www.hohnstaedt.de/xca
  * email: christian at hohnstaedt.de
  *
- * $Id: clicklabel.cpp,v 1.3 2003/11/26 22:03:18 chris2511 Exp $ 
+ * $Id: clicklabel.cpp,v 1.4 2005/02/07 21:56:27 chris2511 Exp $ 
  *
  */                           
 
@@ -58,9 +58,9 @@
 ClickLabel::ClickLabel( QWidget* parent,  const char* name, WFlags f )
 	:QLabel( parent, name, f )
 {
-	QFont font( font() );
-	font.setBold(true);
-	setFont( font );
+	QFont fnt( font() );
+	fnt.setBold(true);
+	setFont( fnt );
 	setFrameShape( QLabel::Panel );
 	setFrameShadow( QLabel::Sunken );
 	setAlignment( int( QLabel::AlignCenter ) );

xca-0.5.1-db43.patch:

--- NEW FILE xca-0.5.1-db43.patch ---
--- xca-0.5.1/widgets/MainWindow.h.db43	2004-04-15 01:36:56.000000000 +0200
+++ xca-0.5.1/widgets/MainWindow.h	2005-03-08 17:36:26.000000000 +0100
@@ -105,6 +105,10 @@ class MainWindow: public MainWindow_UI
 	static int passRead(char *buf, int size, int rwflag, void *userdata);
 	static int passWrite(char *buf, int size, int rwflag, void *userdata);
 	static void dberr(const char *errpfx, char *msg);
+	static void dberr(DbEnv const *, const char *errpfx, char const *msg)
+	{
+	  dberr(errpfx, const_cast<char *>(msg));
+	}
 	static NewX509 *newX509();
 	static QString md5passwd(const char *pass);
 	static void Error(errorEx &err);


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xca.spec	5 Mar 2005 20:07:09 -0000	1.5
+++ xca.spec	8 Mar 2005 17:17:21 -0000	1.6
@@ -1,23 +1,24 @@
-## For RHL7.3 compile with '--without desktop' flag
+## $Id$
+
+%{!?release_func:%global release_func() %1%{?disttag}}
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
-Version:	0.4.6
-Release:	1
+Version:	0.5.1
+Release:	%release_func 0
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
-Source0:	http://download.sourceforge.net/sourceforge/xca/%{name}-%{version}.tar.gz
-Source1:	http://www.hohnstaedt.de/xca/cxx_common.h
-Source2:	http://www.hohnstaedt.de/xca/cxx_except.h
-# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/MainWindow.cpp?r1=1.33&r2=1.34&diff_format=u
-Patch0:		xca-0.4.6-gcc3.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
+Patch0:		%name-0.5.1-langinst.patch
+# http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
+Patch1:		%name-0.5.1-gcc4.patch
+Patch2:		%name-0.5.1-db43.patch
+BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
-%if 0%{!?_without_desktop:1}
 BuildRequires:	desktop-file-utils
-%endif
+
 
 %description
 The Program uses a Berkeley db for storage and supports RSA keys.
@@ -30,41 +31,31 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b .gcc3
+%patch0 -p0 -b .langinst
+%patch1 -p2 -b .gcc4
+%patch2 -p1 -b .db43
 
+sed -i 's! db_cxx-4 ! db_cxx-4 db_cxx-4.3 !g' configure
 
-%build
-test -n "$QTDIR" || . %{_sysconfdir}/profile.d/qt.sh
-
-db_inc=/usr/include/db
-rpm -q db3-devel && db_inc=/usr/include/db3 || :
-rpm -q db4-devel && db_inc=/usr/include/db4 || :
-
-## Hacky workaround for broken db[34]-devel package:
-## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=59759
-echo '#include "db_cxx.h"' | g++ -x c++ -E -I $db_inc - &>/dev/null || {
-	cp -a %{SOURCE1} %{SOURCE2} .
-	export CPPFLAGS="-I`pwd`"
-}
 
+%build
+test -n "$QTDIR" || . %_sysconfdir/profile.d/qt.sh
 CC='%__cc' LD='%__ld' CFLAGS="$RPM_OPT_FLAGS" STRIP=: prefix=%_prefix \
 ./configure
-%__make
+%__make %{?_smp_mflags}
+lrelease xca.pro
 
 
 %install
 rm -rf "$RPM_BUILD_ROOT" _doc
-%{__make} destdir="$RPM_BUILD_ROOT" install
+%__make destdir="$RPM_BUILD_ROOT" mandir=share/man install
 
-%{__install} -d -m755 _doc/html $RPM_BUILD_ROOT%{_datadir}/applications
-%{__install} -p -m644 doc/*.html _doc/html/
+%__install -d -m755 _doc/html $RPM_BUILD_ROOT%_datadir/applications
 
-%if 0%{!?_without_desktop:1}
 desktop-file-install --vendor fedora -m644 --delete-original	\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
+  --dir $RPM_BUILD_ROOT%_datadir/applications			\
   --add-category X-Fedora					\
-  $RPM_BUILD_ROOT%{_datadir}/applications/xca.desktop
-%endif
+  $RPM_BUILD_ROOT%_datadir/applications/xca.desktop
 
 
 %clean
@@ -73,21 +64,30 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYRIGHT _doc/html
+%doc AUTHORS COPYRIGHT
 %doc debian/changelog
-%{_bindir}/*
+%_bindir/*
+%_mandir/*/*
 %dir %{_datadir}/xca
-%{_datadir}/xca/*.png
-%{_datadir}/pixmaps/*.xpm
-%lang(de) %{_datadir}/xca/xca_de.qm
-%lang(es) %{_datadir}/xca/xca_es.qm
-
-%if 0%{!?_without_desktop:1}
-%{_datadir}/applications/*
-%endif
+%_datadir/xca/*.png
+%_datadir/xca/*.txt
+%_datadir/xca/*.html
+%_datadir/pixmaps/*.xpm
+%lang(de) %_datadir/xca/xca_de.qm
+%lang(es) %_datadir/xca/xca_es.qm
+
+%_datadir/applications/*
 
 
 %changelog
+* Tue Mar  8 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1
+- updated to 0.5.1
+- (re)enabled parallel build
+- applied -langinst patch and other ideas from
+  https://bugzilla.fedora.us/show_bug.cgi?id=2019 (Ville Skyttä)
+- fixed build with gcc4 and db43
+- removed old cruft from the specfile
+
 * Sat Dec 13 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.4.6-0.fdr.1
 - changed compile/install commands to work with the new, yet-another configure system
 - removed libpthread test since it went upstream


--- xca-0.4.6-gcc3.patch DELETED ---


--- cxx_except.h DELETED ---


--- cxx_common.h DELETED ---

More information about the fedora-extras-commits mailing list