Author: glen Date: Mon Jan 23 00:04:10 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.1.1; greeters are now separate project(s)
---- Files affected: packages/lightdm: lightdm.spec (1.18 -> 1.19) , lightdm-disable_tests.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/lightdm/lightdm.spec diff -u packages/lightdm/lightdm.spec:1.18 packages/lightdm/lightdm.spec:1.19 --- packages/lightdm/lightdm.spec:1.18 Sun Jan 22 22:26:09 2012 +++ packages/lightdm/lightdm.spec Mon Jan 23 01:04:05 2012 @@ -2,14 +2,13 @@ Summary: A lightweight display manager Summary(hu.UTF-8): Egy könnyűsúlyú bejelentkezéskezelő Name: lightdm -Version: 1.1.0 +Version: 1.1.1 Release: 1 License: GPL v3 Group: X11/Applications -Source0: http://people.ubuntu.com/~robert-ancell/lightdm/releases/%{name}-%{version}.tar.gz -# Source0-md5: c2347200b1af29c677ef5ad83855217b +Source0: https://launchpad.net/lightdm/trunk/%{version}/+download/%{name}-%{version}.tar.gz +# Source0-md5: e42e1ac0b07b3591de44ff7b6daa6c7a Source1: %{name}.pamd -Patch1: %{name}-disable_tests.patch Patch2: upstart-path.patch URL: http://www.freedesktop.org/wiki/Software/LightDM BuildRequires: QtCore-devel @@ -22,6 +21,7 @@ BuildRequires: gettext-devel BuildRequires: gnome-common BuildRequires: gnome-doc-utils +BuildRequires: gtk+2-devel >= 2:2.24 BuildRequires: gtk-doc BuildRequires: gtk-webkit-devel BuildRequires: intltool @@ -31,12 +31,20 @@ BuildRequires: perl-XML-Parser BuildRequires: perl-base BuildRequires: pkgconfig +BuildRequires: rpmbuild(macros) >= 1.583 BuildRequires: vala Requires: lightdm-greeter Provides: group(xdm) Provides: user(xdm) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +# TODO: fix this +#Unresolved symbols found in: liblightdm-qt-2.so.0.0.0 +# QPixmap::~QPixmap() +# QPixmap::operator QVariant() const +# QPixmap::QPixmap(QString const&, char const*, QFlags<Qt::ImageConversionFlag>) +%define skip_post_check_so liblightdm-qt-2.so.0.0.0 + %description An X display manager that: - Has a lightweight codebase @@ -53,24 +61,6 @@ - teljesen témázható (a legkönnyebb a webkit felülettel) - desktop-független (üdvözlők bármilyen eszközkészlettel írhatók) -%package greeter-gtk -Summary: GTK greeter for lightdm -Group: Themes -Requires: %{name} = %{epoch}:%{version}-%{release} -Provides: lightdm-greeter - -%description greeter-gtk -GTK greeter for lightdm. - -%package greeter-qt -Summary: QT greeter for lightdm -Group: Themes -Requires: %{name} = %{epoch}:%{version}-%{release} -Provides: lightdm-greeter - -%description greeter-qt -QT greeter for lightdm. - %package static Summary: Static library for lightdm development Group: Development/Libraries @@ -81,6 +71,7 @@ %package devel Summary: Header files for lightdm development Group: Development/Libraries +Requires: %{name} = %{version}-%{release} %description devel Header files for lightdm development. @@ -107,7 +98,6 @@ %prep %setup -q -%patch1 -p1 %patch2 -p1 %build @@ -121,6 +111,7 @@ %{__automake} %configure \ --disable-silent-rules \ + --disable-tests \ --enable-liblightdm-qt \ --enable-gtk-doc \ --with-greeter-user=xdm @@ -133,7 +124,9 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,security,init,dbus-1/system.d} \ $RPM_BUILD_ROOT/home/services/xdm \ + $RPM_BUILD_ROOT%{_datadir}/xgreeters \ $RPM_BUILD_ROOT/var/log/lightdm + cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/lightdm touch $RPM_BUILD_ROOT/etc/security/blacklist.lightdm cp -p data/init/%{name}.conf $RPM_BUILD_ROOT/etc/init @@ -165,56 +158,48 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README +%doc AUTHORS ChangeLog NEWS README TODO %dir %{_sysconfdir}/%{name} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/keys.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/users.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/lightdm %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.lightdm +# XXX: move /etc/apparmor.d to filesystem package or make apparmor subpackage here +%dir /etc/apparmor.d +/etc/apparmor.d/lightdm-guest-session /etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf %attr(755,root,root) %{_bindir}/dm-tool %attr(755,root,root) %{_sbindir}/lightdm %attr(755,root,root) %{_libdir}/liblightdm-gobject-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/liblightdm-gobject-1.so.0 -%attr(755,root,root) %{_libdir}/liblightdm-qt-1.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liblightdm-qt-1.so.0 -%attr(755,root,root) %{_libdir}/lightdm-set-defaults +%attr(755,root,root) %{_libdir}/liblightdm-qt-2.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liblightdm-qt-2.so.0 %dir %{_libdir}/%{name} %attr(755,root,root) %{_libdir}/%{name}/gdmflexiserver +%attr(755,root,root) %{_libdir}/%{name}/lightdm-guest-session-wrapper +%attr(755,root,root) %{_libdir}/%{name}/lightdm-set-defaults %{_libdir}/girepository-1.0/LightDM-1.typelib %dir %{_datadir}/xgreeters %{_mandir}/man1/lightdm* %attr(750,root,xdm) /var/log/lightdm %attr(750,xdm,xdm) /home/services/xdm -%files greeter-gtk -%defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/lightdm-gtk-greeter -%{_datadir}/lightdm-gtk-greeter -%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-gtk-greeter.conf - -%files greeter-qt -%defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/lightdm-qt-greeter -%{_datadir}/xgreeters/lightdm-qt-greeter.desktop - %files static %defattr(644,root,root,755) %{_libdir}/liblightdm-gobject-1.a -%{_libdir}/liblightdm-qt-1.a +%{_libdir}/liblightdm-qt-2.a %files devel %defattr(644,root,root,755) %{_libdir}/liblightdm-gobject-1.la %attr(755,root,root) %{_libdir}/liblightdm-gobject-1.so -%{_libdir}/liblightdm-qt-1.la -%attr(755,root,root) %{_libdir}/liblightdm-qt-1.so +%{_libdir}/liblightdm-qt-2.la +%attr(755,root,root) %{_libdir}/liblightdm-qt-2.so %{_includedir}/lightdm-gobject-1 -%{_includedir}/lightdm-qt-1 +%{_includedir}/lightdm-qt-2 %{_pkgconfigdir}/liblightdm-gobject-1.pc -%{_pkgconfigdir}/liblightdm-qt-1.pc +%{_pkgconfigdir}/liblightdm-qt-2.pc %{_datadir}/gir-1.0/LightDM-1.gir %{_datadir}/vala/vapi/liblightdm-gobject-1.vapi @@ -232,6 +217,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.19 2012/01/23 00:04:05 glen +- up to 1.1.1; greeters are now separate project(s) + Revision 1.18 2012/01/22 21:26:09 glen - upstart package to depend on base and upstart ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lightdm/lightdm.spec?r1=1.18&r2=1.19&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
