[gammu] - Update to lastest release. - Pack all docs. - fixed W: mixed-use-of-spaces-and-tabs with vim :reta

Sérgio Monteiro Basto sergiomb at fedoraproject.org
Sun Sep 8 02:18:20 UTC 2013


commit 3d31d07eea5b317575438ed4c498c9dc1eb7bc81
Author: Sérgio Basto <sergio at serjux.com>
Date:   Sun Sep 8 03:17:58 2013 +0100

    - Update to lastest release.
    - Pack all docs.
    - fixed W: mixed-use-of-spaces-and-tabs with vim :retab

 .gitignore              |    1 +
 gammu-1.26.1-exec.patch |   29 -------------
 gammu.spec              |  105 ++++++++++++++++++++++++-----------------------
 sources                 |    2 +-
 4 files changed, 55 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a18781d..fdc023c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gammu-1.25.92.tar.bz2
 /gammu-1.30.0.tar.bz2
+/gammu-1.33.0.tar.bz2
diff --git a/gammu.spec b/gammu.spec
index 887c055..993cad0 100644
--- a/gammu.spec
+++ b/gammu.spec
@@ -1,50 +1,50 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Name:		gammu
-Version:        1.30.0
+Name:       gammu
+Version:        1.33.0
 Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System
 License:        GPLv2+
-URL:            http://cihar.com/gammu/
-Source0:        ftp://dl.cihar.com/gammu/releases/%{name}-%{version}.tar.bz2
+URL:            http://wammu.eu/gammu/
+Source0:        http://sourceforge.net/projects/gammu/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
 
-BuildRequires:	autoconf, gettext, cmake
+BuildRequires:  autoconf, gettext, cmake
 %ifnarch s390 s390x
-BuildRequires:	libusb1-devel
+BuildRequires:  libusb1-devel
 %endif
-BuildRequires:	doxygen
+BuildRequires:  doxygen
 BuildRequires:  libdbi-devel, libcurl-devel
 # Enabling bluetooth fonction
-BuildRequires:	bluez-libs-devel
+BuildRequires:  bluez-libs-devel
 # Enabling Database sms fonction
-BuildRequires:	postgresql-devel, mariadb-devel
-BuildRequires:	glib2-devel libgudev1-devel
+BuildRequires:  postgresql-devel, mariadb-devel
+BuildRequires:  glib2-devel libgudev1-devel
 
 Requires:       bluez, dialog
 
 
-%package	libs
-Summary:	Libraries files for %{name}
-Group:		System Environment/Libraries
+%package    libs
+Summary:    Libraries files for %{name}
+Group:      System Environment/Libraries
 
 %package -n     python-%{name}
-Summary:	Python bindings for Gammu
-Group:		Development/Languages
+Summary:    Python bindings for Gammu
+Group:      Development/Languages
 
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 Obsoletes:      python-%{name} <= 0.28
 
 Requires:       %{name} = %{version}-%{release}
 
-%package	devel
-Summary:	Development files for %{name}	
-Group:		Development/Libraries
+%package    devel
+Summary:    Development files for %{name}   
+Group:      Development/Libraries
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	pkgconfig
+Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-libs = %{version}-%{release}
+Requires:   pkgconfig
 
 %description
 Gammu is command line utility and library to work with mobile phones
@@ -55,16 +55,17 @@ messages (SMS, EMS and MMS), calendar, todos, filesystem,
 integrated radio, camera, etc.
 It also supports daemon mode to send and receive SMSes.
 
-%description	libs
+%description    libs
 The %{name}-libs package contains libraries files that used by %{name}
 
 %description -n python-%{name}
 Python bindings for Gammu library.
 It currently does not support all Gammu features,
 but range of covered functions is increasing,
-if you need some specific, feel free to use bug tracking system for feature requests.
+if you need some specific, feel free to use bug tracking system for feature 
+requests.
 
-%description	devel
+%description    devel
 The %{name}-devel  package contains Header and libraries files for
 developing applications that use %{name}
 
@@ -73,30 +74,30 @@ developing applications that use %{name}
 %setup -q
 
 #sed -i 's|${INSTALL_LIB_DIR}|%{_libdir}|' CMakeLists.txt libgammu/CMakeLists.txt \
-#				smsd/CMakeLists.txt gammu/CMakeLists.txt
+#                              smsd/CMakeLists.txt gammu/CMakeLists.txt
 
 # These flags make the compilation fail on F-14. We remove them for now to finish
 # python-2.7 rebuilds. Maintainer, please fix.
-sed -i -e '/-Werror/d' CMakeLists.txt
+#sed -i -e '/-Werror/d' CMakeLists.txt
 
 %build
 mkdir build
 pushd build
-%cmake					\
-	-DENABLE_BACKUP=ON		\
-	-DWITH_NOKIA_SUPPORT=ON		\
-	-DWITH_Bluez=ON			\
-	-DWITH_IrDA=On			\
-	../
+%cmake                  \
+    -DENABLE_BACKUP=ON      \
+    -DWITH_NOKIA_SUPPORT=ON     \
+    -DWITH_Bluez=ON         \
+    -DWITH_IrDA=On          \
+    ../
 make
 popd
 
 ##fix lines ending 
 #for docs in \
-#	docs/develop/{protocol/'*',sounds/*,sms/'*'}	\
-#	docs/develop/{*.htm,*.txt}			\
-#	docs/user/*.* ; do
-#	sed -e 's/\r//' -i $docs
+#   docs/develop/{protocol/'*',sounds/*,sms/'*'}    \
+#   docs/develop/{*.htm,*.txt}          \
+#   docs/user/*.* ; do
+#   sed -e 's/\r//' -i $docs
 #done
 
 
@@ -106,14 +107,6 @@ make -C build  install DESTDIR=$RPM_BUILD_ROOT
 #remove library
 rm -f $RPM_BUILD_ROOT%{_libdir}/libGammu.a
 
-#Improve installed documentations directories
-#mkdir devel_docs
-#mkdir -p docs/symbian
-#cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/devel/* devel_docs
-#cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/symbian/* docs/symbian
-#cp -p $RPM_BUILD_ROOT%{_docdir}/%{name}/*.* .
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
-
 %find_lang %{name}
 %find_lang lib%{name}
 cat lib%{name}.lang >> %{name}.lang
@@ -126,7 +119,10 @@ cat lib%{name}.lang >> %{name}.lang
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog README docs/* *.txt
+%doc %{_docdir}/%{name}/README 
+%doc %{_docdir}/%{name}/ChangeLog 
+%doc %{_docdir}/%{name}/COPYING
+%doc %{_docdir}/%{name}/examples
 %{_bindir}/%{name}*
 %{_bindir}/jadmaker
 %{_mandir}/man1/*.gz
@@ -138,7 +134,7 @@ cat lib%{name}.lang >> %{name}.lang
 %config %{_sysconfdir}/bash_completion.d/%{name}
 %{_datadir}/%{name}
 
-%files		libs
+%files      libs
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
@@ -146,15 +142,20 @@ cat lib%{name}.lang >> %{name}.lang
 %defattr(-,root,root,-)
 %{python_sitearch}/%{name}
 
-%files		devel
+%files      devel
 %defattr(-,root,root,-)
-#doc devel_docs/*
+%doc %{_docdir}/%{name}/manual
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/%{name}
 
 
 %changelog
+* Sat Sep 07 2013 Sérgio Basto <sergio at serjux.com> - 1.33.0-1
+- Update to lastest release. 
+- Pack all docs.
+- fixed W: mixed-use-of-spaces-and-tabs with vim :retab 
+
 * Sat Aug 31 2013 Sérgio Basto <sergio at serjux.com> - 1.30.0-1
 - Add BuildRequires glib2-devel libgudev1-devel  
 - Change mysql to mariadb.
@@ -249,13 +250,13 @@ cat lib%{name}.lang >> %{name}.lang
 * Mon Aug 25 2008 Xavier Lamien <lxtnow[at]gmail.com> - 1.20.90-1
 - Update release.
 
-* Mon Aug 23 2008 Xavier Lamien <lxntow[at]gmail.com> - 1.20.0-1
+* Mon Aug 25 2008 Xavier Lamien <lxntow[at]gmail.com> - 1.20.0-1
 - Update release.
 
 * Mon Jun 02 2008 Xavier Lamien <lxtnow[at]gmail.com> - 1.19.0-2
 - Added Require dialog.
 
-* Thu Apr 15 2008 Xavier Lamien <lxtnow[at]gmail.com> - 1.19.0-1
+* Thu Apr 17 2008 Xavier Lamien <lxtnow[at]gmail.com> - 1.19.0-1
 - Updated Release.
 
 * Fri Feb 29 2008 Xavier Lamien <lxtnow[at]gmail.com> - 1.18.91-1
@@ -274,7 +275,7 @@ cat lib%{name}.lang >> %{name}.lang
 * Fri Oct 12 2007 Xavier Lamien < lxtnow[at]gmail.com > - 1.13.0-1
 - Updated Release.
 
-* Wed Aug 02 2007 Xavier Lamien < lxtnow[at]gmail.com > - 1.12.92-1
+* Wed Aug 01 2007 Xavier Lamien < lxtnow[at]gmail.com > - 1.12.92-1
 - Updated Release.
 
 * Wed Jul 25 2007 Xavier Lamien < lxtnow[at]gmail.com > - 1.12.91-1
diff --git a/sources b/sources
index a054613..2927549 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bb061f1299e7ae8d38ecac1b8b11465  gammu-1.30.0.tar.bz2
+3f46afcc16829175d2d9060ac15813e8  gammu-1.33.0.tar.bz2


More information about the scm-commits mailing list