Accepting request 76869 from hardware

Updated to 1.30.0, Spec file updates, Modified gammu-smsd.lsb.patch (forwarded request 76855 from adra)

OBS-URL: https://build.opensuse.org/request/show/76869
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gammu?expand=0&rev=27
This commit is contained in:
Sascha Peilicke 2011-07-25 06:59:50 +00:00 committed by Git OBS Bridge
commit 82f818eebd
6 changed files with 107 additions and 66 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f7c3122e5f5e246b3ce7fb128b42c1d679ebb3f11f805ea17f1ba86400e1bbf
size 5982258

3
gammu-1.30.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5918fe10502aef36ab474b4ae44545cd0a7433499b5e29b703ffecb99a7496ae
size 6230340

15
gammu-smsd.lsb.patch Normal file
View File

@ -0,0 +1,15 @@
--- contrib/init/gammu-smsd.lsb.orig 2011-07-19 12:33:00.000000000 +0300
+++ contrib/init/gammu-smsd.lsb 2011-07-23 00:39:21.489000027 +0300
@@ -25,11 +25,10 @@
# Required-Stop: $local_fs $remote_fs
# Should-Start: mysql postgresql $syslog
# Should-Stop: mysql postgresql $syslog
-# Default-Start: 2 3 4 5
+# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Short-Description: Gammu SMS daemon
# Description: Daemon for automatically sending and receiving messages using GSM phone.
-# Author: Michal Čihař <michal@cihar.com>
### END INIT INFO
# Uncommend and adjust following line if you need to set locales in init script:

View File

@ -1,10 +0,0 @@
--- contrib/init/gammu-smsd.lsb.orig 2011-01-19 09:33:05.000000000 +0200
+++ contrib/init/gammu-smsd.lsb 2011-03-07 00:26:06.528931642 +0200
@@ -29,7 +29,6 @@
# Default-Stop: 0 1 6
# Short-Description: Gammu SMS daemon
# Description: Daemon for automatically sending and receiving messages using GSM phone.
-# Author: Michal Čihař <michal@cihar.com>
### END INIT INFO
# Uncommend and adjust following line if you need to set locales in init script:

View File

@ -1,3 +1,61 @@
-------------------------------------------------------------------
Sat Jul 23 19:06:35 UTC 2011 - asterios.dramis@gmail.com
- Updated to 1.30.0:
* Improved SMSD logging of configuration settings.
* Fix possible crash in fbus2 driver.
* Fix possible crash of ODBC driver on Windows (bug #1482).
* Fixed usage of dbi plugins from Python module.
From 1.29.93:
* Properly initialize atobex driver with Sony-Ericsson phones.
* Updated list of country and network codes.
* Escape fields in SQL queries (bug#1415).
* Escape fields in PostgreSQL SQL script (bug#1415).
* Default to GSM encoding for text messages in SQL backend for SMSD.
* Add option to override which SQL dialect to use in SMSD (bug #1427).
* Improved m-obex protocol support, thanks to Vladimir Serbinenko.
* Various fixes for Samsung B2100, thanks to Vladimir Serbinenko.
* Fix check for AT+CPROT support (bug #1438).
* Fix memory leak in s60 protocol driver (bug #1441).
* Reverted change to SignalStrength because of SQL escaping we have now
(bug #1380).
* Improved vCard parser to handle vCards from Gmail.
* Fixed LDIF parser to cope with multiple LDIF in single file.
From 1.29.92:
* Documentation improvements and fixes.
* Saner error handling in Windows serial driver.
* Cleanup in SMSD internals.
* Added ODBC driver to SMSD.
From 1.29.91:
* Added screenshot function for Sony-Ericssonn phones (Márton Németh).
* Fixed parsing of some Nokia SMSes (bug #1402).
* Properly report error on deleting non deletable entries (bug #1396).
* Slower switch from m-obex to AT (bug #1382).
* Faster initialization for AT phones without enabled echo.
From 1.29.90:
* Fix detection of MySQL libraries (bug #1370).
* Changed default connection settings to at and ttyACM0 (bug #1078).
* Add new API call to abort existing operation (bug #1155).
* Change database structure to avoid using reserved word Signal (bug #1380).
* Possibility to limit time of day for SMS in SMSD (bug #1203).
* Enforce limits on SMS payload length.
* Made GSM_SMSCounter public (bug #1356).
* Support for S60 phones using Series60 applet (bug #423).
* Do not fail on 0x7b field in Nokia 3600s phonebook (bug #1385).
* Disabled two stage probing for most protocols.
* Fixed saving of SMS backups (bug #1392).
* Screenshot functionality for DCT4 phones (bug #1390).
- Spec file updates:
* Remove some not needed conditionals for openSUSE BuildRequires:.
* Added unixODBC-devel in BuildRequires:.
* Better fix for rpmlint warning "file-contains-date-and-time".
* Fixed rpmlint warning "doc-file-dependency".
* Compile package with RPM_OPT_FLAGS.
* Fixed locales removal if suse version is not set.
* Minor other updates.
- Modified gammu-smsd.lsb.patch to fix also the "init-script-runlevel-4"
rpmlint warning.
-------------------------------------------------------------------
Fri Mar 18 20:03:02 UTC 2011 - asterios.dramis@gmail.com

View File

@ -18,20 +18,16 @@
Name: gammu
Version: 1.29.0
Version: 1.30.0
Release: 1
Summary: Mobile phone management utility
License: GPLv2
Url: http://wammu.eu/gammu/
%if 0%{?suse_version}
Group: Applications/Communications
%else
Group: Applications/Communications
%endif
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE gammu-smsd.lsb.patch asterios.dramis@gmail.com -- Fix rpmlint warning "unknown-lsb-keyword" for init script
Patch0: gammu-smsd.lsb_unknown-lsb-keyword.patch
Group: Productivity/Telephony/Utilities
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE gammu-smsd.lsb.patch asterios.dramis@gmail.com -- Fix rpmlint warnings "unknown-lsb-keyword" and "init-script-runlevel-4"
Patch0: gammu-smsd.lsb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Python location
@ -50,13 +46,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# SUSE
%if 0%{?suse_version}
%define dist_usb_libs libusb-1_0-devel
%define dist_dbi_libs libdbi-devel libdbi-drivers-dbd-sqlite3 sqlite
# 11.1 changed name of devel package for Bluetooth
%if 0%{?suse_version} >= 1110
%define dist_dbi_libs libdbi-devel libdbi-drivers-dbd-sqlite3 sqlite3
%define dist_bluez_libs bluez-devel
%else
%define dist_bluez_libs bluez-libs >= 2.0
%endif
%define dist_postgres_libs postgresql-devel
%else
# Mandriva
@ -91,7 +82,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define dist_bluez_libs bluez-libs-devel >= 2.0
%define dist_postgres_libs postgresql-devel
%else
#Defaults for not know distributions
#Defaults for not known distributions
%define dist_usb_libs libusb1-devel
%define dist_dbi_libs libdbi-devel libdbi-dbd-sqlite sqlite
%define dist_bluez_libs bluez-libs-devel >= 2.0
@ -118,6 +109,7 @@ BuildRequires: pkg-config
BuildRequires: pkgconfig
%endif
BuildRequires: python-devel
BuildRequires: unixODBC-devel
BuildRequires: %{dist_bluez_libs}
%if 0%{?suse_version} > 1130
BuildRequires: %{dist_dbi_libs}
@ -148,11 +140,7 @@ This package contains Gammu binary as well as some examples.
%package devel
Summary: Development files for Gammu
License: GPLv2
%if 0%{?suse_version}
Group: Development/Libraries
%else
Group: Development/Libraries
%endif
Group: Development/Libraries/C and C++
%if 0%{?suse_version}
Requires: pkg-config
%else
@ -181,11 +169,7 @@ This package contain files needed for development.
%package smsd
Summary: SMS message daemon
License: GPLv2
%if 0%{?suse_version}
Group: Applications/Communications
%else
Group: Applications/Communications
%endif
Group: Hardware/Mobile
%if 0%{?suse_version}
Requires(post): %insserv_prereq %fillup_prereq
Requires(preun): %insserv_prereq %fillup_prereq
@ -219,11 +203,7 @@ into the queue.
%package -n libGammu7
Summary: Mobile phone management library
License: GPLv2
%if 0%{?suse_version}
Group: System/Libraries
%else
Group: System/Libraries
%endif
%description -n libGammu7
Gammu is command line utility and library to work with mobile phones
@ -246,11 +226,7 @@ This package contains Gammu shared library.
%package -n libgsmsd7
Summary: SMS daemon helper library
License: GPLv2
%if 0%{?suse_version}
Group: System/Libraries
%else
Group: System/Libraries
%endif
%description -n libgsmsd7
Gammu is command line utility and library to work with mobile phones
@ -273,11 +249,7 @@ This package contains Gammu SMS daemon shared library.
%package -n python-gammu
Summary: Python module to communicate with mobile phones
License: GPLv2
%if 0%{?suse_version}
Group: Development/Languages
%else
Group: Development/Languages
%endif
Group: Development/Languages/Python
Requires: python >= %{g_python_major_version}
Requires: python < %{g_python_major_version}.99
%if 0%{?suse_version} < 1130
@ -292,14 +264,18 @@ supports - many Nokias, Siemens, Alcatel, ...
%setup -q
%patch0
# Remove build time references - Fix rpmlint warning "file-contains-date-and-time"
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%H:%M')
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%b %e %Y')
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" gammu/gammu.c gammu-detect/main.c libgammu/gsmstate.c smsd/inject.c smsd/monitor.c smsd/main.c
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" gammu/gammu.c gammu-detect/main.c libgammu/gsmstate.c libgammu/phone/dummy/dummy.c smsd/inject.c smsd/monitor.c smsd/main.c
# Change permissions - Fix rpmlint warning "doc-file-dependency"
chmod 644 python/examples/*.py
%build
mkdir build-dir
cd build-dir
mkdir build
cd build
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
cmake ../ \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_PYTHON=/usr/bin/python \
@ -308,24 +284,24 @@ cmake ../ \
-DINSTALL_LIB_DIR=%{_lib} \
-DINSTALL_LIBDATA_DIR=%{_lib} \
-DINSTALL_LSB_INIT=ON
make %{?_smp_mflags}
make %{?_smp_mflags} VERBOSE=1
cd ..
%check
#cd build-dir
#cd build
#ctest -V
#cd ..
%install
%if !0%{?suse_version}
make -C build-dir install DESTDIR=%{buildroot}
make -C build install DESTDIR=%{buildroot}
%else
cd build-dir
cd build
%makeinstall
cd ..
%endif
# Change permissions
# Change permissions - Fix rpmlint warning "non-executable-script"
chmod 755 %{buildroot}%{_sysconfdir}/init.d/gammu-smsd
# rc-symlink for gammu-smsd
@ -336,10 +312,10 @@ ln -sf ../../etc/init.d/gammu-smsd %{buildroot}%{_sbindir}/rcgammu-smsd
install -p -m 0644 docs/config/smsdrc %{buildroot}%{_sysconfdir}/gammu-smsdrc
# Install additional doc files
install -p -m 0644 AUTHORS BUGS README.cs README.en_GB %{buildroot}%{gammu_docdir}/
install -p -m 0644 AUTHORS README.cs README.de README.en_GB README.es README.id README.pt_BR %{buildroot}%{gammu_docdir}/
# Remove unneeded locales
%if 0%{?suse_version} < 1140
%if 0%{?suse_version} && 0%{?suse_version} < 1140
rm -rf %{buildroot}%{_datadir}/locale/sw/
%endif
@ -375,7 +351,6 @@ fi
%endif
%if 0%{?suse_version}
%postun smsd
%restart_on_update gammu-smsd
%insserv_cleanup
@ -394,8 +369,10 @@ fi
%config %{_sysconfdir}/bash_completion.d/gammu
%{_bindir}/gammu
%{_bindir}/gammu-config
%{_bindir}/gammu-detect
%{_bindir}/jadmaker
%doc %{gammu_docdir}
%{_datadir}/gammu/
%doc %{_mandir}/man1/gammu-config.1%{ext_man}
%doc %{_mandir}/man1/gammu-detect.1%{ext_man}
%doc %{_mandir}/man1/gammu.1%{ext_man}
@ -427,6 +404,7 @@ fi
%doc %{_mandir}/man7/gammu-smsd-files.7%{ext_man}
%doc %{_mandir}/man7/gammu-smsd-mysql.7%{ext_man}
%doc %{_mandir}/man7/gammu-smsd-null.7%{ext_man}
%doc %{_mandir}/man7/gammu-smsd-odbc.7%{ext_man}
%doc %{_mandir}/man7/gammu-smsd-pgsql.7%{ext_man}
%doc %{_mandir}/man7/gammu-smsd-run.7%{ext_man}
%doc %{_mandir}/man7/gammu-smsd-sql.7%{ext_man}
@ -434,11 +412,11 @@ fi
%files -n libGammu7 -f libgammu.lang
%defattr(-,root,root,-)
%{_libdir}/libGammu.so.*
%{_libdir}/libGammu.so.7*
%files -n libgsmsd7
%defattr(-,root,root,-)
%{_libdir}/libgsmsd.so.*
%{_libdir}/libgsmsd.so.7*
%files -n python-gammu
%defattr(-,root,root,-)