packages: libutempter/libutempter-lastlog.patch, libutempter/libutempter.sp...

[arekm]

Author: arekm                        Date: Thu Sep 23 18:08:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1; fixes from Adam Osuchowski

---- Files affected:
packages/libutempter:
   libutempter-lastlog.patch (1.1 -> 1.2) , libutempter.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: packages/libutempter/libutempter-lastlog.patch
diff -u packages/libutempter/libutempter-lastlog.patch:1.1 packages/libutempter/libutempter-lastlog.patch:1.2
--- packages/libutempter/libutempter-lastlog.patch:1.1	Tue Sep 21 14:19:31 2010
+++ packages/libutempter/libutempter-lastlog.patch	Thu Sep 23 20:08:19 2010
@@ -34,7 +34,7 @@
  
  	(void) updwtmp(_PATH_WTMP, &ut);
 +	if ((fd = open(_PATH_LASTLOG, O_RDWR)) != -1) {
-+		lseek(fd, (off_t) ((long)pw->pw_uid * sizeof(ll)), SEEK_SET);
++		lseek(fd, (off_t) ((long)getuid() * sizeof(ll)), SEEK_SET);
 +		write(fd, &ll, sizeof(ll));
 +		close(fd);
 +	}

================================================================
Index: packages/libutempter/libutempter.spec
diff -u packages/libutempter/libutempter.spec:1.63 packages/libutempter/libutempter.spec:1.64
--- packages/libutempter/libutempter.spec:1.63	Tue Sep 21 14:19:31 2010
+++ packages/libutempter/libutempter.spec	Thu Sep 23 20:08:19 2010
@@ -8,8 +8,8 @@
 %define	utempter_compat_ver	0.5.5
 Name:		libutempter
 Version:	1.1.5
-Release:	0.1
-License:	MIT or LGPL
+Release:	1
+License:	LGPL
 Group:		Base
 Source0:	ftp://ftp.altlinux.org/pub/people/ldv/utempter/%{name}-%{version}.tar.bz2
 # Source0-md5:	d62a93ba9f3796a91cf03be5ef25a9a1
@@ -71,6 +71,18 @@
 %description devel -l pl.UTF-8
 Plik nagłówkowy biblioteki utemptera.
 
+%package static
+Summary:	Static utempter library
+Summary(pl.UTF-8):	Statyczna biblioteka utemptera
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static utempter library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka utemptera
+
 %prep
 %setup -q
 %patch0 -p1
@@ -91,6 +103,10 @@
 	libexecdir="%{_libexecdir}" \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_sbindir}
+ln -s %{_libdir}/utempter/utempter $RPM_BUILD_ROOT%{_sbindir}
+ln -s %{_libdir}/utempter/utmp-cleanup $RPM_BUILD_ROOT%{_sbindir}
+
 install -d $RPM_BUILD_ROOT/var/run
 :> $RPM_BUILD_ROOT/var/run/utmpx
 
@@ -117,9 +133,13 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(2755,root,utmp) %{_sbindir}/utempter
+%dir %{_libdir}/utempter
+%attr(2755,root,utmp) %{_libdir}/utempter/utempter
+%attr(755,root,root) %{_sbindir}/utempter
+%attr(755,root,root) %{_libdir}/utempter/utmp-cleanup
 %attr(755,root,root) %{_sbindir}/utmp-cleanup
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/lib*.so.0
 %attr(664,root,utmp) %ghost /var/run/utmpx
 
 %files devel
@@ -127,12 +147,19 @@
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/utempter.h
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2010/09/23 18:08:19  arekm
+- rel 1; fixes from Adam Osuchowski
+
 Revision 1.63  2010/09/21 12:19:31  arekm
 - replacement for utempter (unfinished)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libutempter/libutempter-lastlog.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libutempter/libutempter.spec?r1=1.63&r2=1.64&f=u