On Friday 23 February 2007, Adam Gołębiowski wrote: > > +Summary(pl.UTF-8): Zestaw narzędzi GNU dla telefonów komórkowych > to chyba nie utf... Pisane w VIMie z "termencoding:utf8 encoding:utf8". We wszystkich edytorach UTF8 jest wyświetlane poprawnie.
> > +install -m 0644 docs/docs/locale/*.txt > -m 0644 niepotrzebne, uprawnienia i tak okreslane sa pozniej. Tak było w "oryginalnym" SPECu. Usunięte. > > +%files devel > > +%defattr(644,root,root,755) > > +%{_includedir} > > +%{_libdir}/pkgconfig > no way dude, te katalogu juz naleza do innych pakietow. Chciałeś raczej > %{_includedir}/* > %{_libdir}/pkgconfig/* Poprawione. Dziękuję za pomoc :) -- Daniel 'Beorn' Mróz <[EMAIL PROTECTED]> http://127.0.0.1/beorn [GIT d s:- a-@ C++++ UL++++$ P+ L++++ E--- W+ N+++ o? K- w---] [O- M- V! PS+ PE++ Y+ PGP++ t- 5 X R !tv b+ DI D++ G++ e h*] [ r++ y+ ]
--- gammu.spec.orig 2007-02-15 13:44:39.163571004 +0100 +++ gammu.spec 2007-02-23 17:11:38.361111528 +0100 @@ -1,22 +1,24 @@ # $Revision: 1.44 $, $Date: 2007/02/13 07:16:44 $ -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 -Release: 1 +Version: 1.09.19 +Release: 0.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-md5: 7d7d9dea3b9d52b7a7a6fe4f3fef92d7 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 Provides: mygnokii2 Obsoletes: mygnokii2 +Requires: %{name}-libs = %{epoch}:%{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -38,11 +40,47 @@ 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 @@ -61,7 +99,7 @@ %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} \ @@ -70,11 +108,10 @@ 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} 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 @@ -84,22 +121,34 @@ %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) +%{_includedir}/* +%{_libdir}/pkgconfig/* + +%files libs +%defattr(755,root,root,755) +%{_libdir}/*.so.* + +%files static +%defattr(755,root,root,755) +%{_libdir}/*.a + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]>
--- gammu-1.09.19/gammu/smsd/smsdcore.h.orig 2007-02-06 17:36:07.000000000 +0100 +++ gammu-1.09.19/gammu/smsd/smsdcore.h 2007-02-15 12:45:03.073571004 +0100 @@ -13,11 +13,7 @@ #endif #ifdef HAVE_POSTGRESQL_LIBPQ_FE_H -#ifdef WIN32 -# include <libpq-fe.h> -#else -# include <postgresql/libpq-fe.h> -#endif +# include <libpq-fe.h> #endif #include "../../common/service/sms/gsmsms.h"
--- gammu-1.09.19/cfg/Makefile.cfg.orig 2007-02-15 12:24:48.253571004 +0100 +++ gammu-1.09.19/cfg/Makefile.cfg 2007-02-15 12:25:41.713571004 +0100 @@ -19,7 +19,7 @@ CC = gcc CFLAGS = -g -O0 -fPIC -Wall -Wno-format-y2k GAMMU_CFLAGS = -pthread -LDLIBS = -lm -lbluetooth +LDLIBS = -lmysqlclient -lz -lcrypt -lm -pthread -lbluetooth GAMMU_LIBS = -pthread SMSD_LIBS = -L/usr/lib/mysql -lmysqlclient -L/usr/lib -lpq INSTALL = /usr/bin/install
_______________________________________________ pld-devel-pl mailing list pld-devel-pl@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl