rpms/gammu/FC-5 gammu.spec,1.2,1.3

[Xavier LAMIEN (laxathom)]

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6323/FC-5

Modified Files:
	gammu.spec 
Log Message:

Updated source.



Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/FC-5/gammu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gammu.spec	25 May 2007 22:51:24 -0000	1.2
+++ gammu.spec	12 Oct 2007 19:59:09 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		gammu
-Version:        1.11.0
+Version:        1.13.0
 Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
@@ -9,7 +9,7 @@
 Source0:        ftp://dl.cihar.com/gammu/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	autoconf, gettext
+BuildRequires:	autoconf, gettext, cmake
 #enabling bluetooth fonction
 BuildRequires:	bluez-libs-devel
 #enabling mysql sms fonction
@@ -24,8 +24,9 @@
 Summary:	Development files for %{name}	
 Group:		Development/Libraries
 
-Requires:	%{name} = %{version}
-Requires:	%{name}-libs = %{version}
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	pkgconfig
 
 %description
 Gammu is command line utility and library to work with mobile phones
@@ -48,8 +49,17 @@
 
 
 %build
-%configure --libdir=%{_libdir}
-make shared %{?_smp_mflags}
+mkdir build
+pushd build
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix}	\
+	-DENABLE_SHARED=ON		\
+	-DENABLE_BACKUP=ON		\
+	-DWITH_NOKIA_SUPPORT=ON		\
+	-DWITH_Bluez=ON			\
+	-DWITH_IrDA=On			\
+	../
+make
+popd
 
 #fix lines ending 
 for docs in \
@@ -59,11 +69,14 @@
 	sed -e 's/\r//' -i $docs
 done
 
+#fix libdir
+sed -i 's|${CMAKE_INSTALL_PREFIX}/lib|%{_libdir}|g' build/{cmake_install.cmake,common/cmake_install.cmake}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make installshared DESTDIR=$RPM_BUILD_ROOT
 
+make -C build  install DESTDIR=$RPM_BUILD_ROOT
+ 
 #remove library
 rm -f $RPM_BUILD_ROOT%{_libdir}/libGammu.a
 
@@ -84,8 +97,9 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README docs/*
-%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1.gz
+%{_bindir}/%{name}*
+%{_mandir}/man1/*.1.gz
+#%config %{_sysconfdir}/bash_completion.d/%{name}
 
 %files		libs
 %defattr(-,root,root,-)
@@ -99,6 +113,15 @@
 
 
 %changelog
+* 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
+- Updated Release.
+
+* Wed Jul 25 2007 Xavier Lamien < lxtnow[at]gmail.com > - 1.12.91-1
+- Updated Release.
+
 * Thu May 24 2007 Xavier Lamien < lxtnow[at]gmail.com > - 1.11.0-1
 - Updated release.