Author: qboosh Date: Mon Jun 11 16:30:05 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unified
- actually run ldconfig
- internal deps fixes
---- Files affected:
SPECS:
gammu.spec (1.53 -> 1.54)
---- Diffs:
================================================================
Index: SPECS/gammu.spec
diff -u SPECS/gammu.spec:1.53 SPECS/gammu.spec:1.54
--- SPECS/gammu.spec:1.53 Fri Jun 8 14:07:08 2007
+++ SPECS/gammu.spec Mon Jun 11 18:30:00 2007
@@ -16,9 +16,9 @@
BuildRequires: gettext-devel
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: mygnokii2
Obsoletes: mygnokii2
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -40,18 +40,6 @@
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
@@ -63,11 +51,23 @@
%description libs -l pl.UTF-8
Biblioteka zestawu narzędzi dla telefonów komórkowych Gammu.
+%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}-libs = %{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 static
Summary: Gammu static library
Summary(pl.UTF-8): Biblioteka statyczna Gammu
Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
%description static
Gammu static library.
@@ -97,10 +97,9 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_examplesdir}/%{name}-%{version}}
-cd build
-%{__make} install \
+
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-cd ..
install docs/examples/config/gammurc $RPM_BUILD_ROOT%{_sysconfdir}
cp -r docs/{examples,develop} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -114,10 +113,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%if %{with ldconfig}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%endif
%files -f %{name}.lang
%defattr(644,root,root,755)
@@ -128,17 +125,17 @@
%{_examplesdir}/%{name}-%{version}
%{_mandir}/man1/*
+%files libs
+%defattr(755,root,root,755)
+%attr(755,root,root) %{_libdir}/*.so.*
+
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/%{name}-config
-%{_libdir}/*.so
+%attr(755,root,root) %{_libdir}/*.so
%{_includedir}/*
%{_pkgconfigdir}/*
-%files libs
-%defattr(755,root,root,755)
-%{_libdir}/*.so.*
-
%files static
%defattr(755,root,root,755)
%{_libdir}/*.a
@@ -149,6 +146,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.54 2007/06/11 16:30:00 qboosh
+- unified
+- actually run ldconfig
+- internal deps fixes
+
Revision 1.53 2007/06/08 12:07:08 gotar
- one more obsoleted patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gammu.spec?r1=1.53&r2=1.54&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
