rpms/smart/devel distro.py, 1.1, 1.2 smart.desktop, 1.1, 1.2 smart.spec, 1.10, 1.11

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/devel

Modified Files:
	distro.py smart.desktop smart.spec 
Log Message:
Several fixes, see #205034.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/distro.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro.py	10 Apr 2006 17:22:47 -0000	1.1
+++ distro.py	25 Nov 2006 16:30:35 -0000	1.2
@@ -5,7 +5,7 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
+    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
         pkgconf.setFlag("multi-version", "kernel%s" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)


Index: smart.desktop
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.desktop	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.desktop	25 Nov 2006 16:30:35 -0000	1.2
@@ -4,10 +4,9 @@
 Name[pt_BR]=Gerenciador de Pacotes Smart
 Comment=Next generation package handling tool
 Comment[pt_BR]=Gerenciador de pacotes de próxima geração
-Icon=smart.png
+Icon=smart
 Exec=smart-root --gui
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Application;System;
-X-Desktop-File-Install-Version=0.2
+Categories=System;PackageManager;GTK;


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smart.spec	30 Sep 2006 09:29:31 -0000	1.10
+++ smart.spec	25 Nov 2006 16:30:35 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.42
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,6 +17,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
+
 BuildRequires: autoconf, automake, gettext, gcc-c++
 BuildRequires: libXt-devel, libXext-devel
 BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
@@ -24,6 +25,7 @@
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
+
 Requires: smart-config
 
 %description
@@ -44,6 +46,7 @@
 Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
+Provides: smart-gtk = %{version}-%{release}
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -72,7 +75,7 @@
 # ksmarttray
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure
+%configure --disable-rpath
 make
 popd
 
@@ -88,11 +91,11 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
 # ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot}
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE5}
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -106,14 +109,13 @@
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE3}
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
 
-mkdir -p  %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 smart/interfaces/images/smart.png \
-    %{buildroot}%{_datadir}/pixmaps/smart.png
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 # distro.py and distro.d support
 install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
@@ -157,8 +159,8 @@
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
-%{_datadir}/applications/*-smart.desktop
-%{_datadir}/pixmaps/smart.png
+%{_datadir}/applications/smart.desktop
+%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 %{_bindir}/smart-root
 %config %{_sysconfdir}/security/console.apps/smart-root
@@ -168,9 +170,18 @@
 %defattr(-,root,root,-)
 %{_bindir}/ksmarttray
 %{_datadir}/apps/ksmarttray
-%{_datadir}/applications/*-ksmarttray.desktop
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
+* Sat Nov 25 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.42-40
+- Start preparing virtual provides for upcoming qt gui.
+
+* Sat Nov 25 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Flag -xen and -PAE kernels as multi-version.
+- Update desktop entry categories and icon installation paths.
+- Avoid lib64 RPATHs in ksmarttray, fix menu icon.
+
 * Sat Sep 30 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.42-39
 - Fix the autofs5 patch.