- Updated to version 1.10.0 (stable) STBR for AC update general

Changed files:
    gammu.spec -> 1.45

diff --git a/gammu.spec b/gammu.spec
index a799f01eeded8b03538dc0731cb6dd9331167018..f14ddbefe939ff418c81670ad291839a231dc44b 100644 (file)
--- a/gammu.spec
+++ b/gammu.spec
@@ -1,21 +1,24 @@
-Summary:       Linux/Unix tool suite for Nokia mobile phones
-Summary(pl.UTF-8):     Linuksowy/uniksowy zestaw narzędzi dla telefonów komórkowych Nokia
+Summary:       GNU tool suite for mobile phones
+Summary(pl.UTF-8):     Zestaw narzędzi GNU dla telefonów komórkowych
 Name:          gammu
-Version:       1.07.00
+Version:       1.10.0
 Release:       1
 Epoch:         1
 License:       GPL v2
 Group:         Applications/Communications
-Source0:       http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/%{name}-%{version}.tar.gz
-# Source0-md5: b706e35a6f003acc47f8c2bb71fa8036
+Source0:    http://dl.cihar.com/gammu/releases/%{name}-%{version}.tar.bz2
+# Source0-md5: 05b623c30cfd69ea97f0bc054b19928d
 Patch0:                %{name}-etc_dir.patch
 Patch1:                %{name}-no_nss.patch
+Patch2:                %{name}-libpq_dir.patch
 URL:           http://www.gammu.org/
 BuildRequires: autoconf
 BuildRequires: bluez-libs-devel
 BuildRequires: mysql-devel
+BuildRequires:  postgresql-devel
 Provides:      mygnokii2
 Obsoletes:     mygnokii2
+Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,11 +40,47 @@ wieloma funkcjami do dzwonków, książki telefonicznej, SMS-ów, logo,
 WAP, daty/czasu, budzika, dzwonienia itp. Może także wykonywać pełne
 kopie zapasowe danych i odtwarzać je.
 
+%package devel
+Summary:       Header files for Gammu tool suite for mobile phones
+Summary(pl.UTF-8):     Pliki nagłówkowe zestawu narzędzi dla telefonów komórkowych Gammu
+Group:         Development/Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+Header files for Gammu tool suite for mobile phones.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe zestawu narzędzi dla telefonów komórkowych Gammu.
+
+%package libs
+Summary:        Gammu library
+Summary(pl.UTF-8):      Biblioteka Gammu
+Group:          Libraries
+
+%description libs
+Gammu tool suite library.
+
+%description devel -l pl.UTF-8
+Biblioteka zestawu narzędzi dla telefonów komórkowych Gammu.
+
+%package static
+Summary:        Gammu static library
+Summary(pl.UTF-8):      Biblioteka statyczna Gammu
+Group:          Development/Libraries
+Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
+
+%description static
+Gammu static library.
+
+%description devel -l pl.UTF-8
+Biblioteka statyczna zestawu narzędzi dla telefonów komórkowych Gammu.
+
 %prep
 %setup -q
 #%patch0 -p1
 %patch1 -p1
-cp -f version cfg/autoconf/VERSION
+%patch2 -p1
+cp -f VERSION cfg/autoconf/VERSION
 mv docs/docs/english/gammu.1 .
 
 %build
@@ -60,7 +99,7 @@ cd ../..
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_examplesdir}/%{name}-%{version},%{_datadir}/%{name}}
-%{__make} installlocales installlibonly \
+%{__make} installlibonly \
        DESTDIR=$RPM_BUILD_ROOT \
        prefix=%{_prefix} \
        INSTALL_LIB_DIR=%{_libdir} \
@@ -69,32 +108,48 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_examplesdir}/%{name}-%{version},%{_
 
 install -D gammu.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 install docs/examples/config/gammurc $RPM_BUILD_ROOT%{_sysconfdir}
+install docs/docs/locale/*.txt $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -r docs/{examples,develop} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cd $RPM_BUILD_ROOT%{_libdir}
+ln -sf libGammu.so.1.0 libGammu.so
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
-# anybody feels like developing gammu-based apps?
-rm -rf $RPM_BUILD_ROOT{%{_includedir},%{_libdir}/{*.{so,a},pkgconfig}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
+%if %{with ldconfig}
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%endif
 
 %files
 %defattr(644,root,root,755)
-%doc changelog docs/docs/english/gammu.htm other/bash readme.txt
+%doc ChangeLog docs/docs/english/gammu.htm other/bash README
 %doc %lang(it) docs/docs/italian
 %attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_libdir}/*.so.*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gammurc
 %dir %{_datadir}/%{name}
-%lang(cs) %{_datadir}/gammu/gammu_cs.txt
-%lang(de) %{_datadir}/gammu/gammu_de.txt
-%lang(es) %{_datadir}/gammu/gammu_es.txt
-%lang(it) %{_datadir}/gammu/gammu_it.txt
-%lang(pl) %{_datadir}/gammu/gammu_pl.txt
-%lang(ru) %{_datadir}/gammu/gammu_ru.txt
-%{_datadir}/gammu/gammu_us.txt
+%lang(cs) %{_datadir}/%{name}/gammu_cs.txt
+%lang(de) %{_datadir}/%{name}/gammu_de.txt
+%lang(es) %{_datadir}/%{name}/gammu_es.txt
+%lang(it) %{_datadir}/%{name}/gammu_it.txt
+%lang(pl) %{_datadir}/%{name}/gammu_pl.txt
+%lang(ru) %{_datadir}/%{name}/gammu_ru.txt
+%{_datadir}/%{name}/gammu_us.txt
 %{_examplesdir}/%{name}-%{version}
 %{_mandir}/man1/*
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/*.so
+%{_includedir}/*
+%{_pkgconfigdir}/*
+
+%files libs
+%defattr(755,root,root,755)
+%{_libdir}/*.so.*
+
+%files static
+%defattr(755,root,root,755)
+%{_libdir}/*.a