Marcus Meissner
e5a2cb3b6c
update to 0.9.3 OBS-URL: https://build.opensuse.org/request/show/123966 OBS-URL: https://build.opensuse.org/package/show/security/xca?expand=0&rev=2
128 lines
3.7 KiB
Diff
128 lines
3.7 KiB
Diff
Index: configure
|
|
===================================================================
|
|
--- configure.orig
|
|
+++ configure
|
|
@@ -49,13 +49,16 @@ for dir in $@; do
|
|
done
|
|
|
|
DIRS="$QTDIR $DIRS /usr /usr/X11R6 /usr/local"
|
|
+lib=${lib:=lib}
|
|
+libdir=${libdir:=/usr/lib}
|
|
STDINC="-I/usr/include"
|
|
-STDLIB="-L/usr/lib"
|
|
+STDLIB="-L${libdir}"
|
|
prefix=${prefix:=/usr/local}
|
|
+mandir=${mandir:=${prefix}/man}
|
|
CFLAGS=${CFLAGS:=-Wall -ggdb -O2}
|
|
CC=${CC:=gcc}
|
|
-LDFLAGS=""
|
|
-LIBS="-lstdc++"
|
|
+LDFLAGS=${LDFLAGS:=""}
|
|
+LIBS=${LIBS:=$STDLIB -lstdc++}
|
|
LDIRS=
|
|
MOC=moc
|
|
UIC=uic
|
|
@@ -161,10 +164,10 @@ search_lib() {
|
|
for dir in ${DIRS}; do
|
|
for dbn in $@; do
|
|
for suffix in so dylib obj a; do
|
|
- for lib in lib lib64 lib32 out; do
|
|
- if test -r "${dir}/${lib}/lib${dbn}.${suffix}"; then
|
|
- add_lib "${dir}/${lib}" "${dbn}" "${suffix}"
|
|
- echo "Found: lib${dbn}.${suffix} at ${dir}/${lib}"
|
|
+ for libs in ${lib} out; do
|
|
+ if test -r "${dir}/${libs}/lib${dbn}.${suffix}"; then
|
|
+ add_lib "${dir}/${libs}" "${dbn}" "${suffix}"
|
|
+ echo "Found: lib${dbn}.${suffix} at ${dir}/${libs}"
|
|
return 0
|
|
fi
|
|
done
|
|
@@ -189,7 +192,7 @@ if test "$#" = "0" && test -z "$DARWIN"
|
|
pkg-config QtGui openssl --libs >/dev/null;
|
|
then
|
|
CF="`pkg-config QtGui openssl --cflags`"
|
|
- LIBS="`pkg-config QtGui openssl --libs` -lltdl"
|
|
+ LIBS="${LIBS} `pkg-config QtGui openssl --libs` -lltdl"
|
|
else
|
|
by_hand=true
|
|
fi
|
|
@@ -197,7 +200,7 @@ fi
|
|
if test "$by_hand" = "true"; then
|
|
######################### QT
|
|
if test -z "$DARWIN"; then
|
|
- subdirs="/qt /qt4"
|
|
+ subdirs="/qt /qt4 /qt/QT /qt4/QT"
|
|
search_includes QtCore/QObject || err "The QT Library headerfiles were not found. Set QTDIR appropriately."
|
|
search_lib QtCore4 QtCore || err "The QT Core library was not found."
|
|
search_lib QtGui4 QtGui || err "The QT Gui library was not found."
|
|
@@ -282,16 +285,12 @@ else
|
|
fi
|
|
|
|
|
|
-if which linuxdoc 2>&1; then
|
|
- LINUXDOC="linuxdoc"
|
|
+if which sgml2html 2>&1; then
|
|
+ SGML2HTML="sgml2html"
|
|
else
|
|
- echo "Application 'linuxdoc' not found."
|
|
- if tar ztf ${TOPDIR}/doc/xca-doc.tgz xca.html >/dev/null 2>&1; then
|
|
- echo "But Found a valid documentation package 'doc/xca-doc.tgz'"
|
|
- else
|
|
+ echo "Application 'sgml2html' not found."
|
|
echo "No documentation will be generated."
|
|
- fi
|
|
- LINUXDOC=":"
|
|
+ SGML2HTML=":"
|
|
fi
|
|
|
|
findapp() {
|
|
@@ -341,12 +340,15 @@ LD=${LD:=ld}
|
|
STRIP=${STRIP:=strip}
|
|
WINDRES=${WINDRES:=windres}
|
|
MAKENSIS=${MAKENSIS:=makensis.exe}
|
|
-LINUXDOC=${LINUXDOC:=linuxdoc}
|
|
+SGML2HTML=${SGML2HTML:=sgml2html}
|
|
|
|
SUFFIX=${SUFFIX}
|
|
HOST=linux
|
|
prefix=${prefix}
|
|
docdir=${docdir}
|
|
+lib=${lib}
|
|
+libdir=${libdir}
|
|
+mandir=${mandir}
|
|
|
|
EOF
|
|
test -z "$etc" && etc=/etc/xca
|
|
Index: doc/Makefile
|
|
===================================================================
|
|
--- doc/Makefile.orig
|
|
+++ doc/Makefile
|
|
@@ -8,8 +8,6 @@ DELFILES=xca*.html xca.1.gz
|
|
doc: xca.1.gz xca.html
|
|
include $(TOPDIR)/Rules.mak
|
|
|
|
-mandir=man
|
|
-
|
|
xca.1.gz: xca.1
|
|
gzip -9 <$^ >$@
|
|
|
|
@@ -18,13 +16,13 @@ xca.html: xca.sgml
|
|
echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' > $@
|
|
test ! -f xca-doc.tgz || tar zxf xca-doc.tgz
|
|
@$(PRINT) " DOC [$(BASENAME)] $@"
|
|
- $(LINUXDOC) -B html $< >/dev/null
|
|
+ $(SGML2HTML) -s 1 $< >/dev/null
|
|
|
|
install: xca.1.gz xca.html
|
|
- install -m 755 -d $(destdir)$(docdir) \
|
|
- $(destdir)$(prefix)/$(mandir)/man1
|
|
- install -m 644 xca*.html $(destdir)$(docdir)
|
|
- install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
|
|
+ install -m 755 -d $(destdir)$(prefix)/share/xca \
|
|
+ $(destdir)/$(mandir)/man1
|
|
+ install -m 644 xca*.html $(destdir)$(prefix)/share/xca
|
|
+ install -m 644 xca.1.gz $(destdir)/$(mandir)/man1
|
|
|
|
app: xca.html
|
|
mkdir -p $(APPDIR)/Resources
|