rpms/synaptic/devel synaptic-0.57-desktop.patch, NONE, 1.1 synaptic-0.57-firefox.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synaptic.spec, 1.11, 1.12

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore sources synaptic.spec 
Added Files:
	synaptic-0.57-desktop.patch synaptic-0.57-firefox.patch 
Log Message:
0.57.2 from Panu (#159189).

synaptic-0.57-desktop.patch:

--- NEW FILE synaptic-0.57-desktop.patch ---
--- synaptic-0.57/data/synaptic.desktop.in.dt	2005-06-08 18:59:14.000000000 +0300
+++ synaptic-0.57/data/synaptic.desktop.in	2005-07-07 15:25:00.000000000 +0300
@@ -2,11 +2,10 @@
 _Name=Synaptic Package Manager
 _GenericName=Package Manager
 _Comment=Install, remove and upgrade software packages
-Exec=gksu -u root /usr/sbin/synaptic
+Exec=synaptic
 Icon=synaptic.png
 Terminal=false
 MultipleArgs=false
 Type=Application
 Encoding=UTF-8
-Categories=PackageManager;GTK;System;Application
-NotShowIn=KDE
\ No newline at end of file
+Categories=PackageManager;GTK;System;Application;

synaptic-0.57-firefox.patch:

--- NEW FILE synaptic-0.57-firefox.patch ---
--- synaptic/gtk/rgmainwindow.cc.firefox	2005-07-12 22:24:04.000000000 +0300
+++ synaptic/gtk/rgmainwindow.cc	2005-07-12 22:24:57.000000000 +0300
@@ -2293,7 +2293,15 @@
        system("konqueror ghelp:///" PACKAGE_DATA_DIR "/gnome/help/synaptic/C/synaptic.xml &");
     }
 #endif
-   else if (is_binary_in_path("mozilla")) {
+   else if (is_binary_in_path("firefox")) {
+      // mozilla eats bookmarks when run under sudo (because it does not
+      // change $HOME) - is this needed for firefox as well?
+      if(getenv("SUDO_USER") != NULL) {
+         struct passwd *pw = getpwuid(0);
+         setenv("HOME", pw->pw_dir, 1);
+      }
+      system("firefox " PACKAGE_DATA_DIR "/synaptic/html/index.html &");
+   } else if (is_binary_in_path("mozilla")) {
       // mozilla eats bookmarks when run under sudo (because it does not
       // change $HOME)
       if(getenv("SUDO_USER") != NULL) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jan 2005 18:31:07 -0000	1.4
+++ .cvsignore	14 Jul 2005 06:26:51 -0000	1.5
@@ -1 +1 @@
-synaptic-0.55.3.tar.gz
+synaptic-0.57.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Jan 2005 18:31:07 -0000	1.4
+++ sources	14 Jul 2005 06:26:51 -0000	1.5
@@ -1 +1 @@
-cc548050f1da9207e815de284b7aee39  synaptic-0.55.3.tar.gz
+dd753e953caa053279d342e3bc269128  synaptic-0.57.2.tar.gz


Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- synaptic.spec	6 Apr 2005 22:13:32 -0000	1.11
+++ synaptic.spec	14 Jul 2005 06:26:51 -0000	1.12
@@ -2,18 +2,17 @@
 
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
-Version: 0.55.3
-Release: 3
+Version: 0.57.2
+Release: 1%{?dist}
 
 License: GPL
 Group: Applications/System
-Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz
+Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz
+Patch0: synaptic-0.57-desktop.patch
+Patch1: synaptic-0.57-firefox.patch
 URL: http://www.nongnu.org/synaptic/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: usermode-gtk
-# This isn't really a requirement mozilla works as well for a help browser,
-# however konqueror and firefox don't apparently work so...
-Requires: yelp
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0
@@ -30,9 +29,11 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .dt
+%patch1 -p1 -b .firefox
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -41,7 +42,7 @@
 %find_lang %{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-ln -s %{_bindir}/consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
 cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/synaptic
@@ -64,22 +65,16 @@
 EOF
 
 # Remove the default menu entries and install our own
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/synaptic.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig/synaptic.desktop
 
-# need to remove original Exec and fixup later as the default .desktop
-# uses gksu which isn't available
 desktop-file-install --vendor fedora 		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --mode=0644					\
   --add-category X-Fedora			\
-  --add-category Application                    \
   --add-category SystemSetup                    \
-  --remove-key=Exec				\
   data/%{name}.desktop
 
-echo "Exec=%{_bindir}/%{name}" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,6 +99,19 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Tue Jul 12 2005 Panu Matilainen <pmatilai at laiskiainen.org> 0.57.2-1
+- remove explicit yelp dependency, add support for browsing help with 
+  firefox (#163036)
+- configure with --disable-dependency-tracking
+
+* Thu Jul 07 2005 Panu Matilainen <pmatilai at laiskiainen.org> 
+- update to 0.57.2
+- remove kde-desktop file
+- correct path in desktop file
+
+* Wed Jun 29 2005 Panu Matilainen <pmatilai at laiskiainen.org> 0.57-1
+- update to 0.57
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt