[meego-commits] 4988: Changes to Trunk:Testing/polkit-gnome
Yan Yin
yan.yin at intel.com
Tue Jun 29 08:36:08 UTC 2010
Hi,
I have made the following changes to polkit-gnome in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Yan Yin
[This message was auto-generated]
---
Request #4988:
submit: home:yyin2:branches:Trunk:Testing/polkit-gnome(r5)(cleanup) -> Trunk:Testing/polkit-gnome
Message:
Change make to single-make in YAML since recursive build dependency causing make failure
State: new 2010-06-28T20:32:46 yyin2
Comment: None
changes files:
--------------
--- polkit-gnome.changes
+++ polkit-gnome.changes
@@ -0,0 +1,7 @@
+* Tue Jun 29 2010 Yan Yin <yan.yin at intel.com> - 0.96
+- Change make to single-make in YAML since recursive build dependency causing make failure
+
+* Thu Jun 24 2010 Yan Yin <yan.yin at intel.com> - 0.96
+- Change to YAML format
+- Update to 0.96
+
old:
----
polkit-gnome-0.94.tar.bz2
new:
----
Makefile
polkit-gnome-0.96.tar.bz2
polkit-gnome.yaml
spec files:
-----------
--- polkit-gnome.spec
+++ polkit-gnome.spec
@@ -1,98 +1,139 @@
-Summary: PolicyKit integration for the GNOME desktop
+#
+# Do not Edit! Generated by:
+# spectacle version 0.17
+#
+# >> macros
+# << macros
+
Name: polkit-gnome
-Version: 0.94
+Summary: PolicyKit integration for the GNOME desktop
+Version: 0.96
Release: 3
+Group: Applications/System
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PolicyKit
-Group: Applications/System
Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel
-BuildRequires: polkit-devel >= 0.94
+Source100: polkit-gnome.yaml
+Requires: polkit >= 0.95
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(gdk-2.0)
+BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires: pkgconfig(polkit-backend-1)
BuildRequires: desktop-file-utils
BuildRequires: intltool
-BuildRequires: dbus-glib-devel
-BuildRequires: gobject-introspection-devel
-
-Obsoletes: PolicyKit-gnome <= 0.10
Provides: PolicyKit-gnome = 0.11
-Obsoletes: PolicyKit-gnome-libs <= 0.10
Provides: PolicyKit-gnome-libs = 0.11
-
Provides: PolicyKit-authentication-agent
+Obsoletes: PolicyKit-gnome <= 0.10
+Obsoletes: PolicyKit-gnome-libs <= 0.10
-Requires: polkit >= 0.94
%description
polkit-gnome provides an authentication agent for PolicyKit
that matches the look and feel of the GNOME desktop.
+
+
+%package docs
+Summary: Development documentation for polkit-gnome
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %name-devel = %{version}-%{release}
+Requires: gtk-doc
+
+%description docs
+Development documentation for polkit-gnome.
+
%package devel
Summary: Development files for polkit-gnome
Group: Development/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: %name-docs = %{version}-%{release}
Requires: pkgconfig
Requires: polkit-devel
-Obsoletes: PolicyKit-gnome-devel <= 0.10
Provides: PolicyKit-gnome-devel = 0.11
-Obsoletes: PolicyKit-gnome-demo <= 0.10
Provides: PolicyKit-gnome-demo = 0.11
+Obsoletes: PolicyKit-gnome-devel <= 0.10
+Obsoletes: PolicyKit-gnome-demo <= 0.10
%description devel
Development files for polkit-gnome.
-%package docs
-Summary: Development documentation for polkit-gnome
-Group: Development/Libraries
-Requires: %name-devel = %{version}-%{release}
-Requires: gtk-doc
-
-%description docs
-Development documentation for polkit-gnome.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}
+
+# >> setup
+# << setup
%build
-%configure --enable-gtk-doc
+# >> build pre
+# << build pre
+
+%configure --disable-static \
+ --enable-gtk-doc \
+ --disable-introspection
+
make
+# >> build post
+# << build post
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
+%make_install
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# >> install post
desktop-file-install --delete-original \
- --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
- $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+--dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
+--remove-only-show-in GNOME \
+$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+
+echo 'NotShowIn=KDE;' >>$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+
+# << install post
%find_lang polkit-gnome-1
+
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%clean
-rm -rf $RPM_BUILD_ROOT
+
+
+
+
+
%files -f polkit-gnome-1.lang
%defattr(-,root,root,-)
+# >> files
%doc COPYING AUTHORS README
%{_sysconfdir}/xdg/autostart/*
%{_libexecdir}/*
%{_libdir}/lib*.so.*
+# << files
+
+
+%files docs
+%defattr(-,root,root,-)
+# >> files docs
+%{_datadir}/gtk-doc/html/*
+# << files docs
%files devel
%defattr(-,root,root,-)
+# >> files devel
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
-
-%files docs
-%defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/*
+# << files devel
other changes:
--------------
++++++ Makefile (new)
--- Makefile
+++ Makefile
+PKG_NAME := polkit-gnome
+SPECFILE = $(addsuffix .spec, $(PKG_NAME))
+YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
+
+include /usr/share/packaging-tools/Makefile.common
+
++++++ polkit-gnome-0.94.tar.bz2 -> polkit-gnome-0.96.tar.bz2
34649 lines of diff (skipped)
++++++ polkit-gnome.yaml (new)
--- polkit-gnome.yaml
+++ polkit-gnome.yaml
+Name: polkit-gnome
+Summary: PolicyKit integration for the GNOME desktop
+Version: 0.96
+Release: 3
+Group: Applications/System
+License: LGPLv2+
+URL: http://www.freedesktop.org/wiki/Software/PolicyKit
+Sources:
+ - http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
+Description: |
+ polkit-gnome provides an authentication agent for PolicyKit
+ that matches the look and feel of the GNOME desktop.
+
+Requires:
+ - polkit >= 0.95
+PkgConfigBR:
+ - dbus-glib-1
+ - gdk-2.0
+ - gobject-introspection-1.0
+ - polkit-backend-1
+PkgBR:
+ - desktop-file-utils
+ - intltool
+Provides:
+ - PolicyKit-gnome = 0.11
+ - PolicyKit-gnome-libs = 0.11
+ - PolicyKit-authentication-agent
+Obsoletes:
+ - PolicyKit-gnome <= 0.10
+ - PolicyKit-gnome-libs <= 0.10
+Configure: configure
+ConfigOptions:
+ - --enable-gtk-doc
+ - --disable-introspection
+Builder: single-make
+LocaleName: polkit-gnome-1
+SubPackages:
+ - Name: docs
+ Summary: Development documentation for polkit-gnome
+ Group: Development/Libraries
+ Description: Development documentation for polkit-gnome.
+ Requires:
+ - "%name-devel = %{version}-%{release}"
+ - gtk-doc
+
+ - Name: devel
+ Summary: Development files for polkit-gnome
+ Group: Development/Libraries
+ Description: Development files for polkit-gnome.
+ Requires:
+ - "%name-docs = %{version}-%{release}"
+ - pkgconfig
+ - polkit-devel
+ Provides:
+ - PolicyKit-gnome-devel = 0.11
+ - PolicyKit-gnome-demo = 0.11
+ Obsoletes:
+ - PolicyKit-gnome-devel <= 0.10
+ - PolicyKit-gnome-demo <= 0.10
+
More information about the MeeGo-commits
mailing list