Mailinglist Archive: opensuse-commit (1139 mails)

< Previous Next >
commit libgnomesu
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 09 Jan 2007 17:51:00 +0100
  • Message-id: <20070109165100.8AD6E67817E@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libgnomesu
checked in at Tue Jan 9 17:51:00 CET 2007.

--------
--- GNOME/libgnomesu/libgnomesu.changes 2006-06-20 17:32:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/libgnomesu/libgnomesu.changes 2007-01-02 17:58:09.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Jan 2 17:45:31 CET 2007 - sbrabec@xxxxxxx
+
+- Fixed invalid Makefile expansion.
+
+-------------------------------------------------------------------
+Fri Dec 22 14:09:44 CET 2006 - sbrabec@xxxxxxx
+
+- Prefix changed to /usr.
+- Spec file cleanup.
+
+-------------------------------------------------------------------

New:
----
libgnomesu-makefile.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libgnomesu.spec ++++++
--- /var/tmp/diff_new_pack.X12957/_old 2007-01-09 17:50:52.000000000 +0100
+++ /var/tmp/diff_new_pack.X12957/_new 2007-01-09 17:50:52.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libgnomesu (Version 1.0.0)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,21 +11,19 @@
# norootforbuild

Name: libgnomesu
-BuildRequires: intltool libgnomeui-devel pam-devel perl-XML-Parser update-desktop-files
+BuildRequires: intltool libgnomeui-devel pam-devel
URL: http://members.chello.nl/~h.lai/libgnomesu/
-%define prefix /opt/gnome
-%define sysconfdir /etc%{prefix}
-License: LGPL
+License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/GUI/GNOME
Autoreqprov: on
PreReq: permissions
-Requires: gnome-icon-theme shared-mime-info
+# obsolete in >9.3
Provides: xsu
Obsoletes: xsu
Version: 1.0.0
-Release: 37
+Release: 75
Summary: GNOME su Library
-Source: libgnomesu-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
Source1: gnomesu-pam.pamd
Patch: libgnomesu-libtool.patch
Patch1: libgnomesu-1.0.0-xauth-nolookup.patch
@@ -35,6 +33,7 @@
Patch5: libgnomesu-scrollbar.patch
Patch6: libgnomesu-password-translation.patch
Patch7: libgnomesu-po-update.patch
+Patch8: libgnomesu-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -50,9 +49,8 @@
%package devel
Summary: Development files for libgnomesu
Group: Development/Libraries/GNOME
-Requires: %{name} = %{version}
-Requires: libgnome-devel libgnomecanvas-devel libbonoboui-devel pam-devel
-Autoreqprov: on
+Requires: %{name} = %{version} glib2-devel gtk2-devel
+# libgnome-devel libgnomecanvas-devel libbonoboui-devel pam-devel

%description devel
This package contains all files needed to develop with libgnomesu.
@@ -64,7 +62,7 @@
Hongli Lai <h.lai@xxxxxxxxx>

%prep
-%setup -q -n libgnomesu-%{version}
+%setup -q
%patch
%patch1 -p1
%patch2 -p1
@@ -73,66 +71,57 @@
%patch5
%patch6 -p0
%patch7
+%patch8
cp -a %{S:1} pam-backend/gnomesu-pam

%build
-%{?suse_update_config:%{suse_update_config -f}}
-libtoolize --force
-aclocal -I .
-automake -c -a -f
-autoconf
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{prefix} \
- --libdir=%{prefix}/%_lib \
- --with-native-locale=yes \
- --with-xinput=xfree \
- --mandir=%{_mandir} \
- --libexecdir=%{prefix}/lib/libgnomesu \
- --infodir=%{_infodir} \
- --sysconfdir=%{sysconfdir} \
- --localstatedir=/var \
- --disable-schemas-install \
+autoreconf -f -i
+%configure\
+ --libexecdir=%{_prefix}/lib/%{name}\
+ --disable-schemas-install\
--disable-setuid-error
-make
+make %{?jobs:-j%jobs}

%install
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/%{name}
make install DESTDIR=$RPM_BUILD_ROOT
-chmod 755 $RPM_BUILD_ROOT/opt/gnome/lib/libgnomesu/gnomesu-backend
-chmod 4755 $RPM_BUILD_ROOT/opt/gnome/lib/libgnomesu/gnomesu-pam-backend
%find_lang libgnomesu-1.0
-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
-cp AUTHORS README NEWS ChangeLog doc/api.html doc/libgnomesu.css $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
+cp AUTHORS README NEWS ChangeLog doc/api.html doc/libgnomesu.css $RPM_BUILD_ROOT%{_docdir}/%{name}
# We want only PAM backend.
-rm $RPM_BUILD_ROOT%{prefix}/lib/libgnomesu/gnomesu-backend
-%if %is_plus
-mkdir -p $RPM_BUILD_ROOT/etc/permissions.d
-cat >$RPM_BUILD_ROOT/etc/permissions.d/%{name}.easy <<EOF
+rm $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/gnomesu-backend
+%if %suse_version <= 1020
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/permissions.d
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/permissions.d/%{name}.easy <<EOF
# libgnomesu (#75823)
-/opt/gnome/lib/libgnomesu/gnomesu-pam-backend root:root 4755
+%{_prefix}/lib/libgnomesu/gnomesu-pam-backend root:root 4755
EOF
-cat >$RPM_BUILD_ROOT/etc/permissions.d/%{name}.secure <<EOF
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/permissions.d/%{name}.secure <<EOF
# libgnomesu (#75823)
-/opt/gnome/lib/libgnomesu/gnomesu-pam-backend root:root 4755
+%{_prefix}/lib/libgnomesu/gnomesu-pam-backend root:root 4755
EOF
-cat >$RPM_BUILD_ROOT/etc/permissions.d/%{name}.paranoid <<EOF
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/permissions.d/%{name}.paranoid <<EOF
# libgnomesu (#75823)
-/opt/gnome/lib/libgnomesu/gnomesu-pam-backend root:root 0755
+%{_prefix}/lib/libgnomesu/gnomesu-pam-backend root:root 0755
EOF
%endif
+# No support for old GNOME
+# FIXME: Transform it to .desktop file
+rm $RPM_BUILD_ROOT%{_datadir}/application-registry/*.applications $RPM_BUILD_ROOT%{_datadir}/mime-info/*.*
+
+%clean
+rm -rf $RPM_BUILD_ROOT

%post
-%run_permissions
%run_ldconfig
+%run_permissions
+
+%verifyscript
+%verify_permissions -e %{_prefix}/lib/%{name}/gnomesu-pam-backend

%postun
%run_ldconfig

-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%verifyscript
-%verify_permissions -e %{prefix}/lib/libgnomesu/gnomesu-pam-backend
-
%files -f %files -f libgnomesu-1.0.lang
%defattr(-,root,root)
%doc %dir %{_defaultdocdir}/%{name}
@@ -140,31 +129,34 @@
%doc %{_defaultdocdir}/%{name}/README
%doc %{_defaultdocdir}/%{name}/NEWS
%doc %{_defaultdocdir}/%{name}/ChangeLog
-%config /etc/pam.d/gnomesu-pam
-%if %is_plus
-/etc/permissions.d/%{name}.*
-%endif
-%{prefix}/bin/gnomesu
-%dir %{prefix}/lib/libgnomesu
-#%attr (6755,root,root) %{prefix}/lib/libgnomesu/gnomesu-backend
-#%attr (6755,root,root) %{prefix}/lib/libgnomesu/gnomesu-pam-backend
+%{_bindir}/gnomesu
+%dir %{_prefix}/lib/%{name}
+#%attr (6755,root,root) %{_prefix}/lib/%{name}/gnomesu-backend
+#%attr (6755,root,root) %{_prefix}/lib/%{name}/gnomesu-pam-backend
# NOTE: Original package has 6755.
# We have only 4755 and for easy and secure profile.
-%verify (not mode) %attr (4755,root,root) %{prefix}/lib/libgnomesu/gnomesu-pam-backend
-%{prefix}/%_lib/libgnomesu.so.*
-%{prefix}/share/application-registry/gnomesu-nautilus.applications
-%{prefix}/share/mime-info/gnomesu-nautilus.keys
+%verify (not mode) %attr (4755,root,root) %{_prefix}/lib/%{name}/gnomesu-pam-backend
+%{_libdir}/libgnomesu.so.*
+%config %{_sysconfdir}/pam.d/gnomesu-pam
+%if %suse_version <= 1020
+%{_sysconfdir}/permissions.d/%{name}.*
+%endif

%files devel
%defattr(-,root,root)
-%doc %{_defaultdocdir}/%{name}/api.html
-%doc %{_defaultdocdir}/%{name}/libgnomesu.css
-%{prefix}/include/libgnomesu-1.0
-%{prefix}/%_lib/pkgconfig/libgnomesu-1.0.pc
-%{prefix}/%_lib/libgnomesu.so
-%{prefix}/%_lib/libgnomesu.*a
+%doc %{_docdir}/%{name}/api.html
+%doc %{_docdir}/%{name}/libgnomesu.css
+%{_includedir}/libgnomesu-1.0
+%{_libdir}/libgnomesu.so
+%{_libdir}/libgnomesu.*a
+%{_libdir}/pkgconfig/libgnomesu-1.0.pc

%changelog -n libgnomesu
+* Tue Jan 02 2007 - sbrabec@xxxxxxx
+- Fixed invalid Makefile expansion.
+* Fri Dec 22 2006 - sbrabec@xxxxxxx
+- Prefix changed to /usr.
+- Spec file cleanup.
* Tue Jun 20 2006 - sbrabec@xxxxxxx
- Updated translations from upstream (179651#c15).
* Fri May 26 2006 - zsu@xxxxxxx


++++++ libgnomesu-makefile.patch ++++++
--- pam-backend/Makefile.am
+++ pam-backend/Makefile.am
@@ -16,7 +16,7 @@
pam_DATA = gnomesu-pam
endif

-installed_exe=$(DESTDIR)$(libexecdir)/`echo gnomesu-pam-backend | sed $(transform)`
+installed_exe=$(DESTDIR)$(libexecdir)/`echo gnomesu-pam-backend | sed '$(transform)'`

if SETUID_ERROR
install-data-local: gnomesu-pam-backend
@@ -31,8 +31,8 @@
}; \
echo chown root$(ROOTGROUP) $(installed_exe); \
chown root$(ROOTGROUP) $(installed_exe) || printErr; \
- echo chmod a=xs $(installed_exe); \
- chmod a=xs $(installed_exe) || printErr
+ echo chmod u=rxs,go=xs $(installed_exe); \
+ chmod u=rxs,go=xs $(installed_exe) || printErr
else
install-data-local: gnomesu-pam-backend
@printWarn() { \
@@ -46,8 +46,8 @@
}; \
echo chown root$(ROOTGROUP) $(installed_exe); \
chown root$(ROOTGROUP) $(installed_exe) || printWarn; \
- echo chmod a=xs $(installed_exe); \
- chmod a=xs $(installed_exe) || true
+ echo chmod u=rxs,go=xs $(installed_exe); \
+ chmod u=rxs,go=xs $(installed_exe) || true
endif

endif
--- su-backend/Makefile.am
+++ su-backend/Makefile.am
@@ -23,7 +23,7 @@
libcommon_la_SOURCES = common.c common.h
libcommon_la_LDFLAGS = $(GNOMESU_BACKEND_LIBS)

-installed_su=$(DESTDIR)$(libexecdir)/`echo gnomesu-backend | sed $(transform)`
+installed_su=$(DESTDIR)$(libexecdir)/`echo gnomesu-backend | sed '$(transform)'`

if SETUID_ERROR
install-data-local: gnomesu-backend
@@ -38,8 +38,8 @@
}; \
echo chown root$(ROOTGROUP) $(installed_su); \
chown root$(ROOTGROUP) $(installed_su) || printErr; \
- echo chmod a=xs $(installed_su); \
- chmod a=xs $(installed_su) || printErr
+ echo chmod u=rxs,go=xs $(installed_su); \
+ chmod u=rxs,go=xs $(installed_su) || printErr
else
install-data-local: gnomesu-backend
@printWarn() { \
@@ -53,8 +53,8 @@
}; \
echo chown root$(ROOTGROUP) $(installed_su); \
chown root$(ROOTGROUP) $(installed_su) || printWarn; \
- echo chmod a=xs $(installed_su); \
- chmod a=xs $(installed_su) || true
+ echo chmod u=rxs,go=xs $(installed_su); \
+ chmod u=rxs,go=xs $(installed_su) || true
endif

EXTRA_DIST = $(gnomesu_backend_SOURCES) $(libcommon_la_SOURCES)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages