[gammu] - Add BuildRequires glib2-devel libgudev1-devel - Change mysql to mariadb. - Thu Sep 29 2011 Karel V

Sérgio Monteiro Basto sergiomb at fedoraproject.org
Sun Sep 1 01:12:50 UTC 2013


commit 1b0c048df79c36b05c8f05317d7840f57db22723
Author: Sérgio Basto <sergio at serjux.com>
Date:   Sun Sep 1 02:12:26 2013 +0100

    - Add BuildRequires glib2-devel libgudev1-devel
    - Change mysql to mariadb.
    - Thu Sep 29 2011 Karel Volny <kvolny at redhat.com>
      - Update release.
      - Patch gammu-1.26.1-exec.patch no longer needed.
      - Some docs are no longer present.

 .gitignore |    1 +
 gammu.spec |   54 ++++++++++++++++++++++++++++++------------------------
 sources    |    2 +-
 3 files changed, 32 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd60be0..a18781d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gammu-1.25.92.tar.bz2
+/gammu-1.30.0.tar.bz2
diff --git a/gammu.spec b/gammu.spec
index 2890e84..887c055 100644
--- a/gammu.spec
+++ b/gammu.spec
@@ -1,15 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gammu
-Version:        1.26.1
-Release:        11%{?dist}
+Version:        1.30.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
-Patch0:         %{name}-1.26.1-exec.patch
 
 BuildRequires:	autoconf, gettext, cmake
 %ifnarch s390 s390x
@@ -20,7 +19,8 @@ BuildRequires:  libdbi-devel, libcurl-devel
 # Enabling bluetooth fonction
 BuildRequires:	bluez-libs-devel
 # Enabling Database sms fonction
-BuildRequires:	postgresql-devel, mysql-devel
+BuildRequires:	postgresql-devel, mariadb-devel
+BuildRequires:	glib2-devel libgudev1-devel
 
 Requires:       bluez, dialog
 
@@ -69,11 +69,8 @@ The %{name}-devel  package contains Header and libraries files for
 developing applications that use %{name}
 
 
-
-
 %prep
 %setup -q
-%patch0 -p1 -b .exec
 
 #sed -i 's|${INSTALL_LIB_DIR}|%{_libdir}|' CMakeLists.txt libgammu/CMakeLists.txt \
 #				smsd/CMakeLists.txt gammu/CMakeLists.txt
@@ -94,13 +91,13 @@ pushd build
 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
-done
+##fix lines ending 
+#for docs in \
+#	docs/develop/{protocol/'*',sounds/*,sms/'*'}	\
+#	docs/develop/{*.htm,*.txt}			\
+#	docs/user/*.* ; do
+#	sed -e 's/\r//' -i $docs
+#done
 
 
 %install
@@ -110,11 +107,11 @@ make -C build  install DESTDIR=$RPM_BUILD_ROOT
 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}/*.* .
+#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}
@@ -129,16 +126,17 @@ cat lib%{name}.lang >> %{name}.lang
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog README docs/* BUGS SUPPORTERS *.html *.txt
+%doc COPYING ChangeLog README docs/* *.txt
 %{_bindir}/%{name}*
 %{_bindir}/jadmaker
 %{_mandir}/man1/*.gz
 %{_mandir}/man5/*.gz
 %{_mandir}/man7/*.gz
-%{_mandir}/cs/man1/*.gz
-%{_mandir}/cs/man5/*.gz
-%{_mandir}/cs/man7/*.gz
+#%{_mandir}/cs/man1/*.gz
+#%{_mandir}/cs/man5/*.gz
+#%{_mandir}/cs/man7/*.gz
 %config %{_sysconfdir}/bash_completion.d/%{name}
+%{_datadir}/%{name}
 
 %files		libs
 %defattr(-,root,root,-)
@@ -150,13 +148,21 @@ cat lib%{name}.lang >> %{name}.lang
 
 %files		devel
 %defattr(-,root,root,-)
-%doc devel_docs/*
+#doc devel_docs/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/%{name}
 
 
 %changelog
+* 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.
+- Thu Sep 29 2011 Karel Volny <kvolny at redhat.com>
+  - Update release.
+  - Patch gammu-1.26.1-exec.patch no longer needed.
+  - Some docs are no longer present.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 849b0f2..a054613 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba8caab6b21a2ce0fa668f9403b8319a  gammu-1.26.1.tar.bz2
+5bb061f1299e7ae8d38ecac1b8b11465  gammu-1.30.0.tar.bz2


More information about the scm-commits mailing list