Hello community, here is the log from the commit of package gammu for openSUSE:Factory checked in at 2012-08-12 15:24:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gammu (Old) and /work/SRC/openSUSE:Factory/.gammu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gammu", Maintainer is "prus...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gammu/gammu.changes 2011-12-25 17:51:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gammu.new/gammu.changes 2012-08-12 15:24:54.000000000 +0200 @@ -1,0 +2,32 @@ +Fri Aug 10 09:27:19 UTC 2012 - idon...@suse.com + +- Remove GPL-3.0 licensed files ( bnc#775397 ) + +------------------------------------------------------------------- +Tue Jul 31 12:25:03 UTC 2012 - asterios.dra...@gmail.com + +- Updated to 1.32.0: + * Fixed auto installation of EventLog registry. + * Improved support for Arduino GPRS shield (bug #1592). + * Fixed communication with Cross PD1101wi (bug #1617). + * Ignore another unknown block in Nokia phonebook (bug #1614). + * Do not encode number when setting up diverts. + From 1.31.90: + * Improved compatibility with ES75 (bug #1586). + * Changed API for call diverts. + * Added support for call diverts in Python API. + * AT backend supports manipulating with call diverts. + * Added support for suspending/resuming SMSD using SIGUSR1/2. + * Changed protocol for S60 applet. + * S60 applet now handles SMS with new lines. + * Improved support for Windows Event Log. +- Added xz as build requirement for openSUSE <= 12.1 (needed to unpack the + package sources). +- Don't install the init script "gammu-smsd" (doesn't work correctly out of the + box). Instead install it in the documentation. +- Build the package manual (html) for openSUSE > 11.4 (fails for <= 11.4 due to + python-sphinx). Added gnu-free-fonts, graphviz, graphviz-gd and python-Sphinx + build requirements for this. Added it in a separate subpackage (gammu-doc) to + fix rpmlint warning "package-with-huge-docs". + +------------------------------------------------------------------- Old: ---- gammu-1.31.0.tar.bz2 New: ---- gammu-1.32.0.tar.xz gammu-remove-gplv3-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gammu.spec ++++++ --- /var/tmp/diff_new_pack.E1f8TQ/_old 2012-08-12 15:25:00.000000000 +0200 +++ /var/tmp/diff_new_pack.E1f8TQ/_new 2012-08-12 15:25:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gammu # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,16 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gammu -Version: 1.31.0 +Version: 1.32.0 Release: 0 Summary: Mobile phone management utility License: GPL-2.0 Group: Productivity/Telephony/Utilities Url: http://wammu.eu/gammu/ -Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE gammu-smsd.lsb.patch asterios.dra...@gmail.com -- Fix rpmlint warnings "unknown-lsb-keyword" and "init-script-runlevel-4" Patch0: gammu-smsd.lsb.patch +# PATCH-FIX-OPENSUSE gammu-remove-gplv3-files.patch idoen...@suse.de -- Remove GPLv3 files bnc#775397 +Patch1: gammu-remove-gplv3-files.patch # Python location %{!?__python: %define __python python} %define g_python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") @@ -84,6 +87,17 @@ BuildRequires: doxygen BuildRequires: gettext BuildRequires: glib2-devel +%if 0%{?suse_version} > 1210 +BuildRequires: gnu-free-fonts +%else +%if 0%{?suse_version} == 1210 +BuildRequires: freefont +%endif +%endif +%if 0%{?suse_version} > 1140 +BuildRequires: graphviz +BuildRequires: graphviz-gd +%endif %if 0%{?centos_version} || 0%{?rhel_version} || 0%{?rhel} BuildRequires: curl-devel %else @@ -109,9 +123,15 @@ %else BuildRequires: pkgconfig %endif +BuildRequires: %{dist_bluez_libs} +%if 0%{?suse_version} > 1140 +BuildRequires: python-Sphinx +%endif BuildRequires: python-devel BuildRequires: unixODBC-devel -BuildRequires: %{dist_bluez_libs} +%if 0%{?suse_version} && 0%{?suse_version} <= 1210 +BuildRequires: xz +%endif %if 0%{?suse_version} > 1130 || 0%{?mandriva_version} > 2010 || 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} BuildRequires: %{dist_dbi_libs} %endif @@ -119,6 +139,7 @@ BuildRequires: %{dist_usb_libs} Requires: bluez Requires: dialog +Recommends: gammu-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -167,19 +188,19 @@ This package contain files needed for development. +%if 0%{?suse_version} > 1140 +%package doc +Summary: Documentation of Gammu +Group: Documentation/HTML +BuildArch: noarch + +%description doc +This package contains the manual for gammu. +%endif + %package smsd Summary: SMS message daemon Group: Hardware/Mobile -%if 0%{?suse_version} -Requires(post): %insserv_prereq %fillup_prereq -Requires(preun): %insserv_prereq %fillup_prereq -Requires(postun): %insserv_prereq %fillup_prereq -%endif -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -%endif %description smsd Gammu is command line utility and library to work with mobile phones @@ -247,8 +268,8 @@ %package -n python-gammu Summary: Python module to communicate with mobile phones Group: Development/Languages/Python -Requires: python >= %{g_python_major_version} Requires: python < %{g_python_major_version}.99 +Requires: python >= %{g_python_major_version} %{?py_requires} %description -n python-gammu @@ -258,6 +279,8 @@ %prep %setup -q %patch0 +%patch1 -p1 + # 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') @@ -265,6 +288,12 @@ 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 +chmod 644 contrib/init/gammu-smsd.lsb + +# GPL-3.0 licensed files, bnc#775397 +rm -rf contrib/sms-gammu2android +rm -rf contrib/smscgi +rm -rf helper/win32-* %build mkdir build @@ -278,8 +307,12 @@ -DINSTALL_DOC_DIR=%{gammu_docdir} \ -DINSTALL_LIB_DIR=%{_lib} \ -DINSTALL_LIBDATA_DIR=%{_lib} \ - -DINSTALL_LSB_INIT=ON + -DINSTALL_LSB_INIT=OFF \ + -DINSTALL_UDEV_RULES=OFF make %{?_smp_mflags} VERBOSE=1 +%if 0%{?suse_version} > 1140 +make manual-html +%endif cd .. %check @@ -296,19 +329,19 @@ cd .. %endif -# Change permissions - Fix rpmlint warning "non-executable-script" -chmod 755 %{buildroot}%{_sysconfdir}/init.d/gammu-smsd - -# rc-symlink for gammu-smsd -mkdir -p %{buildroot}%{_sbindir} -ln -sf ../../etc/init.d/gammu-smsd %{buildroot}%{_sbindir}/rcgammu-smsd - # Install config file install -pm 0644 docs/config/smsdrc %{buildroot}%{_sysconfdir}/gammu-smsdrc # Install additional doc files install -pm 0644 AUTHORS README.cs README.da README.de README.en_GB README.es README.id README.pl README.pt_BR %{buildroot}%{gammu_docdir}/ +%if 0%{?suse_version} > 1140 +# Install the html manual +rm -rf %{buildroot}%{gammu_docdir}/manual/ +rm -rf build/docs/manual/html/{.doctrees/,.buildinfo,_sources/} +cp -a build/docs/manual/html/ %{buildroot}%{gammu_docdir}/manual +%endif + # Remove unneeded locales %if 0%{?suse_version} && 0%{?suse_version} < 1140 rm -rf %{buildroot}%{_datadir}/locale/sw/ @@ -317,38 +350,6 @@ %find_lang %{name} %find_lang libgammu -%post smsd -%if 0%{?mandriva_version} -%_post_service gammu-smsd -%endif -%if 0%{?suse_version} -%fillup_and_insserv gammu-smsd -%endif -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -/sbin/chkconfig --add gammu-smsd -%endif - -%preun smsd -%if 0%{?suse_version} -%stop_on_removal gammu-smsd -%endif -%if 0%{?mandriva_version} -%_preun_service gammu-smsd -%endif -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -if [ $1 = 0 ] ; then - /sbin/service gammu-smsd stop >/dev/null 2>&1 - /sbin/chkconfig --del <script> -fi -%endif - -%if 0%{?suse_version} - -%postun smsd -%restart_on_update gammu-smsd -%insserv_cleanup -%endif - %post -n libGammu7 -p /sbin/ldconfig %postun -n libGammu7 -p /sbin/ldconfig @@ -365,6 +366,9 @@ %{_bindir}/gammu-detect %{_bindir}/jadmaker %doc %{gammu_docdir} +%if 0%{?suse_version} > 1140 +%exclude %{gammu_docdir}/manual/ +%endif %{_datadir}/gammu/ %doc %{_mandir}/man1/gammu-config.1* %doc %{_mandir}/man1/gammu-detect.1* @@ -381,14 +385,19 @@ %{_libdir}/pkgconfig/gammu-smsd.pc %{_libdir}/pkgconfig/gammu.pc +%if 0%{?suse_version} > 1140 +%files doc +%defattr(-,root,root,-) +%doc %{gammu_docdir}/manual/ +%endif + %files smsd %defattr(-,root,root,-) +%doc contrib/init/gammu-smsd.lsb %config %{_sysconfdir}/gammu-smsdrc -%config %{_sysconfdir}/init.d/gammu-smsd %{_bindir}/gammu-smsd %{_bindir}/gammu-smsd-inject %{_bindir}/gammu-smsd-monitor -%{_sbindir}/rcgammu-smsd %doc %{_mandir}/man1/gammu-smsd-inject.1* %doc %{_mandir}/man1/gammu-smsd-monitor.1* %doc %{_mandir}/man1/gammu-smsd.1* ++++++ gammu-remove-gplv3-files.patch ++++++ Index: gammu-1.32.0/contrib/CMakeLists.txt =================================================================== --- gammu-1.32.0.orig/contrib/CMakeLists.txt +++ gammu-1.32.0/contrib/CMakeLists.txt @@ -113,6 +113,5 @@ endif (INSTALL_UDEV_RULES) # Build some examples # We do not install them intentionally, just check whether they still compile -add_subdirectory(smscgi) add_subdirectory(convert) add_subdirectory(sqlreply) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
