Hello community,
here is the log from the commit of package capi4hylafax for openSUSE:Factory checked in at 2014-12-16 14:49:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/capi4hylafax (Old)
and /work/SRC/openSUSE:Factory/.capi4hylafax.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "capi4hylafax"
Changes:
--------
--- /work/SRC/openSUSE:Factory/capi4hylafax/capi4hylafax.changes 2013-10-30 15:25:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.capi4hylafax.new/capi4hylafax.changes 2014-12-16 14:49:40.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Dec 8 23:23:46 UTC 2014 - jengelh@inai.de
+
+- Use source URL, use rpm macros.
+
+-------------------------------------------------------------------
+Mon Nov 17 15:01:00 UTC 2014 - Led
+
+- Add capi4hylafax-01.03.00-fix-bashisms.patch to fix bashisms in
+ setupconffile (faxaddmodem.capi_dia) script
+
+-------------------------------------------------------------------
Old:
----
capi4hylafax-01.03.00.tar.bz2
New:
----
capi4hylafax-01.03.00-fix-bashisms.patch
capi4hylafax-01.03.00.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ capi4hylafax.spec ++++++
--- /var/tmp/diff_new_pack.9Ce6Af/_old 2014-12-16 14:49:42.000000000 +0100
+++ /var/tmp/diff_new_pack.9Ce6Af/_new 2014-12-16 14:49:42.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package capi4hylafax
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,21 @@
Name: capi4hylafax
+Version: 01.03.00
+Release: 0
+Summary: Adds a faxcapi modem for hylafax
+License: GPL-2.0+
+Group: Hardware/Fax
+Url: http://www.avm.de
+
+Source: ftp://ftp.avm.de/tools/capi4hylafax.linux/%name-%version.tar.gz
+Patch0: capi4hylafax-suse.diff
+Patch1: capi4hylafax-secfix.diff
+Patch2: capi4hylafax-secfix2.diff
+Patch3: capi4hylafax-configure.diff
+Patch4: capi4hylafax-gcc48.diff
+Patch5: capi4hylafax-01.03.00-fix-bashisms.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: capi4linux
BuildRequires: capi4linux-devel
BuildRequires: gcc-c++
@@ -30,22 +45,7 @@
Requires: hylafax-client
Requires: smtp_daemon
Requires: tiff
-Version: 01.03.00
-Release: 0
-Source: %{name}-%{version}.tar.bz2
-Patch0: capi4hylafax-suse.diff
-Patch1: capi4hylafax-secfix.diff
-Patch2: capi4hylafax-secfix2.diff
-Patch3: capi4hylafax-configure.diff
-Patch4: capi4hylafax-gcc48.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Summary: Adds a faxcapi modem for hylafax
-License: GPL-2.0+
-Group: Hardware/Fax
Requires(pre): sh-utils fileutils /usr/sbin/useradd /usr/sbin/usermod
-Url: http://www.avm.de
-Summary: Adds a faxcapi modem for hylafax
-Group: Hardware/Fax
%description
capi4hylafax adds a faxcapi modem to the hylafax environment. It allows
@@ -53,13 +53,14 @@
a hylafax server.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3
%patch4 -p1
-find ../ -name .cvsignore -exec rm {} \;
+%patch5 -p1
+find ../ -name .cvsignore -delete
%build
%configure \
@@ -68,26 +69,26 @@
make %{?_smp_mflags}
%install
-install -d ${RPM_BUILD_ROOT}/var/spool/fax
-install -d ${RPM_BUILD_ROOT}/usr/lib
-install -d ${RPM_BUILD_ROOT}/usr/%_lib
-install -d ${RPM_BUILD_ROOT}/usr/sbin
-install -d ${RPM_BUILD_ROOT}/etc
-make install BIN=${RPM_BUILD_ROOT}/usr/bin \
- SPOOL=${RPM_BUILD_ROOT}/var/spool/fax \
- LIBEXEC=${RPM_BUILD_ROOT}/usr/lib/fax \
- SBIN=${RPM_BUILD_ROOT}/usr/sbin \
- LIBDIR=${RPM_BUILD_ROOT}/usr/%_lib \
- DESTDIR=${RPM_BUILD_ROOT}
-install -m755 faxaddmodem.capi ${RPM_BUILD_ROOT}/usr/sbin/
-install -m755 setupconffile ${RPM_BUILD_ROOT}/usr/sbin/faxaddmodem.capi_dia
-cp -p config.faxCAPI ${RPM_BUILD_ROOT}/etc/config.faxCAPI.sample
-mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/capi4hylafax
+install -d "%buildroot/var/spool/fax"
+install -d "%buildroot/usr/lib"
+install -d "%buildroot/%_libdir"
+install -d "%buildroot/%_sbindir"
+install -d "%buildroot/%_sysconfdir"
+make install BIN="%buildroot/%_bindir" \
+ SPOOL="%buildroot/var/spool/fax" \
+ LIBEXEC="%buildroot/usr/lib/fax" \
+ SBIN="%buildroot/%_sbindir" \
+ LIBDIR="%buildroot/%_libdir" \
+ DESTDIR="%buildroot"
+install -m755 faxaddmodem.capi "%buildroot/%_sbindir/"
+install -m755 setupconffile "%buildroot/%_sbindir/faxaddmodem.capi_dia"
+cp -p config.faxCAPI "%buildroot/%_sysconfdir/config.faxCAPI.sample"
+mkdir -p "%buildroot/%_defaultdocdir/capi4hylafax"
cp -p AUTHORS LIESMICH.html README.html fritz_pic.tif COPYING Readme_src \
LIESMICH.SuSE README.SuSE \
ChangeLog sample_AVMC4_config.faxCAPI sample_faxrcvd \
config.faxCAPI \
- ${RPM_BUILD_ROOT}%{_defaultdocdir}/capi4hylafax
+ "%buildroot/%_defaultdocdir/capi4hylafax"
%pre
/usr/sbin/useradd -r -o -g uucp -u 33 -s /bin/bash -c "Facsimile agent" -d /var/spool/fax fax 2> /dev/null || :
@@ -133,10 +134,10 @@
%files
%defattr(-, root, root)
%doc %{_defaultdocdir}/capi4hylafax
-/usr/bin/c2faxrecv
-/usr/bin/c2faxsend
-/usr/sbin/faxaddmodem.capi
-/usr/sbin/faxaddmodem.capi_dia
-/etc/config.faxCAPI.sample
+%_bindir/c2faxrecv
+%_bindir/c2faxsend
+%_sbindir/faxaddmodem.capi
+%_sbindir/faxaddmodem.capi_dia
+%_sysconfdir/config.faxCAPI.sample
%changelog
++++++ capi4hylafax-01.03.00-fix-bashisms.patch ++++++
---
setupconffile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: capi4hylafax-01.03.00/setupconffile
===================================================================
--- capi4hylafax-01.03.00.orig/setupconffile
+++ capi4hylafax-01.03.00/setupconffile
@@ -30,7 +30,7 @@ fi
# functions
#
-function test_for_number {
+test_for_number() {
numlen=`expr "$1" : "[0-9]\+"`
strlen=`expr length "$1"`
if [ 0$numlen -ne 0$strlen ]; then
@@ -59,7 +59,7 @@ function ReadConfigFile {
done < $1
}
-function WriteToConfigFile {
+WriteToConfigFile() {
sed "
/^ *FAXNumber *:/c\\
FAXNumber: $FaxNumber
@@ -86,12 +86,12 @@ sed "
mv -f "$ConfigFileName.c2fax" "$ConfigFileName"
}
-function rem_res {
+rem_res() {
rm -f res
}
-function main_config_dialog {
+main_config_dialog() {
#
# test for dialog
#
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
