From hadess at fedoraproject.org Sun Nov 1 00:31:12 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Sun, 1 Nov 2009 00:31:12 +0000 (UTC) Subject: rpms/bluez/F-12 .cvsignore, 1.50, 1.51 bluez.spec, 1.102, 1.103 sources, 1.50, 1.51 Message-ID: <20091101003113.04BAA11C00EF@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8794 Modified Files: .cvsignore bluez.spec sources Log Message: * Sun Nov 01 2009 Bastien Nocera 4.57-1 - Update to 4.57 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-12/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- .cvsignore 10 Oct 2009 12:32:53 -0000 1.50 +++ .cvsignore 1 Nov 2009 00:31:11 -0000 1.51 @@ -1 +1 @@ -bluez-4.56.tar.gz +bluez-4.57.tar.gz Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-12/bluez.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -p -r1.102 -r1.103 --- bluez.spec 10 Oct 2009 12:32:53 -0000 1.102 +++ bluez.spec 1 Nov 2009 00:31:11 -0000 1.103 @@ -1,6 +1,6 @@ Summary: Bluetooth utilities Name: bluez -Version: 4.56 +Version: 4.57 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -272,6 +272,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/pand %changelog +* Sun Nov 01 2009 Bastien Nocera 4.57-1 +- Update to 4.57 + * Sat Oct 10 2009 Bastien Nocera 4.56-1 - Update to 4.56 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-12/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- sources 10 Oct 2009 12:32:53 -0000 1.50 +++ sources 1 Nov 2009 00:31:11 -0000 1.51 @@ -1 +1 @@ -92ea2e86a5489f0d16567920f2ec9b36 bluez-4.56.tar.gz +dc29e54f1204ac4215caeeee062b26f6 bluez-4.57.tar.gz From mclasen at fedoraproject.org Sun Nov 1 00:51:46 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Sun, 1 Nov 2009 00:51:46 +0000 (UTC) Subject: rpms/gdm/F-12 0001-Don-t-show-lock-screen-option-if-locked-down.patch, 1.1, 1.2 gdm.spec, 1.516, 1.517 Message-ID: <20091101005146.4C95011C0376@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gdm/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14099 Modified Files: 0001-Don-t-show-lock-screen-option-if-locked-down.patch gdm.spec Log Message: better patch 0001-Don-t-show-lock-screen-option-if-locked-down.patch: applet.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) Index: 0001-Don-t-show-lock-screen-option-if-locked-down.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/F-12/0001-Don-t-show-lock-screen-option-if-locked-down.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- 0001-Don-t-show-lock-screen-option-if-locked-down.patch 31 Oct 2009 23:43:22 -0000 1.1 +++ 0001-Don-t-show-lock-screen-option-if-locked-down.patch 1 Nov 2009 00:51:44 -0000 1.2 @@ -1,18 +1,6 @@ -From 8b03661e8fe3cb7ad2785c935fd0920f44d32138 Mon Sep 17 00:00:00 2001 -From: William Jon McCann -Date: Wed, 28 Oct 2009 19:18:50 -0400 -Subject: [PATCH 01/12] Don't show lock screen option if locked down - -Also fix up some other silliness -Fixes https://bugzilla.gnome.org/show_bug.cgi?id=599962 ---- - gui/user-switch-applet/applet.c | 30 ++++++++++++++++++++++++------ - 1 files changed, 24 insertions(+), 6 deletions(-) - -diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c -index 66897c0..a72997b 100644 ---- a/gui/user-switch-applet/applet.c -+++ b/gui/user-switch-applet/applet.c +diff -up gdm-2.28.1/gui/user-switch-applet/applet.c.dont-show-lock-screen-if-locked-down gdm-2.28.1/gui/user-switch-applet/applet.c +--- gdm-2.28.1/gui/user-switch-applet/applet.c.dont-show-lock-screen-if-locked-down 2009-10-19 18:12:45.000000000 -0400 ++++ gdm-2.28.1/gui/user-switch-applet/applet.c 2009-10-31 19:57:21.700544070 -0400 @@ -44,7 +44,9 @@ #include "gdm-entry-menu-item.h" @@ -24,36 +12,50 @@ index 66897c0..a72997b 100644 typedef enum { GSM_PRESENCE_STATUS_AVAILABLE = 0, -@@ -1163,7 +1165,7 @@ create_sub_menu (GdmAppletData *adata) +@@ -1163,7 +1165,11 @@ create_sub_menu (GdmAppletData *adata) G_CALLBACK (menuitem_style_set_cb), adata); g_signal_connect (adata->lock_screen_item, "activate", G_CALLBACK (on_lock_screen_activate), adata); - gtk_widget_show (adata->lock_screen_item); -+ /* Only show if not locked down */ ++ if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) { ++ gtk_widget_hide (adata->lock_screen_item); ++ } else { ++ gtk_widget_show (adata->lock_screen_item); ++ } adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Switch User")); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item), -@@ -1229,12 +1231,18 @@ client_notify_lockdown_func (GConfClient *client, +@@ -1174,7 +1180,7 @@ create_sub_menu (GdmAppletData *adata) + G_CALLBACK (menuitem_style_set_cb), adata); + g_signal_connect (adata->login_screen_item, "activate", + G_CALLBACK (on_login_screen_activate), adata); +- /* Only show switch user if there are other users */ ++ update_switch_user (adata); + + adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quit...")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->quit_session_item), +@@ -1229,11 +1235,17 @@ client_notify_lockdown_func (GConfClient return; } - if (strcmp (key, LOCKDOWN_KEY) == 0) { + if (strcmp (key, LOCKDOWN_USER_SWITCHING_KEY) == 0) { if (gconf_value_get_bool (value)) { - set_menu_visibility (adata, FALSE); +- set_menu_visibility (adata, FALSE); ++ gtk_widget_hide (adata->login_screen_item); } else { - set_menu_visibility (adata, TRUE); - } +- set_menu_visibility (adata, TRUE); ++ gtk_widget_show (adata->login_screen_item); ++ } + } else if (strcmp (key, LOCKDOWN_LOCK_SCREEN_KEY) == 0) { + if (gconf_value_get_bool (value)) { + gtk_widget_hide (adata->lock_screen_item); + } else { + gtk_widget_show (adata->lock_screen_item); -+ } + } } } - -@@ -1430,7 +1438,7 @@ fill_applet (PanelApplet *applet) +@@ -1430,7 +1442,7 @@ fill_applet (PanelApplet *applet) /* Hide the admin context menu items if locked down or no cmd-line */ if (gconf_client_get_bool (adata->client, @@ -62,7 +64,7 @@ index 66897c0..a72997b 100644 NULL) || panel_applet_get_locked_down (applet)) { bonobo_ui_component_set_prop (popup_component, -@@ -1502,18 +1510,28 @@ fill_applet (PanelApplet *applet) +@@ -1502,14 +1514,19 @@ fill_applet (PanelApplet *applet) adata->manager = gdm_user_manager_ref_default (); setup_current_user (adata); @@ -84,15 +86,3 @@ index 66897c0..a72997b 100644 set_menu_visibility (adata, FALSE); } else { set_menu_visibility (adata, TRUE); - } -+ if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) { -+ gtk_widget_hide (adata->lock_screen_item); -+ } else { -+ gtk_widget_show (adata->lock_screen_item); -+ } - - error = NULL; - bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); --- -1.6.5.1 - Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v retrieving revision 1.516 retrieving revision 1.517 diff -u -p -r1.516 -r1.517 --- gdm.spec 31 Oct 2009 23:43:22 -0000 1.516 +++ gdm.spec 1 Nov 2009 00:51:45 -0000 1.517 @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager Name: gdm Version: 2.28.1 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -419,7 +419,7 @@ fi %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so %changelog -* Sat Oct 31 2009 Matthias Clasen 2.28.1-19 +* Sat Oct 31 2009 Matthias Clasen 2.28.1-20 - Don't show 'Lock Screen' in the user switcher if locked down * Sat Oct 31 2009 Matthias Clasen 2.28.1-18 From rdieter at fedoraproject.org Sun Nov 1 01:03:33 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 1 Nov 2009 01:03:33 +0000 (UTC) Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.22, 1.23 kdeplasma-addons.spec, 1.70, 1.71 sources, 1.21, 1.22 kdeplasma-addons-4.3.2-microblog_twitter.patch, 1.2, NONE Message-ID: <20091101010333.93D8211C00EF@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeplasma-addons/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17333 Modified Files: .cvsignore kdeplasma-addons.spec sources Removed Files: kdeplasma-addons-4.3.2-microblog_twitter.patch Log Message: * Sat Oct 31 2009 Rex Dieter - 4.3.3-1 - 4.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- .cvsignore 7 Oct 2009 12:09:08 -0000 1.22 +++ .cvsignore 1 Nov 2009 01:03:29 -0000 1.23 @@ -1 +1 @@ -kdeplasma-addons-4.3.2.tar.bz2 +kdeplasma-addons-4.3.3.tar.bz2 Index: kdeplasma-addons.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- kdeplasma-addons.spec 26 Oct 2009 16:08:40 -0000 1.70 +++ kdeplasma-addons.spec 1 Nov 2009 01:03:30 -0000 1.71 @@ -1,6 +1,7 @@ + Name: kdeplasma-addons -Version: 4.3.2 -Release: 5%{?dist} +Version: 4.3.3 +Release: 1%{?dist} Summary: Additional plasmoids for KDE Group: User Interface/Desktops @@ -15,7 +16,6 @@ BuildRoot: %{_tmppath}/%{name}-%{ve Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch ## upstream patches -Patch100: kdeplasma-addons-4.3.2-microblog_twitter.patch BuildRequires: boost-devel BuildRequires: gettext @@ -79,7 +79,6 @@ Files for developing applications using %setup -q -n kdeplasma-addons-%{version} %patch51 -p1 -b .krunner_contacts_not_enabledbydefault -%patch100 -p4 -b .microblog_twitter %build @@ -164,6 +163,9 @@ rm -rf %{buildroot} %changelog +* Sat Oct 31 2009 Rex Dieter - 4.3.3-1 +- 4.3.3 + * Mon Oct 26 2009 Than Ngo - 4.3.2-5 - remove duplicate BR on eigen2-devel Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 5 Oct 2009 15:04:15 -0000 1.21 +++ sources 1 Nov 2009 01:03:30 -0000 1.22 @@ -1 +1 @@ -ef545d02cc484d226dc6a580be11a370 kdeplasma-addons-4.3.2.tar.bz2 +f034c8ded22fd0029b3b4b687774c757 kdeplasma-addons-4.3.3.tar.bz2 --- kdeplasma-addons-4.3.2-microblog_twitter.patch DELETED --- From rdieter at fedoraproject.org Sun Nov 1 01:06:26 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 1 Nov 2009 01:06:26 +0000 (UTC) Subject: rpms/kdesdk/devel .cvsignore, 1.66, 1.67 kdesdk.spec, 1.152, 1.153 sources, 1.66, 1.67 kdesdk-4.3.2-kompare-regression.patch, 1.1, NONE Message-ID: <20091101010626.6555411C029D@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdesdk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18222 Modified Files: .cvsignore kdesdk.spec sources Removed Files: kdesdk-4.3.2-kompare-regression.patch Log Message: * Sat Oct 31 2009 Rex Dieter - 4.3.3-1 - 4.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/.cvsignore,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- .cvsignore 7 Oct 2009 12:10:42 -0000 1.66 +++ .cvsignore 1 Nov 2009 01:06:24 -0000 1.67 @@ -1 +1 @@ -kdesdk-4.3.2.tar.bz2 +kdesdk-4.3.3.tar.bz2 Index: kdesdk.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -p -r1.152 -r1.153 --- kdesdk.spec 11 Oct 2009 17:03:17 -0000 1.152 +++ kdesdk.spec 1 Nov 2009 01:06:25 -0000 1.153 @@ -1,6 +1,7 @@ + Name: kdesdk -Version: 4.3.2 -Release: 2%{?dist} +Version: 4.3.3 +Release: 1%{?dist} Summary: The KDE Software Development Kit (SDK) Group: User Interface/Desktops @@ -8,9 +9,6 @@ Group: User Interface/Desktops License: GPLv2 URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 -# Kompare regression due to a typo in the patch for kde#139209 -# fix from upstream 4.3 branch, will be fixed upstream in 4.3.3 -Patch100: kdesdk-4.3.2-kompare-regression.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # upstream patches @@ -80,7 +78,6 @@ xml2pot %prep %setup -q -%patch100 -p0 -b .kompare-regression %build @@ -229,6 +226,9 @@ fi %changelog +* Sat Oct 31 2009 Rex Dieter - 4.3.3-1 +- 4.3.3 + * Sun Oct 11 2009 Kevin Kofler - 4.3.2-2 - Fix Kompare diff parsing regression (due to a typo in a bugfix) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdesdk/devel/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- sources 5 Oct 2009 15:12:17 -0000 1.66 +++ sources 1 Nov 2009 01:06:25 -0000 1.67 @@ -1 +1 @@ -326da443b4fed01141f7954464678de2 kdesdk-4.3.2.tar.bz2 +0e0aca0f1f13d877918fb49540443e1b kdesdk-4.3.3.tar.bz2 --- kdesdk-4.3.2-kompare-regression.patch DELETED --- From rdieter at fedoraproject.org Sun Nov 1 01:13:44 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 1 Nov 2009 01:13:44 +0000 (UTC) Subject: rpms/kdetoys/devel .cvsignore, 1.43, 1.44 kdetoys.spec, 1.60, 1.61 sources, 1.39, 1.40 Message-ID: <20091101011344.781AE11C00EF@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdetoys/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20574 Modified Files: .cvsignore kdetoys.spec sources Log Message: * Sat Oct 31 2009 Rex Dieter - 4.3.3-1 - 4.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- .cvsignore 7 Oct 2009 12:41:26 -0000 1.43 +++ .cvsignore 1 Nov 2009 01:13:43 -0000 1.44 @@ -1 +1 @@ -kdetoys-4.3.2.tar.bz2 +kdetoys-4.3.3.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- kdetoys.spec 5 Oct 2009 15:16:06 -0000 1.60 +++ kdetoys.spec 1 Nov 2009 01:13:43 -0000 1.61 @@ -1,7 +1,8 @@ + Name: kdetoys Summary: K Desktop Environment - Toys and Amusements Epoch: 7 -Version: 4.3.2 +Version: 4.3.3 Release: 1%{?dist} License: GPLv2 @@ -17,8 +18,6 @@ BuildRequires: kdebase-workspace-devel > Requires: kdelibs4 >= %{version} #Requires: kdebase-workspace -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig # FIXME: Don't list / drop kweather? It isn't really working as far as I can @@ -56,14 +55,12 @@ rm -rf %{buildroot} %post -/sbin/ldconfig touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: %posttrans gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: %postun -/sbin/ldconfig if [ $1 -eq 0 ] ; then touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: @@ -86,6 +83,9 @@ fi %changelog +* Sat Oct 31 2009 Rex Dieter - 4.3.3-1 +- 4.3.3 + * Mon Oct 05 2009 Than Ngo - 4.3.2-1 - 4.3.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdetoys/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- sources 5 Oct 2009 15:16:06 -0000 1.39 +++ sources 1 Nov 2009 01:13:43 -0000 1.40 @@ -1 +1 @@ -a4496c504940f076997e553f257e4b3d kdetoys-4.3.2.tar.bz2 +1a40a60cc6712b744bd987b9278c9b27 kdetoys-4.3.3.tar.bz2 From rdieter at fedoraproject.org Sun Nov 1 01:15:57 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 1 Nov 2009 01:15:57 +0000 (UTC) Subject: rpms/kdeutils/devel .cvsignore, 1.71, 1.72 kdeutils.spec, 1.197, 1.198 sources, 1.70, 1.71 Message-ID: <20091101011557.3D7E911C00EF@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kdeutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21214 Modified Files: .cvsignore kdeutils.spec sources Log Message: * Sat Oct 31 2009 Rex Dieter - 4.3.3-1 - 4.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -p -r1.71 -r1.72 --- .cvsignore 7 Oct 2009 12:42:54 -0000 1.71 +++ .cvsignore 1 Nov 2009 01:15:56 -0000 1.72 @@ -1 +1 @@ -kdeutils-4.3.2.tar.bz2 +kdeutils-4.3.3.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -p -r1.197 -r1.198 --- kdeutils.spec 5 Oct 2009 15:35:26 -0000 1.197 +++ kdeutils.spec 1 Nov 2009 01:15:56 -0000 1.198 @@ -1,10 +1,11 @@ + %if 0%{?fedora} %define printer_applet 1 %endif Name: kdeutils Epoch: 6 -Version: 4.3.2 +Version: 4.3.3 Release: 1%{?dist} Summary: K Desktop Environment - Utilities @@ -215,6 +216,9 @@ fi %changelog +* Sat Oct 31 2009 Rex Dieter - 4.3.3-1 +- 4.3.3 + * Mon Oct 05 2009 Than Ngo - 4.3.2-1 - 4.3.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kdeutils/devel/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- sources 5 Oct 2009 15:31:54 -0000 1.70 +++ sources 1 Nov 2009 01:15:56 -0000 1.71 @@ -1 +1 @@ -b5e72292ed1504f8ee5a82a388af3b04 kdeutils-4.3.2.tar.bz2 +f3a587fa319d01f5305ef746933f3fb3 kdeutils-4.3.3.tar.bz2 From fengyu at fedoraproject.org Sun Nov 1 01:59:30 2009 From: fengyu at fedoraproject.org (Yu Feng) Date: Sun, 1 Nov 2009 01:59:30 +0000 (UTC) Subject: rpms/gnome-globalmenu/F-11 .cvsignore, 1.2, 1.3 gnome-globalmenu.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101015930.4EC8611C00EF@cvs1.fedora.phx.redhat.com> Author: fengyu Update of /cvs/pkgs/rpms/gnome-globalmenu/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31460 Modified Files: .cvsignore gnome-globalmenu.spec sources Log Message: Update to 0.7.8. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-globalmenu/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 27 Oct 2009 01:54:52 -0000 1.2 +++ .cvsignore 1 Nov 2009 01:59:28 -0000 1.3 @@ -1 +1 @@ -gnome-globalmenu-0.7.7_1.tar.bz2 +gnome-globalmenu-0.7.8.tar.bz2 Index: gnome-globalmenu.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-globalmenu/F-11/gnome-globalmenu.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- gnome-globalmenu.spec 27 Oct 2009 01:54:52 -0000 1.1 +++ gnome-globalmenu.spec 1 Nov 2009 01:59:28 -0000 1.2 @@ -1,15 +1,14 @@ -%global base_version 0.7.7_1 %global pkgdocdir %{_docdir}/%{name}-%{version} #%define alphatag 20080418svn2511 Name: gnome-globalmenu -Version: %{base_version} +Version: 0.7.8 Release: 1%{?dist} Summary: Global Menu for GNOME Group: User Interface/Desktops License: GPLv2 and LGPLv2 URL: http://code.google.com/p/gnome2-globalmenu/ -Source0: http://gnome2-globalmenu.googlecode.com/files/gnome-globalmenu-%{base_version}.tar.bz2 +Source0: http://gnome2-globalmenu.googlecode.com/files/gnome-globalmenu-%{version}.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX) BuildRequires: libwnck-devel BuildRequires: intltool @@ -82,7 +81,7 @@ for post installation configuations. %endif %prep -%setup -q -n %{name}-%{base_version} +%setup -q -n %{name}-%{version} %build @@ -103,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/modules/libglobalmenu-gnome.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/modules/libgnomenu-panel.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libgnomenu.la rm -f $RPM_BUILD_ROOT/%{pkgdocdir}/INSTALL @@ -136,11 +136,10 @@ fi %defattr(-,root,root,-) %doc %{pkgdocdir}/* %{_datadir}/pixmaps/globalmenu.png -%{_libdir}/libgnomenu-%{base_version}.so.2 -%{_libdir}/libgnomenu-%{base_version}.so.2.0.0 +%{_libdir}/libgnomenu.so.* %{_mandir}/man1/gnome-globalmenu.1.gz %{_libdir}/gtk-2.0/modules/libglobalmenu-gnome.so -%{_libdir}/gtk-2.0/modules/libglobalmenu-gnome-%{base_version}.so +%{_libdir}/gtk-2.0/modules/libgnomenu-panel.so %files devel %defattr(-,root,root,-) @@ -164,6 +163,9 @@ fi %endif %changelog +* Sat Jun 27 2009 Yu Feng - 0.7.8-1 +- Update to 0.7.8 + * Sat Jun 27 2009 Yu Feng - 0.7.6-1 - Update to 0.7.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-globalmenu/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 27 Oct 2009 01:54:52 -0000 1.2 +++ sources 1 Nov 2009 01:59:28 -0000 1.3 @@ -1 +1 @@ -dfb7fb431ca595c60eb8a9c03f2dd4d3 gnome-globalmenu-0.7.7_1.tar.bz2 +c2900eb3ff345457f65d9be2793cc2dc gnome-globalmenu-0.7.8.tar.bz2 From fengyu at fedoraproject.org Sun Nov 1 02:05:21 2009 From: fengyu at fedoraproject.org (Yu Feng) Date: Sun, 1 Nov 2009 02:05:21 +0000 (UTC) Subject: rpms/gnome-globalmenu/F-12 .cvsignore, 1.2, 1.3 gnome-globalmenu.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101020521.DC09B11C00EF@cvs1.fedora.phx.redhat.com> Author: fengyu Update of /cvs/pkgs/rpms/gnome-globalmenu/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv377 Modified Files: .cvsignore gnome-globalmenu.spec sources Log Message: Update to 0.7.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-globalmenu/F-12/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 27 Oct 2009 01:54:52 -0000 1.2 +++ .cvsignore 1 Nov 2009 02:05:20 -0000 1.3 @@ -1 +1 @@ -gnome-globalmenu-0.7.7_1.tar.bz2 +gnome-globalmenu-0.7.8.tar.bz2 Index: gnome-globalmenu.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-globalmenu/F-12/gnome-globalmenu.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- gnome-globalmenu.spec 27 Oct 2009 01:54:52 -0000 1.1 +++ gnome-globalmenu.spec 1 Nov 2009 02:05:20 -0000 1.2 @@ -1,15 +1,14 @@ -%global base_version 0.7.7_1 %global pkgdocdir %{_docdir}/%{name}-%{version} #%define alphatag 20080418svn2511 Name: gnome-globalmenu -Version: %{base_version} +Version: 0.7.8 Release: 1%{?dist} Summary: Global Menu for GNOME Group: User Interface/Desktops License: GPLv2 and LGPLv2 URL: http://code.google.com/p/gnome2-globalmenu/ -Source0: http://gnome2-globalmenu.googlecode.com/files/gnome-globalmenu-%{base_version}.tar.bz2 +Source0: http://gnome2-globalmenu.googlecode.com/files/gnome-globalmenu-%{version}.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX) BuildRequires: libwnck-devel BuildRequires: intltool @@ -82,7 +81,7 @@ for post installation configuations. %endif %prep -%setup -q -n %{name}-%{base_version} +%setup -q -n %{name}-%{version} %build @@ -103,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/modules/libglobalmenu-gnome.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/modules/libgnomenu-panel.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libgnomenu.la rm -f $RPM_BUILD_ROOT/%{pkgdocdir}/INSTALL @@ -136,11 +136,10 @@ fi %defattr(-,root,root,-) %doc %{pkgdocdir}/* %{_datadir}/pixmaps/globalmenu.png -%{_libdir}/libgnomenu-%{base_version}.so.2 -%{_libdir}/libgnomenu-%{base_version}.so.2.0.0 +%{_libdir}/libgnomenu.so.* %{_mandir}/man1/gnome-globalmenu.1.gz %{_libdir}/gtk-2.0/modules/libglobalmenu-gnome.so -%{_libdir}/gtk-2.0/modules/libglobalmenu-gnome-%{base_version}.so +%{_libdir}/gtk-2.0/modules/libgnomenu-panel.so %files devel %defattr(-,root,root,-) @@ -164,6 +163,9 @@ fi %endif %changelog +* Sat Jun 27 2009 Yu Feng - 0.7.8-1 +- Update to 0.7.8 + * Sat Jun 27 2009 Yu Feng - 0.7.6-1 - Update to 0.7.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-globalmenu/F-12/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 27 Oct 2009 01:54:52 -0000 1.2 +++ sources 1 Nov 2009 02:05:20 -0000 1.3 @@ -1 +1 @@ -dfb7fb431ca595c60eb8a9c03f2dd4d3 gnome-globalmenu-0.7.7_1.tar.bz2 +c2900eb3ff345457f65d9be2793cc2dc gnome-globalmenu-0.7.8.tar.bz2 From rdieter at fedoraproject.org Sun Nov 1 02:18:33 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 1 Nov 2009 02:18:33 +0000 (UTC) Subject: rpms/kde-l10n/devel .cvsignore, 1.31, 1.32 kde-l10n.spec, 1.99, 1.100 sources, 1.34, 1.35 Message-ID: <20091101021833.77DB011C00EF@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-l10n/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4571 Modified Files: .cvsignore kde-l10n.spec sources Log Message: first try at 4.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- .cvsignore 6 Oct 2009 12:26:20 -0000 1.31 +++ .cvsignore 1 Nov 2009 02:18:31 -0000 1.32 @@ -1,57 +1,59 @@ -kde-l10n-ar-4.3.2.tar.bz2 -kde-l10n-bg-4.3.2.tar.bz2 -kde-l10n-bn_IN-4.3.2.tar.bz2 -kde-l10n-ca-4.3.2.tar.bz2 -kde-l10n-csb-4.3.2.tar.bz2 -kde-l10n-cs-4.3.2.tar.bz2 -kde-l10n-da-4.3.2.tar.bz2 -kde-l10n-de-4.3.2.tar.bz2 -kde-l10n-el-4.3.2.tar.bz2 -kde-l10n-en_GB-4.3.2.tar.bz2 -kde-l10n-es-4.3.2.tar.bz2 -kde-l10n-et-4.3.2.tar.bz2 -kde-l10n-eu-4.3.2.tar.bz2 -kde-l10n-fi-4.3.2.tar.bz2 -kde-l10n-fr-4.3.2.tar.bz2 -kde-l10n-ga-4.3.2.tar.bz2 -kde-l10n-gl-4.3.2.tar.bz2 -kde-l10n-gu-4.3.2.tar.bz2 -kde-l10n-he-4.3.2.tar.bz2 -kde-l10n-hi-4.3.2.tar.bz2 -kde-l10n-hr-4.3.2.tar.bz2 -kde-l10n-hu-4.3.2.tar.bz2 -kde-l10n-is-4.3.2.tar.bz2 -kde-l10n-it-4.3.2.tar.bz2 -kde-l10n-ja-4.3.2.tar.bz2 -kde-l10n-kk-4.3.2.tar.bz2 -kde-l10n-km-4.3.2.tar.bz2 -kde-l10n-kn-4.3.2.tar.bz2 -kde-l10n-ko-4.3.2.tar.bz2 -kde-l10n-ku-4.3.2.tar.bz2 -kde-l10n-lt-4.3.2.tar.bz2 -kde-l10n-lv-4.3.2.tar.bz2 -kde-l10n-mai-4.3.2.tar.bz2 -kde-l10n-mk-4.3.2.tar.bz2 -kde-l10n-ml-4.3.2.tar.bz2 -kde-l10n-mr-4.3.2.tar.bz2 -kde-l10n-nb-4.3.2.tar.bz2 -kde-l10n-nds-4.3.2.tar.bz2 -kde-l10n-nl-4.3.2.tar.bz2 -kde-l10n-nn-4.3.2.tar.bz2 -kde-l10n-pa-4.3.2.tar.bz2 -kde-l10n-pl-4.3.2.tar.bz2 -kde-l10n-pt_BR-4.3.2.tar.bz2 -kde-l10n-pt-4.3.2.tar.bz2 -kde-l10n-ro-4.3.2.tar.bz2 -kde-l10n-ru-4.3.2.tar.bz2 -kde-l10n-sk-4.3.2.tar.bz2 -kde-l10n-sl-4.3.2.tar.bz2 -kde-l10n-sr-4.3.2.tar.bz2 -kde-l10n-sv-4.3.2.tar.bz2 -kde-l10n-tg-4.3.2.tar.bz2 -kde-l10n-th-4.3.2.tar.bz2 -kde-l10n-tr-4.3.2.tar.bz2 -kde-l10n-uk-4.3.2.tar.bz2 -kde-l10n-wa-4.3.2.tar.bz2 -kde-l10n-zh_CN-4.3.2.tar.bz2 -kde-l10n-zh_TW-4.3.2.tar.bz2 +kde-l10n-ar-4.3.3.tar.bz2 +kde-l10n-bg-4.3.3.tar.bz2 +kde-l10n-bn_IN-4.3.3.tar.bz2 +kde-l10n-ca-4.3.3.tar.bz2 +kde-l10n-cs-4.3.3.tar.bz2 +kde-l10n-csb-4.3.3.tar.bz2 +kde-l10n-da-4.3.3.tar.bz2 +kde-l10n-de-4.3.3.tar.bz2 +kde-l10n-el-4.3.3.tar.bz2 +kde-l10n-en_GB-4.3.3.tar.bz2 +kde-l10n-es-4.3.3.tar.bz2 +kde-l10n-et-4.3.3.tar.bz2 +kde-l10n-eu-4.3.3.tar.bz2 +kde-l10n-fi-4.3.3.tar.bz2 +kde-l10n-fr-4.3.3.tar.bz2 +kde-l10n-fy-4.3.3.tar.bz2 +kde-l10n-ga-4.3.3.tar.bz2 +kde-l10n-gl-4.3.3.tar.bz2 +kde-l10n-gu-4.3.3.tar.bz2 +kde-l10n-he-4.3.3.tar.bz2 +kde-l10n-hi-4.3.3.tar.bz2 +kde-l10n-hne-4.3.3.tar.bz2 +kde-l10n-hr-4.3.3.tar.bz2 +kde-l10n-hu-4.3.3.tar.bz2 +kde-l10n-is-4.3.3.tar.bz2 +kde-l10n-it-4.3.3.tar.bz2 +kde-l10n-ja-4.3.3.tar.bz2 +kde-l10n-kk-4.3.3.tar.bz2 +kde-l10n-km-4.3.3.tar.bz2 +kde-l10n-kn-4.3.3.tar.bz2 +kde-l10n-ko-4.3.3.tar.bz2 +kde-l10n-ku-4.3.3.tar.bz2 +kde-l10n-lt-4.3.3.tar.bz2 +kde-l10n-lv-4.3.3.tar.bz2 +kde-l10n-mai-4.3.3.tar.bz2 +kde-l10n-mk-4.3.3.tar.bz2 +kde-l10n-ml-4.3.3.tar.bz2 +kde-l10n-mr-4.3.3.tar.bz2 +kde-l10n-nb-4.3.3.tar.bz2 +kde-l10n-nds-4.3.3.tar.bz2 +kde-l10n-nl-4.3.3.tar.bz2 +kde-l10n-nn-4.3.3.tar.bz2 +kde-l10n-pa-4.3.3.tar.bz2 +kde-l10n-pl-4.3.3.tar.bz2 +kde-l10n-pt-4.3.3.tar.bz2 +kde-l10n-pt_BR-4.3.3.tar.bz2 +kde-l10n-ro-4.3.3.tar.bz2 +kde-l10n-ru-4.3.3.tar.bz2 +kde-l10n-sk-4.3.3.tar.bz2 +kde-l10n-sl-4.3.3.tar.bz2 +kde-l10n-sr-4.3.3.tar.bz2 +kde-l10n-sv-4.3.3.tar.bz2 +kde-l10n-tg-4.3.3.tar.bz2 +kde-l10n-th-4.3.3.tar.bz2 +kde-l10n-tr-4.3.3.tar.bz2 +kde-l10n-uk-4.3.3.tar.bz2 +kde-l10n-wa-4.3.3.tar.bz2 +kde-l10n-zh_CN-4.3.3.tar.bz2 +kde-l10n-zh_TW-4.3.3.tar.bz2 Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -p -r1.99 -r1.100 --- kde-l10n.spec 6 Oct 2009 10:44:28 -0000 1.99 +++ kde-l10n.spec 1 Nov 2009 02:18:32 -0000 1.100 @@ -1,7 +1,8 @@ + %define buildall 0 Name: kde-l10n -Version: 4.3.2 +Version: 4.3.3 Release: 1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE @@ -1503,6 +1504,9 @@ rm -rf %{buildroot} %changelog +* Sat Oct 31 2009 Rex Dieter - 4.3.3-1 +- 4.3.3 + * Mon Oct 05 2009 Than Ngo - 4.3.2-1 - 4.3.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- sources 5 Oct 2009 16:13:58 -0000 1.34 +++ sources 1 Nov 2009 02:18:32 -0000 1.35 @@ -1,57 +1,59 @@ -845a87a6fb8e274b9faf2b3e8ae05145 kde-l10n-ar-4.3.2.tar.bz2 -3330acdacb9ea687b3c883c5e175f3d7 kde-l10n-bg-4.3.2.tar.bz2 -3a646527d0d0a403797099787c987d12 kde-l10n-bn_IN-4.3.2.tar.bz2 -0df7312f62deabb6231135bc33f11f7a kde-l10n-ca-4.3.2.tar.bz2 -d80aa0c3f1ff780328d3ac482da5d5aa kde-l10n-csb-4.3.2.tar.bz2 -5e8218126b5529e6198a8fc4677ab2ed kde-l10n-cs-4.3.2.tar.bz2 -5cd8285c55d39c0d74f74bdda3634f69 kde-l10n-da-4.3.2.tar.bz2 -af19e1c28b6cb27ae6928f9080ff67bc kde-l10n-de-4.3.2.tar.bz2 -0f23ad4490306b55e2382883a3d03fae kde-l10n-el-4.3.2.tar.bz2 -82fcc17d3927235cff6c683b12bfc46c kde-l10n-en_GB-4.3.2.tar.bz2 -997dd53c79aceea07ba1f46b81edb1f3 kde-l10n-es-4.3.2.tar.bz2 -7528c8189ed344e129ca87474c908d7b kde-l10n-et-4.3.2.tar.bz2 -c313a881d5d4275e78da42624c7d2b72 kde-l10n-eu-4.3.2.tar.bz2 -9bfd2944045e87b005f6c67e6f70b228 kde-l10n-fi-4.3.2.tar.bz2 -ef7f3a2bcc29b31af739265a70cd01e2 kde-l10n-fr-4.3.2.tar.bz2 -2763e1ad527205160997684e8fdba0a0 kde-l10n-ga-4.3.2.tar.bz2 -a8056265e3838efca737abd6986718be kde-l10n-gl-4.3.2.tar.bz2 -592322e3f755067c9bff960fb96948e2 kde-l10n-gu-4.3.2.tar.bz2 -02d68df9f8717d277a384b15d372aeed kde-l10n-he-4.3.2.tar.bz2 -bc4225d8eeb2c648354eec1a79bb3558 kde-l10n-hi-4.3.2.tar.bz2 -2628f02cb3e1fd20d678437101470645 kde-l10n-hr-4.3.2.tar.bz2 -3ccdb46e3005bde325c45334d0073470 kde-l10n-hu-4.3.2.tar.bz2 -900a15881c7377f7921bbb0df3caf729 kde-l10n-is-4.3.2.tar.bz2 -3cfbb949b349a906f57def2c89f2c2ae kde-l10n-it-4.3.2.tar.bz2 -1ca9a0e6f75ef439b1dc88d7c296a8a3 kde-l10n-ja-4.3.2.tar.bz2 -791fb8901976bbc36b39ec2b2d7f6029 kde-l10n-kk-4.3.2.tar.bz2 -81715c650925f13710a8d1b392bebe12 kde-l10n-km-4.3.2.tar.bz2 -042925c6ed9cadc79724bee269ee0f65 kde-l10n-kn-4.3.2.tar.bz2 -7d647e695d3d2876a7e13505b031d5db kde-l10n-ko-4.3.2.tar.bz2 -15780380183dc634432a5ccb8ec2d64d kde-l10n-ku-4.3.2.tar.bz2 -38f82eed9070bbeabdb51a4896b9d163 kde-l10n-lt-4.3.2.tar.bz2 -65ee66d320e3ebaff80ceb99b1bad57f kde-l10n-lv-4.3.2.tar.bz2 -e640d6641063ea5d456e0d7cebec1076 kde-l10n-mai-4.3.2.tar.bz2 -9b766deb486b27d1352a74692080bd75 kde-l10n-mk-4.3.2.tar.bz2 -f67feb93c8623950e764e2462797194c kde-l10n-ml-4.3.2.tar.bz2 -d5bce17fb1035cd120c9ae010210ddf9 kde-l10n-mr-4.3.2.tar.bz2 -8c0546118de40edb0f1bc94cc039b5b6 kde-l10n-nb-4.3.2.tar.bz2 -85b56e0f003c1120ff594cc5c15be857 kde-l10n-nds-4.3.2.tar.bz2 -dcfae722fdffbf206f1eca58351929b8 kde-l10n-nl-4.3.2.tar.bz2 -ab6bdb6c5f24a94854d3d86f53719ec8 kde-l10n-nn-4.3.2.tar.bz2 -c59e70fc4a903465e5c249001d0da9a9 kde-l10n-pa-4.3.2.tar.bz2 -cbfce0042af8a9990da704d1235482dc kde-l10n-pl-4.3.2.tar.bz2 -4816f831c718dc5ec46aa2061e426b6c kde-l10n-pt_BR-4.3.2.tar.bz2 -f4bbea70d7b3b4ddfe35da223bd0d71d kde-l10n-pt-4.3.2.tar.bz2 -d2ce5f6159812a46be8bd90450a40d67 kde-l10n-ro-4.3.2.tar.bz2 -a305436d6b05dcd7c50df6fa9da57797 kde-l10n-ru-4.3.2.tar.bz2 -e991a942e6257151bea80f79e23c376d kde-l10n-sk-4.3.2.tar.bz2 -b8ff0a9ff8e57a7d4b569e0447870604 kde-l10n-sl-4.3.2.tar.bz2 -928477630a257358e96bf8952cd1afd1 kde-l10n-sr-4.3.2.tar.bz2 -214f1215d14173a48513ccb89562c9e0 kde-l10n-sv-4.3.2.tar.bz2 -c9d0fad8838646d324390d60ff61ae3f kde-l10n-tg-4.3.2.tar.bz2 -3dd5b9046b73cca4969b5b7c13538a8c kde-l10n-th-4.3.2.tar.bz2 -bc4b5a8f76ec00860b31e0cb487ec675 kde-l10n-tr-4.3.2.tar.bz2 -cdaa98c18c7c484fa1133e35e188f18d kde-l10n-uk-4.3.2.tar.bz2 -dfee77469f5a35e1eb464c162ae0c085 kde-l10n-wa-4.3.2.tar.bz2 -51313b7654a381ad22c2c467129bc331 kde-l10n-zh_CN-4.3.2.tar.bz2 -ccf254b30c4286a7980aebf2e3b98cc1 kde-l10n-zh_TW-4.3.2.tar.bz2 +e10628397c084460bca7689656f300ed kde-l10n-ar-4.3.3.tar.bz2 +d6674ead4ac4eed60c3d84e7c0f8d851 kde-l10n-bg-4.3.3.tar.bz2 +2c57052b5ba91e7c8c8be5e860a55124 kde-l10n-bn_IN-4.3.3.tar.bz2 +adb193ef0a8145537dc687405b962013 kde-l10n-ca-4.3.3.tar.bz2 +b70ab6045f67331d6e87e6e4832d0230 kde-l10n-cs-4.3.3.tar.bz2 +3bd8733cc6ed8b166439f4b8ef72dce9 kde-l10n-csb-4.3.3.tar.bz2 +27f4f50c1a40d1ba5051ea79bd3680ca kde-l10n-da-4.3.3.tar.bz2 +ceafbce8173de1b0b71ee336550a3e85 kde-l10n-de-4.3.3.tar.bz2 +ac77ebe350583e43ba5870b3f37a662a kde-l10n-el-4.3.3.tar.bz2 +b5dfb4d185c144f23aff217699112f13 kde-l10n-en_GB-4.3.3.tar.bz2 +61f81f1a8391b84ac6296233d30986a6 kde-l10n-es-4.3.3.tar.bz2 +3ab2b6ab41990966da77d614cb032dc8 kde-l10n-et-4.3.3.tar.bz2 +9f85fafd3b82f427602cc98c0f87e471 kde-l10n-eu-4.3.3.tar.bz2 +a84e2f7795677c60b652a70886ed07c4 kde-l10n-fi-4.3.3.tar.bz2 +942561daa054a8075eddf22509ccf90b kde-l10n-fr-4.3.3.tar.bz2 +4a33dee026f3786e921a3e894d98810b kde-l10n-fy-4.3.3.tar.bz2 +f7e01894dd8e2bb244634bde1a3f1277 kde-l10n-ga-4.3.3.tar.bz2 +e9d530e50cfa88e2d71594f08b646348 kde-l10n-gl-4.3.3.tar.bz2 +f48d5d658fd6fcf3347bf430c5031321 kde-l10n-gu-4.3.3.tar.bz2 +b84e05b699de1144e0f709dd717c9c95 kde-l10n-he-4.3.3.tar.bz2 +df069293f0bade11079aad9104e063c8 kde-l10n-hi-4.3.3.tar.bz2 +dff839715ea7d30e74c6fc71b7156f8c kde-l10n-hne-4.3.3.tar.bz2 +d39bdafa4f2aa3ea77c01c88863ede5c kde-l10n-hr-4.3.3.tar.bz2 +cece9b2512bf1d735cba47388e19a9bf kde-l10n-hu-4.3.3.tar.bz2 +92e3a8eba0e69b68d6e8d3b50b71448b kde-l10n-is-4.3.3.tar.bz2 +c8f74e93088cf211cc23c51def0174bc kde-l10n-it-4.3.3.tar.bz2 +42c28a67f64a3db230f94f13b03b1757 kde-l10n-ja-4.3.3.tar.bz2 +c073d5307842307b5232c283b096703c kde-l10n-kk-4.3.3.tar.bz2 +bf99998dcabd9010f57862aae79b1be0 kde-l10n-km-4.3.3.tar.bz2 +c334eb73bd702797c89c8389b08c256d kde-l10n-kn-4.3.3.tar.bz2 +8a966dabf4a4de53bd730aea32cb0483 kde-l10n-ko-4.3.3.tar.bz2 +cbccd72792c766517e6b0576dce0cce4 kde-l10n-ku-4.3.3.tar.bz2 +91b33909381030b15e704182108e46fc kde-l10n-lt-4.3.3.tar.bz2 +139b89413834c4d16c2d7566add4bf89 kde-l10n-lv-4.3.3.tar.bz2 +afd970f5ffa4a92ae7ae5c6e99dd3a95 kde-l10n-mai-4.3.3.tar.bz2 +bbb7a681018bbd82fb576a15b4ba64c7 kde-l10n-mk-4.3.3.tar.bz2 +d224b44e67025f8af9b4013ecc5dd800 kde-l10n-ml-4.3.3.tar.bz2 +bcc8d552f154d6c9bff038548b57b0c2 kde-l10n-mr-4.3.3.tar.bz2 +18677afe8de233f19a3cb27d0a44c363 kde-l10n-nb-4.3.3.tar.bz2 +c1803ecd0c054c6248d241e88ec523cf kde-l10n-nds-4.3.3.tar.bz2 +b719419f77c7ec0555ffd303d8b2680d kde-l10n-nl-4.3.3.tar.bz2 +c063f2309cb2d5dfc6de1ae83699e72b kde-l10n-nn-4.3.3.tar.bz2 +f629191f1d6ea55f4b92115cf4025f35 kde-l10n-pa-4.3.3.tar.bz2 +61f7fd6cb1114e7404a789cfe7a71114 kde-l10n-pl-4.3.3.tar.bz2 +ff61640a475220169e8662a1e286bdff kde-l10n-pt-4.3.3.tar.bz2 +45c83f1230ce08ec859a32ce10fab0ad kde-l10n-pt_BR-4.3.3.tar.bz2 +92659a0f406005a43f4d6f8b5047e587 kde-l10n-ro-4.3.3.tar.bz2 +dfe031b2aff9b1b857af536c3649adf4 kde-l10n-ru-4.3.3.tar.bz2 +e9470464392df6332bf557ec24ccc3f2 kde-l10n-sk-4.3.3.tar.bz2 +419b15bd4accd6592a84d3428c1f8567 kde-l10n-sl-4.3.3.tar.bz2 +1a3f470a429cd9bf4dd8545f9f565ad6 kde-l10n-sr-4.3.3.tar.bz2 +3a4e7644c33284431da4b3981502349c kde-l10n-sv-4.3.3.tar.bz2 +de0b886d9e884de5471dfe4bbc80533c kde-l10n-tg-4.3.3.tar.bz2 +ad44654afa8d389a479c09a0a6bdff11 kde-l10n-th-4.3.3.tar.bz2 +31b9493a5f4b4980430b9b73811ebb43 kde-l10n-tr-4.3.3.tar.bz2 +86f275ea91a748f3f11749267e740287 kde-l10n-uk-4.3.3.tar.bz2 +a4de975e55e4ec179a593c57ad33a1f0 kde-l10n-wa-4.3.3.tar.bz2 +b3ec7c7ac95f2b19a01675862d0087f8 kde-l10n-zh_CN-4.3.3.tar.bz2 +d1c16636ad3a72f6aab0cfb4ce7da54e kde-l10n-zh_TW-4.3.3.tar.bz2 From fengyu at fedoraproject.org Sun Nov 1 02:20:06 2009 From: fengyu at fedoraproject.org (Yu Feng) Date: Sun, 1 Nov 2009 02:20:06 +0000 (UTC) Subject: rpms/gnome-globalmenu/devel .cvsignore, 1.2, 1.3 gnome-globalmenu.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101022006.C193811C00EF@cvs1.fedora.phx.redhat.com> Author: fengyu Update of /cvs/pkgs/rpms/gnome-globalmenu/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4850 Modified Files: .cvsignore gnome-globalmenu.spec sources Log Message: Update to 0.7.8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-globalmenu/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 27 Oct 2009 01:54:52 -0000 1.2 +++ .cvsignore 1 Nov 2009 02:20:05 -0000 1.3 @@ -1 +1 @@ -gnome-globalmenu-0.7.7_1.tar.bz2 +gnome-globalmenu-0.7.8.tar.bz2 Index: gnome-globalmenu.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-globalmenu/devel/gnome-globalmenu.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- gnome-globalmenu.spec 27 Oct 2009 01:54:52 -0000 1.1 +++ gnome-globalmenu.spec 1 Nov 2009 02:20:06 -0000 1.2 @@ -1,15 +1,14 @@ -%global base_version 0.7.7_1 %global pkgdocdir %{_docdir}/%{name}-%{version} #%define alphatag 20080418svn2511 Name: gnome-globalmenu -Version: %{base_version} +Version: 0.7.8 Release: 1%{?dist} Summary: Global Menu for GNOME Group: User Interface/Desktops License: GPLv2 and LGPLv2 URL: http://code.google.com/p/gnome2-globalmenu/ -Source0: http://gnome2-globalmenu.googlecode.com/files/gnome-globalmenu-%{base_version}.tar.bz2 +Source0: http://gnome2-globalmenu.googlecode.com/files/gnome-globalmenu-%{version}.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX) BuildRequires: libwnck-devel BuildRequires: intltool @@ -82,7 +81,7 @@ for post installation configuations. %endif %prep -%setup -q -n %{name}-%{base_version} +%setup -q -n %{name}-%{version} %build @@ -103,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %find_lang %{name} rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/modules/libglobalmenu-gnome.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/modules/libgnomenu-panel.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libgnomenu.la rm -f $RPM_BUILD_ROOT/%{pkgdocdir}/INSTALL @@ -136,11 +136,10 @@ fi %defattr(-,root,root,-) %doc %{pkgdocdir}/* %{_datadir}/pixmaps/globalmenu.png -%{_libdir}/libgnomenu-%{base_version}.so.2 -%{_libdir}/libgnomenu-%{base_version}.so.2.0.0 +%{_libdir}/libgnomenu.so.* %{_mandir}/man1/gnome-globalmenu.1.gz %{_libdir}/gtk-2.0/modules/libglobalmenu-gnome.so -%{_libdir}/gtk-2.0/modules/libglobalmenu-gnome-%{base_version}.so +%{_libdir}/gtk-2.0/modules/libgnomenu-panel.so %files devel %defattr(-,root,root,-) @@ -164,6 +163,9 @@ fi %endif %changelog +* Sat Jun 27 2009 Yu Feng - 0.7.8-1 +- Update to 0.7.8 + * Sat Jun 27 2009 Yu Feng - 0.7.6-1 - Update to 0.7.6 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-globalmenu/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 27 Oct 2009 01:54:52 -0000 1.2 +++ sources 1 Nov 2009 02:20:06 -0000 1.3 @@ -1 +1 @@ -dfb7fb431ca595c60eb8a9c03f2dd4d3 gnome-globalmenu-0.7.7_1.tar.bz2 +c2900eb3ff345457f65d9be2793cc2dc gnome-globalmenu-0.7.8.tar.bz2 From rlandmann at fedoraproject.org Sun Nov 1 03:51:39 2009 From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=) Date: Sun, 1 Nov 2009 03:51:39 +0000 (UTC) Subject: rpms/publican/F-12 import.log, NONE, 1.1 .cvsignore, 1.11, 1.12 publican.spec, 1.27, 1.28 sources, 1.12, 1.13 Message-ID: <20091101035139.B4B0B11C00EF@cvs1.fedora.phx.redhat.com> Author: rlandmann Update of /cvs/pkgs/rpms/publican/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26553/F-12 Modified Files: .cvsignore publican.spec sources Added Files: import.log Log Message: * Mon Oct 26 2009 Jeff Fearn 1.0-0 - Add base langauge summary & descriptions to translated spec file. BZ #515573 - Fix translated package build failure. - Change tabs to spaces in generated spec files. - Fix Locale::Maketext::Gettext dep being missed on RHEL. - Fix common paths on Windows - Added docbook-style-xsl dep for version 1.75.1+ - POD fix from Mikhail Gusarov - Added processing file message to update_pot. BZ #518354 - add EPUB stub - Clean up Copyright in numerous files. - Add security callback for exslt:document. - Update XML::LibXML & XML::LibXSLT minimum versions to 1.67 - Fix rounded corners in HTML. BZ #509768 - Fix nested images breakin in PDF. BZ #491782 - Remove border from HTML table for simplelist. BZ #502126 - Fix remarks not being highlighted in PDF. BZ #509307 - Resize shade.verbatim font size. BZ #497462 - Change step page size limitation to para size limitation. BZ#492984 - Add warning message for missing images. BZ #495821 - Fix fuzzy images. BZ #479794 - swap from paths from Publican to publican and obsolete beta packages. - Fix large example PDF issue. BZ #531685 --- NEW FILE import.log --- publican-1_0-0_fc11:F-12:publican-1.0-0.fc11.src.rpm:1257047363 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-12/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 12 Mar 2009 06:42:31 -0000 1.11 +++ .cvsignore 1 Nov 2009 03:51:38 -0000 1.12 @@ -1 +1 @@ -publican-0.44.tgz +Publican-1.0.tar.gz Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-12/publican.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- publican.spec 24 Sep 2009 23:45:40 -0000 1.27 +++ publican.spec 1 Nov 2009 03:51:38 -0000 1.28 @@ -1,49 +1,124 @@ -%define my_vendor fedora -%define EMBED_DOCKBOOK45 0 -%define HTMLVIEW 0 -%define PREMOLESTATION 0 -%define FC10 0 -%define FC11 1 - -Name: publican -Summary: Common files and scripts for publishing with DocBook XML -Version: 0.44 -Release: 2%{?dist} -License: GPLv2+ and GFDL -# The following directories are licensed under the GFDL: -# content, Book_Template, Set_Template, Article_Template -Group: Applications/Text -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildarch: noarch -Source: https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz -Requires: gettext libxslt docbook-dtds docbook-style-xsl elinks aspell -Requires: %{_bindir}/xml2pot %{_bindir}/po2xml -Requires: perl-ParseLex perl-HTML-Template make -Requires: fop batik saxon ImageMagick -Requires: xerces-j2 rpm-build -Requires: perl-XML-TreeBuilder >= 3.09-11 - -BuildRequires: gettext libxslt docbook-dtds docbook-style-xsl aspell -BuildRequires: %{_bindir}/xml2pot %{_bindir}/po2xml -BuildRequires: desktop-file-utils -BuildRequires: perl-XML-TreeBuilder >= 3.09-11 -BuildRequires: fop saxon ImageMagick - -Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts -Requires: cjkuni-uming-fonts -Requires: sazanami-gothic-fonts sazanami-mincho-fonts -Requires: lklug-fonts -Requires: baekmuk-ttf-batang-fonts - -BuildRequires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts -BuildRequires: cjkuni-uming-fonts -BuildRequires: sazanami-gothic-fonts sazanami-mincho-fonts -BuildRequires: lklug-fonts -BuildRequires: baekmuk-ttf-batang-fonts - -URL: https://fedorahosted.org/publican -Obsoletes: documentation-devel < 0.26-3 -Obsoletes: perl-SGML-Translate <= 0.37-3 + +# Track font name changes +%define RHEL5 %(test "%{?dist}" == ".el5" && echo 1 || echo 0) +%define FC10 %(test "%{?dist}" == ".fc10" && echo 1 || echo 0) +# Assume not rhel and not FC10 means FC11+ +%define OTHER %(test "%{RHEL5}" == "0" -a "%{FC10}" == "0" && echo 1 || echo 0) + +# who doesn't have xdg-open? +%define HTMLVIEW %(test "%{RHEL5}" == "1" && echo 1 || echo 0) + +# required for desktop file install +%define my_vendor %(test "%{RHEL5}" == "1" && echo "redhat" || echo "fedora") + +# TODO after beta revert to lower case name +Name: publican +Version: 1.0 +Release: 0%{?dist} +Summary: Common files and scripts for publishing with DocBook XML +# For a breakdown of the licensing, refer to LICENSE +License: (GPLv2+ or Artistic) and CC0 +Group: Applications/Publishing +URL: https://publican.fedorahosted.org +Source0: https://fedorahosted.org/releases/publican/Publican-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +BuildRequires: perl(Devel::Cover) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Test::Exception) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod::Coverage) +BuildRequires: perl(Test::Perl::Critic) +BuildRequires: perl(Archive::Tar) +BuildRequires: perl(Carp) +BuildRequires: perl(Config::Simple) +BuildRequires: perl(Cwd) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(DateTime) +BuildRequires: perl(DateTime::Format::DateParse) +BuildRequires: perl(Encode) +BuildRequires: perl(File::Copy::Recursive) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Find::Rule) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::pushd) +BuildRequires: perl(HTML::FormatText) +BuildRequires: perl(HTML::TreeBuilder) +BuildRequires: perl(I18N::LangTags::List) +BuildRequires: perl(Image::Magick) +BuildRequires: perl(Image::Size) +BuildRequires: perl(Locale::Maketext::Gettext) +BuildRequires: perl(Locale::Language) +BuildRequires: perl(Locale::PO) +BuildRequires: perl(Makefile::Parser) +BuildRequires: perl(Syntax::Highlight::Engine::Kate) +BuildRequires: perl(Term::ANSIColor) +BuildRequires: perl(Text::Wrap) +BuildRequires: perl(version) +BuildRequires: perl(XML::LibXML) >= 1.67 +BuildRequires: perl(XML::LibXSLT) >= 1.67 +BuildRequires: perl(XML::TreeBuilder) >= 3.09-15 +BuildRequires: fop >= 0.90 +BuildRequires: batik +BuildRequires: docbook-style-xsl >= 1.75.1 +BuildRequires: desktop-file-utils + +# Most of these are handled automatically +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(Locale::Maketext::Gettext) +Requires: fop >= 0.90 +Requires: batik +Requires: docbook-style-xsl >= 1.75.1 +Requires: perl(XML::LibXML) >= 1.67 +Requires: perl(XML::LibXSLT) >= 1.67 +Requires: perl(XML::TreeBuilder) >= 3.09-15 + +# Pull in the fonts for all languages, else you can't build translated PDF in brew/koji +%if %{RHEL5} +Requires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati +Requires: fonts-hindi fonts-japanese fonts-kannada fonts-korean +Requires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala +Requires: fonts-tamil fonts-telugu liberation-fonts +BuildRequires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati +BuildRequires: fonts-hindi fonts-japanese fonts-kannada fonts-korean +BuildRequires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala +BuildRequires: fonts-tamil fonts-telugu liberation-fonts +%endif +%if %{FC10} +Requires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati +Requires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada +Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts +Requires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang + +BuildRequires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati +BuildRequires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada +BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts +BuildRequires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang +%endif +%if %{OTHER} +Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts +Requires: cjkuni-uming-fonts sazanami-gothic-fonts sazanami-mincho-fonts +Requires: lklug-fonts baekmuk-ttf-batang-fonts + +BuildRequires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts +BuildRequires: cjkuni-uming-fonts sazanami-gothic-fonts sazanami-mincho-fonts +BuildRequires: lklug-fonts baekmuk-ttf-batang-fonts +# Indic font names have changed AGAIN (F12) +# and AGAIN they fail to set Provides +# but they don't work for PDFs anyway +# So we aren't going to use them +#Requires: lohit-fonts-bengali lohit-fonts-gujarati +#Requires: lohit-fonts-hindi lohit-fonts-kannada +#Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi +#Requires: lohit-fonts-tamil lohit-fonts-telugu +#BuildRequires: lohit-fonts-bengali lohit-fonts-gujarati +#BuildRequires: lohit-fonts-hindi lohit-fonts-kannada +#BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi +#BuildRequires: lohit-fonts-tamil lohit-fonts-telugu +%endif + +Obsoletes: Publican < 1.0 %description Publican is a DocBook publication system, not just a DocBook processing tool. @@ -51,13 +126,14 @@ As well as ensuring your DocBook XML is your XML is up to publishable standard. %package doc -Group: Documentation -Summary: Documentation for the Publican package +Group: Documentation +Summary: Documentation for the Publican package %if %{HTMLVIEW} -Requires: htmlview +Requires: htmlview %else -Requires: xdg-utils +Requires: xdg-utils %endif +Obsoletes: Publican-doc < 1.0 %description doc Publican is a tool for publishing material authored in DocBook XML. @@ -66,34 +142,23 @@ using publican. It is not a DocBook XML solely on using the publican tools. %prep -%setup -q +%setup -q -n Publican-%{version} %build -%{__make} OS_VER=%{?dist} docs +%{__perl} Build.PL installdirs=vendor +./Build +dir=`pwd` && cd Users_Guide && perl -I $dir/blib/lib $dir/blib/script/publican build \ + --formats=html-desktop --publish --langs=all \ + --common_config="$dir/blib/datadir" \ + --common_content="$dir/blib/datadir/Common_Content" %install rm -rf $RPM_BUILD_ROOT -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/applications -mkdir -p -m755 $RPM_BUILD_ROOT%{_bindir} -install -m 755 bin/* $RPM_BUILD_ROOT%{_bindir} - -%if %{EMBED_DOCKBOOK45} -%{__perl} -p -i -e 's|^#CATALOGS_OVERRIDE$|CATALOGS\t= XML_CATALOG_FILES="%{_datadir}/%{name}/xsl/docbook/dtd-4.5/catalog.xml %{_datadir}/%{name}/xsl/docbook/1.72.0/catalog.xml"|g' make/Makefile.templates -%endif -for i in fop make xsl Common_Content templates maven; do - cp -rf $i $RPM_BUILD_ROOT%{_datadir}/%{name}/$i -done -cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Book_Template -cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Set_Template -cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Article_Template +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -%if %{EMBED_DOCKBOOK45} -cp -rf xsl_extras/docbook $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/. -%endif - -cp xsl_extras/docbook/1.72.0/extensions/saxon65.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/. +%{_fixperms} $RPM_BUILD_ROOT/* sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc-%{version}/en-US/index.html|' %{name}.desktop sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc-%{version}/en-US/images/icon.svg|' %{name}.desktop @@ -104,38 +169,61 @@ sed -i -e 's|xdg-open|htmlview|' %{name} desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop +%check +#./Build test + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README -%doc COPYING -%doc fdl.txt -%{_datadir}/%{name} -%{_bindir}/create_book -%{_bindir}/mkxpot -%{_bindir}/msgxmerge -%{_bindir}/po2xlf -%{_bindir}/po2sgml -%{_bindir}/potmerge -%{_bindir}/poxmerge -%{_bindir}/rmImages -%{_bindir}/StSe_Reports -%{_bindir}/xlf2pot -%{_bindir}/xmlClean +%doc Changes README COPYING Artistic +%{perl_vendorlib}/* +%{_mandir}/man3/* +%{_mandir}/man1/* +%{_bindir}/publican +%{_datadir}/publican %files doc -%doc docs/* +%defattr(-,root,root,-) +%doc Users_Guide/publish/* %{_datadir}/applications/%{my_vendor}-%{name}.desktop %doc fdl.txt %changelog -* Fri Sep 21 2009 Jeff Fearn 0.44-2 -- remove lohit font deps, they don't work for PDFs generated in FOP - -* Sun Jul 26 2009 Fedora Release Engineering - 0.44-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Mon Oct 26 2009 Jeff Fearn 1.0-0 +- Add base langauge summary & descriptions to translated spec file. BZ #515573 +- Fix translated package build failure. +- Change tabs to spaces in generated spec files. +- Fix Locale::Maketext::Gettext dep being missed on RHEL. +- Fix common paths on Windows +- Added docbook-style-xsl dep for version 1.75.1+ +- POD fix from Mikhail Gusarov +- Added processing file message to update_pot. BZ #518354 +- add EPUB stub +- Clean up Copyright in numerous files. +- Add security callback for exslt:document. +- Update XML::LibXML & XML::LibXSLT minimum versions to 1.67 +- Fix rounded corners in HTML. BZ #509768 +- Fix nested images breakin in PDF. BZ #491782 +- Remove border from HTML table for simplelist. BZ #502126 +- Fix remarks not being highlighted in PDF. BZ #509307 +- Resize shade.verbatim font size. BZ #497462 +- Change step page size limitation to para size limitation. BZ#492984 +- Add warning message for missing images. BZ #495821 +- Fix fuzzy images. BZ #479794 +- swap from paths from Publican to publican and obsolete beta packages. +- Fix large example PDF issue. BZ #531685 + +* Sat Jul 18 2009 Jeff Fearn 0.99-0.ALPHA1 +- Rebase to Perl rewrite. + +* Wed Mar 25 2009 Jeff Fearn 0.45 +- Add keep-together.within-column="always" to step. BZ #492021 +- Fix right to left fo ar-AR. BZ #486162 +- Patches and translations by Muayyad Alsadi +- Added missing doccomment and number to PDF highlight. BZ #491241 +- Fix files dir missing from RPMs. BZ #492034 * Wed Mar 11 2009 Jeff Fearn 0.44 - Add 0-9 and '.' to DOCNAME regex. BZ #489626 @@ -487,10 +575,10 @@ rm -rf $RPM_BUILD_ROOT - Added build message when copying Product Specific common files - Move local entity to first position so it overrides common entity files - Added missing DocBook tags to xmlClean: -- accel blockquote classname code colophon envar example footnote -- guisubmenu interface keycap keycombo literal literallayout option -- parameter prompt property see seealso substeps systemitem wordasword -- glossary glossdiv glosssee glossseealso +- accel blockquote classname code colophon envar example footnote +- guisubmenu interface keycap keycombo literal literallayout option +- parameter prompt property see seealso substeps systemitem wordasword +- glossary glossdiv glosssee glossseealso - Moved executables in to bin directory. - Fixed layout of formal para titles in PDF - Removed trunctaion and elipses from title used for page headers @@ -576,23 +664,23 @@ rm -rf $RPM_BUILD_ROOT - add DocBook 1.72.0 xsl to package - modify makefiles to use new DocBook catalogs - xmlClean: -- Changed DTD from 4.3 to 4.5 -- Added bookname to node id's to help avoid id clashes in sets -- Fixed line wrap issue in PDF generation for zh-CN and zh-TW -- Enforced validation of xml on all build targets -- Add legalnotice tag -- Add address tag -- Add street tag -- Add city tag -- Add state tag -- Add postcode tag -- Add country tag -- Add phone tag -- Add fax tag -- Add pob tag -- Add preface tag -- Add bibliograpy related tags -- Add qandaset related tags +- Changed DTD from 4.3 to 4.5 +- Added bookname to node id's to help avoid id clashes in sets +- Fixed line wrap issue in PDF generation for zh-CN and zh-TW +- Enforced validation of xml on all build targets +- Add legalnotice tag +- Add address tag +- Add street tag +- Add city tag +- Add state tag +- Add postcode tag +- Add country tag +- Add phone tag +- Add fax tag +- Add pob tag +- Add preface tag +- Add bibliograpy related tags +- Add qandaset related tags - Removed Confidential image and restyle confidential html text - Added po2xlf script - Added xlf2po script @@ -617,9 +705,9 @@ rm -rf $RPM_BUILD_ROOT - fix image dimensions on content/common/en-US/images/redhat-logo.svg - remove leading space from rpm spec desription - Made abstract wrap at 72 characters and be left aligned. -- it's used for the spec description +- it's used for the spec description - Move legal notice link param from xhtml.xsl to main-html so nochunks -- target will have legal notice embedded in page +- target will have legal notice embedded in page * Tue Apr 24 2007 Jeff Fearn 0.9.1 - fix path to xsl @@ -709,3 +797,4 @@ rm -rf $RPM_BUILD_ROOT * Wed Feb 07 2007 Jeff Fearn 0.0 - Initial creation + Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-12/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 12 Mar 2009 06:42:31 -0000 1.12 +++ sources 1 Nov 2009 03:51:38 -0000 1.13 @@ -1 +1 @@ -720fcfd8903fe370a69107350e2afa22 publican-0.44.tgz +1c0b735fd5ba7fe7487d0e88ae894f01 Publican-1.0.tar.gz From pkgdb at fedoraproject.org Sun Nov 1 04:22:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:22:47 +0000 Subject: [pkgdb] publican: nb has requested watchbugzilla Message-ID: <20091101042248.1036210F874@bastion2.fedora.phx.redhat.com> nb has requested the watchbugzilla acl on publican (Fedora devel) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:22:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:22:49 +0000 Subject: [pkgdb] publican: nb has requested watchcommits Message-ID: <20091101042249.D600210F87F@bastion2.fedora.phx.redhat.com> nb has requested the watchcommits acl on publican (Fedora devel) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:22:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:22:50 +0000 Subject: [pkgdb] publican: nb has requested commit Message-ID: <20091101042251.12E5F10F887@bastion2.fedora.phx.redhat.com> nb has requested the commit acl on publican (Fedora devel) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:22:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:22:52 +0000 Subject: [pkgdb] publican: nb has requested approveacls Message-ID: <20091101042253.08A1710F88B@bastion2.fedora.phx.redhat.com> nb has requested the approveacls acl on publican (Fedora devel) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:02 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:02 +0000 Subject: [pkgdb] publican: nb has requested watchbugzilla Message-ID: <20091101042303.09BF910F87D@bastion2.fedora.phx.redhat.com> nb has requested the watchbugzilla acl on publican (Fedora 10) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:04 +0000 Subject: [pkgdb] publican: nb has requested watchcommits Message-ID: <20091101042304.8C1C610F882@bastion2.fedora.phx.redhat.com> nb has requested the watchcommits acl on publican (Fedora 10) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:06 +0000 Subject: [pkgdb] publican: nb has requested commit Message-ID: <20091101042306.37F7610F88B@bastion2.fedora.phx.redhat.com> nb has requested the commit acl on publican (Fedora 10) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:08 +0000 Subject: [pkgdb] publican: nb has requested approveacls Message-ID: <20091101042308.D237210F88C@bastion2.fedora.phx.redhat.com> nb has requested the approveacls acl on publican (Fedora 10) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:11 +0000 Subject: [pkgdb] publican: nb has requested watchbugzilla Message-ID: <20091101042311.DAF6810F890@bastion2.fedora.phx.redhat.com> nb has requested the watchbugzilla acl on publican (Fedora 11) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:13 +0000 Subject: [pkgdb] publican: nb has requested watchcommits Message-ID: <20091101042313.2183810F89C@bastion2.fedora.phx.redhat.com> nb has requested the watchcommits acl on publican (Fedora 11) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:14 +0000 Subject: [pkgdb] publican: nb has requested commit Message-ID: <20091101042314.71B2910F883@bastion2.fedora.phx.redhat.com> nb has requested the commit acl on publican (Fedora 11) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:15 +0000 Subject: [pkgdb] publican: nb has requested approveacls Message-ID: <20091101042315.C44D710F8A0@bastion2.fedora.phx.redhat.com> nb has requested the approveacls acl on publican (Fedora 11) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:19 +0000 Subject: [pkgdb] publican: nb has requested watchbugzilla Message-ID: <20091101042319.402E410F888@bastion2.fedora.phx.redhat.com> nb has requested the watchbugzilla acl on publican (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:20 +0000 Subject: [pkgdb] publican: nb has requested watchcommits Message-ID: <20091101042320.829BC10F8A3@bastion2.fedora.phx.redhat.com> nb has requested the watchcommits acl on publican (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:21 +0000 Subject: [pkgdb] publican: nb has requested commit Message-ID: <20091101042321.CD66910F8A6@bastion2.fedora.phx.redhat.com> nb has requested the commit acl on publican (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:23 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:23 +0000 Subject: [pkgdb] publican: nb has requested approveacls Message-ID: <20091101042323.6A4B210F8A8@bastion2.fedora.phx.redhat.com> nb has requested the approveacls acl on publican (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:23:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:32 +0000 Subject: [pkgdb] publican-fedora: nb has requested watchbugzilla Message-ID: <20091101042332.2862910F894@bastion2.fedora.phx.redhat.com> nb has requested the watchbugzilla acl on publican-fedora (Fedora devel) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:33 +0000 Subject: [pkgdb] publican-fedora: nb has requested watchcommits Message-ID: <20091101042333.7E84C10F89C@bastion2.fedora.phx.redhat.com> nb has requested the watchcommits acl on publican-fedora (Fedora devel) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:35 +0000 Subject: [pkgdb] publican-fedora: nb has requested commit Message-ID: <20091101042335.5B64B10F8AC@bastion2.fedora.phx.redhat.com> nb has requested the commit acl on publican-fedora (Fedora devel) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:37 +0000 Subject: [pkgdb] publican-fedora: nb has requested approveacls Message-ID: <20091101042337.2B91C10F89F@bastion2.fedora.phx.redhat.com> nb has requested the approveacls acl on publican-fedora (Fedora devel) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:42 +0000 Subject: [pkgdb] publican-fedora: nb has requested watchbugzilla Message-ID: <20091101042342.E552910F8A2@bastion2.fedora.phx.redhat.com> nb has requested the watchbugzilla acl on publican-fedora (Fedora 10) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:44 +0000 Subject: [pkgdb] publican-fedora: nb has requested watchcommits Message-ID: <20091101042344.6CFE910F8A6@bastion2.fedora.phx.redhat.com> nb has requested the watchcommits acl on publican-fedora (Fedora 10) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:45 +0000 Subject: [pkgdb] publican-fedora: nb has requested commit Message-ID: <20091101042345.7DEC110F8B3@bastion2.fedora.phx.redhat.com> nb has requested the commit acl on publican-fedora (Fedora 10) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:47 +0000 Subject: [pkgdb] publican-fedora: nb has requested approveacls Message-ID: <20091101042347.7203110F8B4@bastion2.fedora.phx.redhat.com> nb has requested the approveacls acl on publican-fedora (Fedora 10) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:51 +0000 Subject: [pkgdb] publican-fedora: nb has requested watchbugzilla Message-ID: <20091101042351.3444310F87F@bastion2.fedora.phx.redhat.com> nb has requested the watchbugzilla acl on publican-fedora (Fedora 11) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:52 +0000 Subject: [pkgdb] publican-fedora: nb has requested watchcommits Message-ID: <20091101042352.B0CD910F8B8@bastion2.fedora.phx.redhat.com> nb has requested the watchcommits acl on publican-fedora (Fedora 11) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:53 +0000 Subject: [pkgdb] publican-fedora: nb has requested commit Message-ID: <20091101042353.B4CE610F8BE@bastion2.fedora.phx.redhat.com> nb has requested the commit acl on publican-fedora (Fedora 11) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:54 +0000 Subject: [pkgdb] publican-fedora: nb has requested approveacls Message-ID: <20091101042355.0149B10F8BF@bastion2.fedora.phx.redhat.com> nb has requested the approveacls acl on publican-fedora (Fedora 11) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:57 +0000 Subject: [pkgdb] publican-fedora: nb has requested watchbugzilla Message-ID: <20091101042357.7595810F8C0@bastion2.fedora.phx.redhat.com> nb has requested the watchbugzilla acl on publican-fedora (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:58 +0000 Subject: [pkgdb] publican-fedora: nb has requested watchcommits Message-ID: <20091101042358.A672210F8C3@bastion2.fedora.phx.redhat.com> nb has requested the watchcommits acl on publican-fedora (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:23:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:23:59 +0000 Subject: [pkgdb] publican-fedora: nb has requested commit Message-ID: <20091101042359.AE2BB10F8C6@bastion2.fedora.phx.redhat.com> nb has requested the commit acl on publican-fedora (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:24:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:24:01 +0000 Subject: [pkgdb] publican-fedora: nb has requested approveacls Message-ID: <20091101042401.2035E10F8C8@bastion2.fedora.phx.redhat.com> nb has requested the approveacls acl on publican-fedora (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican-fedora From cwickert at fedoraproject.org Sun Nov 1 04:25:56 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Nov 2009 04:25:56 +0000 (UTC) Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.66,1.67 Message-ID: <20091101042557.2967E11C0267@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/desktop-backgrounds/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20822 Modified Files: desktop-backgrounds.spec Log Message: * Sun Nov 01 2009 Christoph Wickert - 9.0.0-10 - Update for F12 constantine artwork Index: desktop-backgrounds.spec =================================================================== RCS file: /cvs/pkgs/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- desktop-backgrounds.spec 24 Jul 2009 20:10:09 -0000 1.66 +++ desktop-backgrounds.spec 1 Nov 2009 04:25:55 -0000 1.67 @@ -4,9 +4,9 @@ Summary: Desktop backgrounds Name: desktop-backgrounds Version: 9.0.0 -Release: 9 +Release: 10 License: LGPLv2 -Group: Applications/Multimedia +Group: User Interface/Desktops Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2 Source2: Propaganda-1.0.0.tar.gz Source3: README.Propaganda @@ -22,7 +22,7 @@ to be used as desktop background image. %package basic Summary: Desktop backgrounds -Group: Applications/Multimedia +Group: User Interface/Desktops Provides: desktop-backgrounds Obsoletes: desktop-backgrounds @@ -34,8 +34,8 @@ to be used as desktop background image. %package compat Summary: Desktop backgrounds from previous Fedora releases -Group: Applications/Multimedia -Requires: leonidas-backgrounds-common +Group: User Interface/Desktops +Requires: constantine-backgrounds-single %description compat The desktop-backgrounds-compat package contains filenames used @@ -45,7 +45,7 @@ with existing setups. %package waves Summary: Desktop backgrounds for the Waves theme -Group: Applications/Multimedia +Group: User Interface/Desktops %description waves The desktop-backgrounds-waves package contains the "Waves" desktop @@ -108,13 +108,13 @@ ln -s ../../../../backgrounds/waves/wave # Compatibility cruft (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images; -ln -s ../leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.png -ln -s ../leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.jpg -ln -s ../leonidas/lion/wide/1920x1200/leonidas-1-noon.jpg default-5_4.png -ln -s ../leonidas/lion/wide/1920x1200/leonidas-1-noon.jpg default-5_4.jpg +ln -s ../constantine/default/normalish/constantine.png default.png +ln -s ../constantine/default/normalish/constantine.png default.jpg +ln -s ../constantine/default/wide/constantine.png default-5_4.png +ln -s ../constantine/default/wide/constantine.png default-5_4.jpg cd .. -ln -s ./leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.png -ln -s ./leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.jpg +ln -s ./constantine/default/normalish/constantine.png default.png +ln -s ./constantine/default/normalish/constantine.png default.jpg ) %clean @@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/backgrounds/default* %changelog +* Sun Nov 01 2009 Christoph Wickert - 9.0.0-10 +- Update for F12 constantine artwork + * Fri Jul 24 2009 Fedora Release Engineering - 9.0.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From cwickert at fedoraproject.org Sun Nov 1 04:31:28 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Nov 2009 04:31:28 +0000 (UTC) Subject: rpms/desktop-backgrounds/F-12 desktop-backgrounds.spec,1.66,1.67 Message-ID: <20091101043128.DB20C11C02C8@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/desktop-backgrounds/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25328 Modified Files: desktop-backgrounds.spec Log Message: * Sun Nov 01 2009 Christoph Wickert - 9.0.0-10 - Update for F12 constantine artwork Index: desktop-backgrounds.spec =================================================================== RCS file: /cvs/pkgs/rpms/desktop-backgrounds/F-12/desktop-backgrounds.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- desktop-backgrounds.spec 24 Jul 2009 20:10:09 -0000 1.66 +++ desktop-backgrounds.spec 1 Nov 2009 04:31:28 -0000 1.67 @@ -4,9 +4,9 @@ Summary: Desktop backgrounds Name: desktop-backgrounds Version: 9.0.0 -Release: 9 +Release: 10 License: LGPLv2 -Group: Applications/Multimedia +Group: User Interface/Desktops Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2 Source2: Propaganda-1.0.0.tar.gz Source3: README.Propaganda @@ -22,7 +22,7 @@ to be used as desktop background image. %package basic Summary: Desktop backgrounds -Group: Applications/Multimedia +Group: User Interface/Desktops Provides: desktop-backgrounds Obsoletes: desktop-backgrounds @@ -34,8 +34,8 @@ to be used as desktop background image. %package compat Summary: Desktop backgrounds from previous Fedora releases -Group: Applications/Multimedia -Requires: leonidas-backgrounds-common +Group: User Interface/Desktops +Requires: constantine-backgrounds-single %description compat The desktop-backgrounds-compat package contains filenames used @@ -45,7 +45,7 @@ with existing setups. %package waves Summary: Desktop backgrounds for the Waves theme -Group: Applications/Multimedia +Group: User Interface/Desktops %description waves The desktop-backgrounds-waves package contains the "Waves" desktop @@ -108,13 +108,13 @@ ln -s ../../../../backgrounds/waves/wave # Compatibility cruft (cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images; -ln -s ../leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.png -ln -s ../leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.jpg -ln -s ../leonidas/lion/wide/1920x1200/leonidas-1-noon.jpg default-5_4.png -ln -s ../leonidas/lion/wide/1920x1200/leonidas-1-noon.jpg default-5_4.jpg +ln -s ../constantine/default/normalish/constantine.png default.png +ln -s ../constantine/default/normalish/constantine.png default.jpg +ln -s ../constantine/default/wide/constantine.png default-5_4.png +ln -s ../constantine/default/wide/constantine.png default-5_4.jpg cd .. -ln -s ./leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.png -ln -s ./leonidas/lion/normalish/1280x1024/leonidas-1-noon.jpg default.jpg +ln -s ./constantine/default/normalish/constantine.png default.png +ln -s ./constantine/default/normalish/constantine.png default.jpg ) %clean @@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/backgrounds/default* %changelog +* Sun Nov 01 2009 Christoph Wickert - 9.0.0-10 +- Update for F12 constantine artwork + * Fri Jul 24 2009 Fedora Release Engineering - 9.0.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rlandmann at fedoraproject.org Sun Nov 1 04:40:01 2009 From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=) Date: Sun, 1 Nov 2009 04:40:01 +0000 (UTC) Subject: rpms/publican-fedora/F-12 .cvsignore, 1.11, 1.12 import.log, 1.2, 1.3 publican-fedora.spec, 1.13, 1.14 sources, 1.12, 1.13 Message-ID: <20091101044001.B671611C0267@cvs1.fedora.phx.redhat.com> Author: rlandmann Update of /cvs/pkgs/rpms/publican-fedora/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30463/F-12 Modified Files: .cvsignore import.log publican-fedora.spec sources Log Message: * Fri Oct 30 2009 Jeff Fearn 1.0 - port to publican 1.0. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 5 Oct 2009 08:02:02 -0000 1.11 +++ .cvsignore 1 Nov 2009 04:39:59 -0000 1.12 @@ -1 +1 @@ -publican-fedora-0.19.tgz +publican-fedora-1.0.tgz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 7 Oct 2009 03:25:55 -0000 1.2 +++ import.log 1 Nov 2009 04:39:59 -0000 1.3 @@ -1,2 +1,3 @@ publican-fedora-0_19-1_fc11:F-12:publican-fedora-0.19-1.fc11.src.rpm:1254729620 publican-fedora-0_19-3_fc11:F-12:publican-fedora-0.19-3.fc11.src.rpm:1254885868 +publican-fedora-1_0-0_fc11:F-12:publican-fedora-1.0-0.fc11.src.rpm:1257050147 Index: publican-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/publican-fedora.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- publican-fedora.spec 7 Oct 2009 03:25:55 -0000 1.13 +++ publican-fedora.spec 1 Nov 2009 04:39:59 -0000 1.14 @@ -2,16 +2,16 @@ Name: publican-%{brand} Summary: Publican documentation template files for %{brand} -Version: 0.19 -Release: 3%{?dist} +Version: 1.0 +Release: 0%{?dist} License: Open Publication Group: Development/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildarch: noarch -Source: https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz -Requires: publican -BuildRequires: publican -URL: https://fedorahosted.org/publican +Source: https://fedorahosted.org/releases/publican/%{name}-%{version}.tgz +Requires: publican >= 1.0 +BuildRequires: publican >= 1.0 +URL: https://publican.fedorahosted.org/ Obsoletes: documentation-devel-Fedora %description @@ -22,19 +22,12 @@ for %{brand} with publican. %setup -q %build -%{__make} Common_Content +publican build --formats=xml --langs=all --publish %install rm -rf $RPM_BUILD_ROOT -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Templates -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/make -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand} -cp -rf Common_Content $RPM_BUILD_ROOT%{_datadir}/publican/ -cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Book_Template -cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Set_Template -cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Article_Template -install -m 755 make/Makefile.%{brand} $RPM_BUILD_ROOT%{_datadir}/publican/make/. -install -m 755 xsl/*.xsl $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}/. +mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Common_Content +publican installbrand --path=$RPM_BUILD_ROOT%{_datadir}/publican/Common_Content %clean rm -rf $RPM_BUILD_ROOT @@ -44,61 +37,14 @@ rm -rf $RPM_BUILD_ROOT %doc README %doc COPYING %{_datadir}/publican/Common_Content/%{brand} -%{_datadir}/publican/Templates/%{brand}-*_Template -%{_datadir}/publican/make/Makefile.%{brand} -%{_datadir}/publican/xsl/%{brand} %changelog -* Wed Oct 7 2009 R?diger Landmann 0.19-3 -- Fix date in 0.19-2 changelog -- Update Fedora Feedback in Polish Piotr Dr?g -* Wed Oct 7 2009 R?diger Landmann 0.19-2 -- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE -- Tue Oct 6 2009 Maxim V. Dziumanenko -- Update Fedora Feedback in Ukrainian -* Mon Oct 5 2009 R?diger Landmann 0.19-1 -- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal -- Add Fedora logos with correct trademarks. BZ #492041 -- Sat Oct 3 2009 Maxim V. Dziumanenko -- Translate Fedora Feedback into Ukrainian -- Fri Sep 4 2009 Ville-Pekka Vainio -- Translate Fedora Feedback into Finnish -- Sun Aug 9 2009 Josip ?ume?ki -- Translate Fedora Feedback into Croatian -- Sun Aug 9 2009 Robert Buj -- Translate Fedora Feedback into Catalan -- Sun Jun 15 2009 Sindre Wetjen -- Translate Fedora Feedback into Norwegian (Bokm?l) -- Fri Jun 05 2009 Oron Peled -- Translate Fedora Feedback into Hebrew -- Thu Jun 04 2009 Jurijs Kolomijecs -- Translate Fedora Feedback into Latvian -- Mon May 25 2009 Nikola ?tohanzl -- Translate Fedora Feedback into Czech -- Sun May 10 2009 Pavol ?imo -- Translate Fedora Feedback into Slovak -- Fri May 08 2009 Arnes Arnautovi? -- Translate Fedora Feedback into Bosnian -- Sun Apr 19 2009 Manatsawin Hanmongkolchai -- Translate Fedora Feedback into Thai -- Thu Apr 16 2009 Sveinn ? Felli -- Translate Fedora Feedback into Icelandic -- Wed Apr 08 2009 Sulyok Peti -- Translate Fedora Feedback into Hungarian -- Mon Mar 23 2009 G?ran Uddeborg -- Translate Fedora Feedback into Swedish -- Fri Mar 20 2009 Noriko Mizumoto -- Update Fedora Feedback in Japanese -- Thu Mar 19 2009 Kris Thomsen -- Translate Fedora Feedback into Danish -- Fri Mar 13 2009 Jeff Fearn +* Fri Oct 30 2009 Jeff Fearn 1.0 +- port to publican 1.0. + +* Fri Mar 13 2009 Jeff Fearn 0.19 - Fix right to left fo ar-AR. BZ #486162 - Patches and translations by Muayyad Alsadi -- Tue Mar 10 2009 Alexey Vasyukov -- Translate Fedora Feedback into Russian - -* Sun Jul 26 2009 Fedora Release Engineering - 0.18-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Mar 9 2009 Jeff Fearn 0.18 - Add symlinks for langauges without country codes. BZ #487256 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 7 Oct 2009 03:25:55 -0000 1.12 +++ sources 1 Nov 2009 04:39:59 -0000 1.13 @@ -1 +1 @@ -25ca41070d4156adb05c44b21a50df08 publican-fedora-0.19.tgz +d77ae1709114946cbc06c1c898f100e2 publican-fedora-1.0.tgz From pkgdb at fedoraproject.org Sun Nov 1 04:57:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:06 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045706.C0FC810F870@bastion2.fedora.phx.redhat.com> rlandmann has set the watchbugzilla acl on publican (Fedora devel) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:11 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:11 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045711.BE98E10F871@bastion2.fedora.phx.redhat.com> rlandmann has set the watchcommits acl on publican (Fedora devel) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:18 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045718.4277310F844@bastion2.fedora.phx.redhat.com> rlandmann has set the commit acl on publican (Fedora devel) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:39 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045739.DEA5B10F871@bastion2.fedora.phx.redhat.com> rlandmann has set the watchbugzilla acl on publican (Fedora 10) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:40 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045740.EA32310F87B@bastion2.fedora.phx.redhat.com> rlandmann has set the watchcommits acl on publican (Fedora 10) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:42 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045742.0FE8F10F887@bastion2.fedora.phx.redhat.com> rlandmann has set the commit acl on publican (Fedora 10) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:45 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045745.294EE10F88E@bastion2.fedora.phx.redhat.com> rlandmann has set the watchbugzilla acl on publican (Fedora 11) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:45 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045745.E525910F894@bastion2.fedora.phx.redhat.com> rlandmann has set the watchcommits acl on publican (Fedora 11) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:47 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045747.78D9510F890@bastion2.fedora.phx.redhat.com> rlandmann has set the commit acl on publican (Fedora 11) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:51 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045751.1944A10F87D@bastion2.fedora.phx.redhat.com> rlandmann has set the watchbugzilla acl on publican (Fedora 12) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:53 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045753.4073010F888@bastion2.fedora.phx.redhat.com> rlandmann has set the watchcommits acl on publican (Fedora 12) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:57:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:57:54 +0000 Subject: [pkgdb] publican had acl change status Message-ID: <20091101045754.BDD9610F89A@bastion2.fedora.phx.redhat.com> rlandmann has set the commit acl on publican (Fedora 12) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican From pkgdb at fedoraproject.org Sun Nov 1 04:58:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:06 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045806.A80A210F87D@bastion2.fedora.phx.redhat.com> rlandmann has set the watchbugzilla acl on publican-fedora (Fedora devel) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:07 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045807.4B2AF10F890@bastion2.fedora.phx.redhat.com> rlandmann has set the watchcommits acl on publican-fedora (Fedora devel) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:08 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045808.C918D10F89D@bastion2.fedora.phx.redhat.com> rlandmann has set the commit acl on publican-fedora (Fedora devel) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:41 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045841.90DA810F870@bastion2.fedora.phx.redhat.com> rlandmann has set the watchbugzilla acl on publican-fedora (Fedora 10) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:42 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045842.A6AD110F879@bastion2.fedora.phx.redhat.com> rlandmann has set the watchcommits acl on publican-fedora (Fedora 10) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:45 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045845.3C0F710F887@bastion2.fedora.phx.redhat.com> rlandmann has set the commit acl on publican-fedora (Fedora 10) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:48 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:48 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045848.D602510F844@bastion2.fedora.phx.redhat.com> rlandmann has set the watchbugzilla acl on publican-fedora (Fedora 11) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:49 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045849.B2AB410F88B@bastion2.fedora.phx.redhat.com> rlandmann has set the watchcommits acl on publican-fedora (Fedora 11) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:51 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045851.94A9110F895@bastion2.fedora.phx.redhat.com> rlandmann has set the commit acl on publican-fedora (Fedora 11) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:54 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045854.C925D10F87B@bastion2.fedora.phx.redhat.com> rlandmann has set the watchbugzilla acl on publican-fedora (Fedora 12) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:55 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045855.90EC010F89C@bastion2.fedora.phx.redhat.com> rlandmann has set the watchcommits acl on publican-fedora (Fedora 12) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 04:58:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 04:58:57 +0000 Subject: [pkgdb] publican-fedora had acl change status Message-ID: <20091101045857.269AA10F89D@bastion2.fedora.phx.redhat.com> rlandmann has set the commit acl on publican-fedora (Fedora 12) to Approved for nb To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 05:00:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 05:00:58 +0000 Subject: [pkgdb] publican-fedora: nb has given up approveacls Message-ID: <20091101050059.04D8110F994@bastion2.fedora.phx.redhat.com> nb has given up the approveacls acl on publican-fedora (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican-fedora From pkgdb at fedoraproject.org Sun Nov 1 05:01:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 05:01:18 +0000 Subject: [pkgdb] publican-fedora: nb has requested approveacls Message-ID: <20091101050118.9BAC210F9E4@bastion2.fedora.phx.redhat.com> nb has requested the approveacls acl on publican-fedora (Fedora 12) To make changes to this package see: /pkgdb/packages/name/publican-fedora From rdieter at fedoraproject.org Sun Nov 1 05:03:56 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Sun, 1 Nov 2009 05:03:56 +0000 (UTC) Subject: rpms/kde-l10n/devel kde-l10n.spec, 1.100, 1.101 subdirs-kde-l10n, 1.19, 1.20 Message-ID: <20091101050356.74DC111C0086@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kde-l10n/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5800 Modified Files: kde-l10n.spec subdirs-kde-l10n Log Message: fix build, add a couple new locales Index: kde-l10n.spec =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -p -r1.100 -r1.101 --- kde-l10n.spec 1 Nov 2009 02:18:32 -0000 1.100 +++ kde-l10n.spec 1 Nov 2009 05:03:55 -0000 1.101 @@ -61,7 +61,7 @@ Source47: ftp://ftp.kde.org/pub/kde/stab Source48: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2 Source49: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2 Source50: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2 -#Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2 +Source51: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fy-%{version}.tar.bz2 Source52: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-kk-%{version}.tar.bz2 Source53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-%{version}.tar.bz2 Source54: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-bn_IN-%{version}.tar.bz2 @@ -78,7 +78,7 @@ Source1000: subdirs-kde-l10n BuildRequires: cmake BuildRequires: findutils BuildRequires: gettext -BuildRequires: kdelibs4-devel >= %{version} +BuildRequires: kdelibs4-devel >= 4.3 Requires: kde-filesystem @@ -355,7 +355,16 @@ Requires: %{name} = %{version}-%{release Provides: %{name}-hi = %{version}-%{release} %description Hindi -Hindi language support for KDE +%{summary}. + +%package Chhattisgarhi +Summary: Chhattisgarhi language support for KDE +Group: User Interface/Desktops +Requires: %{name} = %{version}-%{release} +Provides: %{name}-hne = %{version}-%{release} + +%description Chhattisgarhi +%{summary}. %package Croatian Summary: Croatian language support for KDE @@ -1077,12 +1086,12 @@ rm -rf %{buildroot} %lang(fr) %{_kde4_docdir}/HTML/fr %lang(fr) %{_mandir}/fr/*/* -%if %{buildall} +#if %{buildall} %files Frisian %defattr(-,root,root) %lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/* %lang(fy) %{_datadir}/locale/fy/entry.desktop -%endif +#endif %files Irish %defattr(-,root,root) @@ -1115,6 +1124,12 @@ rm -rf %{buildroot} %lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/* %lang(hi) %{_datadir}/locale/hi/entry.desktop +%files Chhattisgarhi +%defattr(-,root,root,-) +%lang(hne) %{_datadir}/locale/hne/LC_MESSAGES/* +%lang(hne) %{_datadir}/locale/hne/entry.desktop + + %files Croatian %defattr(-,root,root) %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/* @@ -1454,6 +1469,7 @@ rm -rf %{buildroot} %lang(uk) %{_datadir}/locale/uk/LC_SCRIPTS/ %lang(uk) %{_datadir}/locale/uk/entry.desktop %lang(uk) %{_kde4_appsdir}/ktuberling/sounds/uk* +%lang(uk) %{_kde4_appsdir}/step/objinfo/l10n/uk/ %lang(uk) %{_kde4_appsdir}/kvtml/uk %lang(uk) %{_kde4_docdir}/HTML/uk %lang(uk) %{_mandir}/uk/*/* Index: subdirs-kde-l10n =================================================================== RCS file: /cvs/pkgs/rpms/kde-l10n/devel/subdirs-kde-l10n,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- subdirs-kde-l10n 4 Sep 2009 23:05:27 -0000 1.19 +++ subdirs-kde-l10n 1 Nov 2009 05:03:55 -0000 1.20 @@ -2,8 +2,8 @@ ar bg bn_IN ca -csb cs +csb da de el @@ -13,11 +13,13 @@ et eu fi fr +fy ga gl gu he hi +hne hr hu is @@ -40,8 +42,8 @@ nl nn pa pl -pt_BR pt +pt_BR ro ru sk From cwickert at fedoraproject.org Sun Nov 1 05:06:23 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Nov 2009 05:06:23 +0000 (UTC) Subject: rpms/xfdesktop/F-12 xfdesktop.spec,1.35,1.36 Message-ID: <20091101050623.F1F0E11C0086@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfdesktop/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6504/F-12 Modified Files: xfdesktop.spec Log Message: * Sun Nov 01 2009 Christoph Wickert - 4.6.1-3 - Fix dependency for default background image Index: xfdesktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfdesktop/F-12/xfdesktop.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- xfdesktop.spec 27 Jul 2009 07:59:12 -0000 1.35 +++ xfdesktop.spec 1 Nov 2009 05:06:23 -0000 1.36 @@ -1,7 +1,7 @@ Summary: Desktop manager for the XFce Desktop Environment Name: xfdesktop Version: 4.6.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2 @@ -18,9 +18,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version Requires: xfwm4 Requires: xfce4-panel -Requires: desktop-backgrounds-basic Requires: xfce4-doc Requires: redhat-menus +%if 0%{?fedora} <= 9 +Requires: desktop-backgrounds-basic +%else +Requires: desktop-backgrounds-compat +%endif BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: xfce4-panel-devel >= %{version} BuildRequires: libxml2-devel @@ -65,12 +69,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/ rm -rf $RPM_BUILD_ROOT %post -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -90,6 +98,9 @@ touch --no-create %{_datadir}/icons/hico %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop %changelog +* Sun Nov 01 2009 Christoph Wickert - 4.6.1-3 +- Fix dependency for default background image + * Mon Jul 27 2009 Fedora Release Engineering - 4.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From cwickert at fedoraproject.org Sun Nov 1 05:06:24 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Nov 2009 05:06:24 +0000 (UTC) Subject: rpms/xfdesktop/devel xfdesktop.spec,1.35,1.36 Message-ID: <20091101050624.235D211C0086@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfdesktop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6504/d Modified Files: xfdesktop.spec Log Message: * Sun Nov 01 2009 Christoph Wickert - 4.6.1-3 - Fix dependency for default background image Index: xfdesktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- xfdesktop.spec 27 Jul 2009 07:59:12 -0000 1.35 +++ xfdesktop.spec 1 Nov 2009 05:06:21 -0000 1.36 @@ -1,7 +1,7 @@ Summary: Desktop manager for the XFce Desktop Environment Name: xfdesktop Version: 4.6.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2 @@ -18,9 +18,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version Requires: xfwm4 Requires: xfce4-panel -Requires: desktop-backgrounds-basic Requires: xfce4-doc Requires: redhat-menus +%if 0%{?fedora} <= 9 +Requires: desktop-backgrounds-basic +%else +Requires: desktop-backgrounds-compat +%endif BuildRequires: libxfcegui4-devel >= %{version} BuildRequires: xfce4-panel-devel >= %{version} BuildRequires: libxml2-devel @@ -65,12 +69,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/ rm -rf $RPM_BUILD_ROOT %post -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -90,6 +98,9 @@ touch --no-create %{_datadir}/icons/hico %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop %changelog +* Sun Nov 01 2009 Christoph Wickert - 4.6.1-3 +- Fix dependency for default background image + * Mon Jul 27 2009 Fedora Release Engineering - 4.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From thomasj at fedoraproject.org Sun Nov 1 05:52:41 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 05:52:41 +0000 (UTC) Subject: rpms/qtcurve-kde4/devel .cvsignore, 1.2, 1.3 qtcurve-kde4.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101055241.E1B3011C0086@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/qtcurve-kde4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16962 Modified Files: .cvsignore qtcurve-kde4.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - Updated to source 0.69.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Oct 2009 20:03:46 -0000 1.2 +++ .cvsignore 1 Nov 2009 05:52:39 -0000 1.3 @@ -1 +1 @@ -QtCurve-KDE4-0.69.0.tar.bz2 +QtCurve-KDE4-0.69.2.tar.bz2 Index: qtcurve-kde4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/devel/qtcurve-kde4.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qtcurve-kde4.spec 15 Oct 2009 20:03:47 -0000 1.1 +++ qtcurve-kde4.spec 1 Nov 2009 05:52:40 -0000 1.2 @@ -1,5 +1,5 @@ Name: qtcurve-kde4 -Version: 0.69.0 +Version: 0.69.2 Release: 1%{?dist} Summary: This is a set of widget styles for Qt4/KDE4 based apps @@ -23,7 +23,7 @@ QtCurve is a desktop theme for the GTK+ allowing users to achieve a uniform look between these widget toolkits. %prep -%setup -q -n QtCurve-KDE4-0.69.0 +%setup -q -n QtCurve-KDE4-0.69.2 ## Due to the name change this sed is needed for find-lang. sed -i 's,set(catalogname qtcurve),set(catalogname qtcurve-kde4),g' po/CMakeLists.txt @@ -60,6 +60,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 01 2009 Thomas Janssen 0.69.0-1 - Updated to source version 0.69.0 - Made the QtCurve dir owned Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Oct 2009 20:03:47 -0000 1.2 +++ sources 1 Nov 2009 05:52:40 -0000 1.3 @@ -1 +1 @@ -2b47051ddc0fb6cccd9473f4717a4b44 QtCurve-KDE4-0.69.0.tar.bz2 +4c346e64459cdae62479f2e7130cf562 QtCurve-KDE4-0.69.2.tar.bz2 From thomasj at fedoraproject.org Sun Nov 1 05:54:50 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 05:54:50 +0000 (UTC) Subject: rpms/qtcurve-kde4/devel qtcurve-kde4.spec,1.2,1.3 Message-ID: <20091101055450.97D2311C0086@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/qtcurve-kde4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17616 Modified Files: qtcurve-kde4.spec Log Message: * Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - Updated to source 0.69.2 Index: qtcurve-kde4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/devel/qtcurve-kde4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- qtcurve-kde4.spec 1 Nov 2009 05:52:40 -0000 1.2 +++ qtcurve-kde4.spec 1 Nov 2009 05:54:49 -0000 1.3 @@ -60,7 +60,7 @@ rm -rf %{buildroot} %changelog -* Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - Updated to source 0.69.2 * Mon Oct 12 2009 Thomas Janssen 0.69.0-1 From thomasj at fedoraproject.org Sun Nov 1 06:05:28 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 06:05:28 +0000 (UTC) Subject: rpms/qtcurve-kde4/F-12 .cvsignore, 1.2, 1.3 qtcurve-kde4.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101060528.C849F11C0086@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/qtcurve-kde4/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20627 Modified Files: .cvsignore qtcurve-kde4.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - Updated to source 0.69.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-12/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Oct 2009 20:06:10 -0000 1.2 +++ .cvsignore 1 Nov 2009 06:05:26 -0000 1.3 @@ -1 +1 @@ -QtCurve-KDE4-0.69.0.tar.bz2 +QtCurve-KDE4-0.69.2.tar.bz2 Index: qtcurve-kde4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-12/qtcurve-kde4.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qtcurve-kde4.spec 15 Oct 2009 20:06:10 -0000 1.1 +++ qtcurve-kde4.spec 1 Nov 2009 06:05:26 -0000 1.2 @@ -1,5 +1,5 @@ Name: qtcurve-kde4 -Version: 0.69.0 +Version: 0.69.2 Release: 1%{?dist} Summary: This is a set of widget styles for Qt4/KDE4 based apps @@ -23,7 +23,7 @@ QtCurve is a desktop theme for the GTK+ allowing users to achieve a uniform look between these widget toolkits. %prep -%setup -q -n QtCurve-KDE4-0.69.0 +%setup -q -n QtCurve-KDE4-0.69.2 ## Due to the name change this sed is needed for find-lang. sed -i 's,set(catalogname qtcurve),set(catalogname qtcurve-kde4),g' po/CMakeLists.txt @@ -60,6 +60,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 01 2009 Thomas Janssen 0.69.2-1 +- Updated to source 0.69.2 + * Mon Oct 12 2009 Thomas Janssen 0.69.0-1 - Updated to source version 0.69.0 - Made the QtCurve dir owned Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-12/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Oct 2009 20:06:10 -0000 1.2 +++ sources 1 Nov 2009 06:05:26 -0000 1.3 @@ -1 +1 @@ -2b47051ddc0fb6cccd9473f4717a4b44 QtCurve-KDE4-0.69.0.tar.bz2 +4c346e64459cdae62479f2e7130cf562 QtCurve-KDE4-0.69.2.tar.bz2 From thomasj at fedoraproject.org Sun Nov 1 06:19:28 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 06:19:28 +0000 (UTC) Subject: rpms/qtcurve-kde4/F-11 .cvsignore, 1.2, 1.3 qtcurve-kde4.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101061928.8E5CF11C0086@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/qtcurve-kde4/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24869 Modified Files: .cvsignore qtcurve-kde4.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - Updated to source 0.69.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Oct 2009 20:07:26 -0000 1.2 +++ .cvsignore 1 Nov 2009 06:19:26 -0000 1.3 @@ -1 +1 @@ -QtCurve-KDE4-0.69.0.tar.bz2 +QtCurve-KDE4-0.69.2.tar.bz2 Index: qtcurve-kde4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-11/qtcurve-kde4.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qtcurve-kde4.spec 15 Oct 2009 20:07:26 -0000 1.1 +++ qtcurve-kde4.spec 1 Nov 2009 06:19:27 -0000 1.2 @@ -1,5 +1,5 @@ Name: qtcurve-kde4 -Version: 0.69.0 +Version: 0.69.2 Release: 1%{?dist} Summary: This is a set of widget styles for Qt4/KDE4 based apps @@ -23,7 +23,7 @@ QtCurve is a desktop theme for the GTK+ allowing users to achieve a uniform look between these widget toolkits. %prep -%setup -q -n QtCurve-KDE4-0.69.0 +%setup -q -n QtCurve-KDE4-0.69.2 ## Due to the name change this sed is needed for find-lang. sed -i 's,set(catalogname qtcurve),set(catalogname qtcurve-kde4),g' po/CMakeLists.txt @@ -60,6 +60,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 01 2009 Thomas Janssen 0.69.2-1 +- Updated to source 0.69.2 + * Mon Oct 12 2009 Thomas Janssen 0.69.0-1 - Updated to source version 0.69.0 - Made the QtCurve dir owned Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Oct 2009 20:07:26 -0000 1.2 +++ sources 1 Nov 2009 06:19:27 -0000 1.3 @@ -1 +1 @@ -2b47051ddc0fb6cccd9473f4717a4b44 QtCurve-KDE4-0.69.0.tar.bz2 +4c346e64459cdae62479f2e7130cf562 QtCurve-KDE4-0.69.2.tar.bz2 From thomasj at fedoraproject.org Sun Nov 1 06:34:41 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 06:34:41 +0000 (UTC) Subject: rpms/qtcurve-kde4/F-10 .cvsignore, 1.2, 1.3 qtcurve-kde4.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101063441.743EC11C0086@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/qtcurve-kde4/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29147 Modified Files: .cvsignore qtcurve-kde4.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - Updated to source 0.69.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Oct 2009 20:08:41 -0000 1.2 +++ .cvsignore 1 Nov 2009 06:34:39 -0000 1.3 @@ -1 +1 @@ -QtCurve-KDE4-0.69.0.tar.bz2 +QtCurve-KDE4-0.69.2.tar.bz2 Index: qtcurve-kde4.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-10/qtcurve-kde4.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qtcurve-kde4.spec 15 Oct 2009 20:08:41 -0000 1.1 +++ qtcurve-kde4.spec 1 Nov 2009 06:34:40 -0000 1.2 @@ -1,5 +1,5 @@ Name: qtcurve-kde4 -Version: 0.69.0 +Version: 0.69.2 Release: 1%{?dist} Summary: This is a set of widget styles for Qt4/KDE4 based apps @@ -23,7 +23,7 @@ QtCurve is a desktop theme for the GTK+ allowing users to achieve a uniform look between these widget toolkits. %prep -%setup -q -n QtCurve-KDE4-0.69.0 +%setup -q -n QtCurve-KDE4-0.69.2 ## Due to the name change this sed is needed for find-lang. sed -i 's,set(catalogname qtcurve),set(catalogname qtcurve-kde4),g' po/CMakeLists.txt @@ -60,6 +60,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 01 2009 Thomas Janssen 0.69.2-1 +- Updated to source 0.69.2 + * Mon Oct 12 2009 Thomas Janssen 0.69.0-1 - Updated to source version 0.69.0 - Made the QtCurve dir owned Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Oct 2009 20:08:41 -0000 1.2 +++ sources 1 Nov 2009 06:34:40 -0000 1.3 @@ -1 +1 @@ -2b47051ddc0fb6cccd9473f4717a4b44 QtCurve-KDE4-0.69.0.tar.bz2 +4c346e64459cdae62479f2e7130cf562 QtCurve-KDE4-0.69.2.tar.bz2 From thomasj at fedoraproject.org Sun Nov 1 07:08:15 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 07:08:15 +0000 (UTC) Subject: rpms/qtcurve-gtk2/devel .cvsignore, 1.2, 1.3 qtcurve-gtk2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101070815.7D59011C0086@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/qtcurve-gtk2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7975 Modified Files: .cvsignore qtcurve-gtk2.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - New upstream source 0.69.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Oct 2009 19:08:47 -0000 1.2 +++ .cvsignore 1 Nov 2009 07:08:11 -0000 1.3 @@ -1 +1 @@ -QtCurve-Gtk2-0.69.0.tar.bz2 +QtCurve-Gtk2-0.69.2.tar.bz2 Index: qtcurve-gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/devel/qtcurve-gtk2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qtcurve-gtk2.spec 15 Oct 2009 19:08:48 -0000 1.1 +++ qtcurve-gtk2.spec 1 Nov 2009 07:08:12 -0000 1.2 @@ -1,5 +1,5 @@ Name: qtcurve-gtk2 -Version: 0.69.0 +Version: 0.69.2 Release: 1%{?dist} Summary: This is a set of widget styles for Gtk2 based apps @@ -17,7 +17,7 @@ QtCurve is a desktop theme for the GTK+ allowing users to achieve a uniform look between these widget toolkits. %prep -%setup -q -n QtCurve-Gtk2-0.69.0 +%setup -q -n QtCurve-Gtk2-0.69.2 %build mkdir -p %{_target_platform} @@ -42,6 +42,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 01 2009 Thomas Janssen 0.69.2-1 +- New upstream source 0.69.2 + * Mon Sep 28 2009 Thomas Janssen 0.69.0-1 - Updated source to version 0.69.0 - Dropped unneeded buildrequires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Oct 2009 19:08:48 -0000 1.2 +++ sources 1 Nov 2009 07:08:12 -0000 1.3 @@ -1 +1 @@ -ce22fdf9b0e4e0352195f52a329c8848 QtCurve-Gtk2-0.69.0.tar.bz2 +e5c20d1dfa7a854b0f4f265a8918dbf2 QtCurve-Gtk2-0.69.2.tar.bz2 From thomasj at fedoraproject.org Sun Nov 1 07:29:24 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 07:29:24 +0000 (UTC) Subject: rpms/qtcurve-gtk2/F-12 .cvsignore, 1.2, 1.3 qtcurve-gtk2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101072924.B23F411C0086@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/qtcurve-gtk2/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14986 Modified Files: .cvsignore qtcurve-gtk2.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - New upstream source 0.69.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-12/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Oct 2009 19:12:54 -0000 1.2 +++ .cvsignore 1 Nov 2009 07:29:21 -0000 1.3 @@ -1 +1 @@ -QtCurve-Gtk2-0.69.0.tar.bz2 +QtCurve-Gtk2-0.69.2.tar.bz2 Index: qtcurve-gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-12/qtcurve-gtk2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qtcurve-gtk2.spec 15 Oct 2009 19:12:54 -0000 1.1 +++ qtcurve-gtk2.spec 1 Nov 2009 07:29:21 -0000 1.2 @@ -1,5 +1,5 @@ Name: qtcurve-gtk2 -Version: 0.69.0 +Version: 0.69.2 Release: 1%{?dist} Summary: This is a set of widget styles for Gtk2 based apps @@ -17,7 +17,7 @@ QtCurve is a desktop theme for the GTK+ allowing users to achieve a uniform look between these widget toolkits. %prep -%setup -q -n QtCurve-Gtk2-0.69.0 +%setup -q -n QtCurve-Gtk2-0.69.2 %build mkdir -p %{_target_platform} @@ -42,6 +42,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 01 2009 Thomas Janssen 0.69.2-1 +- New upstream source 0.69.2 + * Mon Sep 28 2009 Thomas Janssen 0.69.0-1 - Updated source to version 0.69.0 - Dropped unneeded buildrequires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-12/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Oct 2009 19:12:54 -0000 1.2 +++ sources 1 Nov 2009 07:29:21 -0000 1.3 @@ -1 +1 @@ -ce22fdf9b0e4e0352195f52a329c8848 QtCurve-Gtk2-0.69.0.tar.bz2 +e5c20d1dfa7a854b0f4f265a8918dbf2 QtCurve-Gtk2-0.69.2.tar.bz2 From thomasj at fedoraproject.org Sun Nov 1 07:56:21 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 07:56:21 +0000 (UTC) Subject: rpms/qtcurve-gtk2/F-11 .cvsignore, 1.2, 1.3 qtcurve-gtk2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101075621.657A811C0086@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/qtcurve-gtk2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29777 Modified Files: .cvsignore qtcurve-gtk2.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - New upstream source 0.69.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Oct 2009 19:14:43 -0000 1.2 +++ .cvsignore 1 Nov 2009 07:56:19 -0000 1.3 @@ -1 +1 @@ -QtCurve-Gtk2-0.69.0.tar.bz2 +QtCurve-Gtk2-0.69.2.tar.bz2 Index: qtcurve-gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-11/qtcurve-gtk2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qtcurve-gtk2.spec 15 Oct 2009 19:14:43 -0000 1.1 +++ qtcurve-gtk2.spec 1 Nov 2009 07:56:20 -0000 1.2 @@ -1,5 +1,5 @@ Name: qtcurve-gtk2 -Version: 0.69.0 +Version: 0.69.2 Release: 1%{?dist} Summary: This is a set of widget styles for Gtk2 based apps @@ -17,7 +17,7 @@ QtCurve is a desktop theme for the GTK+ allowing users to achieve a uniform look between these widget toolkits. %prep -%setup -q -n QtCurve-Gtk2-0.69.0 +%setup -q -n QtCurve-Gtk2-0.69.2 %build mkdir -p %{_target_platform} @@ -42,6 +42,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 01 2009 Thomas Janssen 0.69.2-1 +- New upstream source 0.69.2 + * Mon Sep 28 2009 Thomas Janssen 0.69.0-1 - Updated source to version 0.69.0 - Dropped unneeded buildrequires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Oct 2009 19:14:43 -0000 1.2 +++ sources 1 Nov 2009 07:56:20 -0000 1.3 @@ -1 +1 @@ -ce22fdf9b0e4e0352195f52a329c8848 QtCurve-Gtk2-0.69.0.tar.bz2 +e5c20d1dfa7a854b0f4f265a8918dbf2 QtCurve-Gtk2-0.69.2.tar.bz2 From thomasj at fedoraproject.org Sun Nov 1 08:07:03 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 08:07:03 +0000 (UTC) Subject: rpms/qtcurve-gtk2/F-10 .cvsignore, 1.2, 1.3 qtcurve-gtk2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091101080703.C548E11C0086@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/qtcurve-gtk2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4138 Modified Files: .cvsignore qtcurve-gtk2.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.69.2-1 - New upstream source 0.69.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 15 Oct 2009 19:17:01 -0000 1.2 +++ .cvsignore 1 Nov 2009 08:07:01 -0000 1.3 @@ -1 +1 @@ -QtCurve-Gtk2-0.69.0.tar.bz2 +QtCurve-Gtk2-0.69.2.tar.bz2 Index: qtcurve-gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-10/qtcurve-gtk2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- qtcurve-gtk2.spec 15 Oct 2009 19:17:01 -0000 1.1 +++ qtcurve-gtk2.spec 1 Nov 2009 08:07:02 -0000 1.2 @@ -1,5 +1,5 @@ Name: qtcurve-gtk2 -Version: 0.69.0 +Version: 0.69.2 Release: 1%{?dist} Summary: This is a set of widget styles for Gtk2 based apps @@ -17,7 +17,7 @@ QtCurve is a desktop theme for the GTK+ allowing users to achieve a uniform look between these widget toolkits. %prep -%setup -q -n QtCurve-Gtk2-0.69.0 +%setup -q -n QtCurve-Gtk2-0.69.2 %build mkdir -p %{_target_platform} @@ -42,6 +42,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 01 2009 Thomas Janssen 0.69.2-1 +- New upstream source 0.69.2 + * Mon Sep 28 2009 Thomas Janssen 0.69.0-1 - Updated source to version 0.69.0 - Dropped unneeded buildrequires Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 15 Oct 2009 19:17:01 -0000 1.2 +++ sources 1 Nov 2009 08:07:02 -0000 1.3 @@ -1 +1 @@ -ce22fdf9b0e4e0352195f52a329c8848 QtCurve-Gtk2-0.69.0.tar.bz2 +e5c20d1dfa7a854b0f4f265a8918dbf2 QtCurve-Gtk2-0.69.2.tar.bz2 From mapleoin at fedoraproject.org Sun Nov 1 09:27:16 2009 From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=) Date: Sun, 1 Nov 2009 09:27:16 +0000 (UTC) Subject: rpms/calibre/devel calibre-cssprofiles.patch, NONE, 1.1 calibre-manpages.patch, NONE, 1.1 calibre.spec, NONE, 1.1 generate-tarball.sh, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101092716.3145B11C00EE@cvs1.fedora.phx.redhat.com> Author: mapleoin Update of /cvs/pkgs/rpms/calibre/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2619/devel Modified Files: .cvsignore sources Added Files: calibre-cssprofiles.patch calibre-manpages.patch calibre.spec generate-tarball.sh import.log Log Message: Initial CVS upload. calibre-cssprofiles.patch: stylizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE calibre-cssprofiles.patch --- diff -up calibre/src/calibre/ebooks/oeb/stylizer.py.cssprofiles calibre/src/calibre/ebooks/oeb/stylizer.py --- calibre/src/calibre/ebooks/oeb/stylizer.py.cssprofiles 2009-10-11 19:44:34.190050494 +0300 +++ calibre/src/calibre/ebooks/oeb/stylizer.py 2009-10-11 19:44:54.840926064 +0300 @@ -18,7 +18,7 @@ from xml.dom import SyntaxErr as CSSSynt import cssutils from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \ CSSValueList, CSSFontFaceRule, cssproperties -from cssutils import profile as cssprofiles +from calibre import cssutils_profiles as cssprofiles from lxml import etree from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES calibre-manpages.patch: linux.py | 2 +- utils/help2man.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE calibre-manpages.patch --- diff -up calibre/src/calibre/linux.py.manpages calibre/src/calibre/linux.py --- calibre/src/calibre/linux.py.manpages 2009-10-11 20:11:44.926081363 +0300 +++ calibre/src/calibre/linux.py 2009-10-11 20:11:55.616050312 +0300 @@ -331,7 +331,7 @@ class PostInstall: continue parser = parser() raw = create_man_page(prog, parser) - manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2') + manfile = os.path.join(manpath, prog+'.1') self.info('\tInstalling MAN page for', prog) open(manfile, 'wb').write(raw) self.manifest.append(manfile) diff -up calibre/src/calibre/utils/help2man.py.manpages calibre/src/calibre/utils/help2man.py --- calibre/src/calibre/utils/help2man.py.manpages 2009-10-11 20:12:24.795952999 +0300 +++ calibre/src/calibre/utils/help2man.py 2009-10-11 20:12:52.463949704 +0300 @@ -3,7 +3,7 @@ __license__ = 'GPL 3' __copyright__ = '2009, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import time, bz2 +import time from calibre.constants import __version__, __appname__, __author__ @@ -57,6 +57,6 @@ def create_man_page(prog, parser): lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for x in lines] - return bz2.compress((u'\n'.join(lines)).encode('utf-8')) + return (u'\n'.join(lines).encode('utf-8')) --- NEW FILE calibre.spec --- Name: calibre Version: 0.6.19 Release: 3%{?dist} Summary: E-book converter and library management Group: Applications/Multimedia License: GPLv3 URL: http://calibre.kovidgoyal.net/ # SourceURL: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Upstream packages some unfree fonts which we cannot redistribute. # While we're at it, also delete the liberation fonts which we already have. # # Download the upstream tarball and invoke this script while in the tarball's # directory: # ./generate-tarball.sh %{version} Source0: %{name}-%{version}-nofonts.tar.gz Source1: generate-tarball.sh Patch0: %{name}-cssprofiles.patch Patch1: %{name}-manpages.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python >= 2.6 BuildRequires: python-devel >= 2.6 BuildRequires: ImageMagick-devel BuildRequires: python-setuptools-devel BuildRequires: qt-devel BuildRequires: PyQt4-devel BuildRequires: poppler-qt4-devel >= 0.12 BuildRequires: podofo-devel BuildRequires: desktop-file-utils BuildRequires: python-mechanize BuildRequires: python-lxml BuildRequires: python-dateutil BuildRequires: python-imaging BuildRequires: xdg-utils Requires: pyPdf Requires: python-cherrypy Requires: python-cssutils Requires: ImageMagick Requires: odfpy Requires: django-tagging Requires: python-lxml Requires: python-imaging Requires: python-mechanize Requires: python-dateutil Requires: python-genshi %description Calibre is meant to be a complete e-library solution. It includes library management, format conversion, news feeds to ebook conversion as well as e-book reader sync features. Calibre is primarily a ebook cataloging program. It manages your ebook collection for you. It is designed around the concept of the logical book, i.e. a single entry in the database that may correspond to ebooks in several formats. It also supports conversion to and from a dozen different ebook formats. Supported input formats are: MOBI, LIT, PRC, EPUB, ODT, HTML, CBR, CBZ, RTF, TXT, PDF and LRS. %prep %setup -q -n %{name} # we've moved the profiles so we don't have to redistribute cssutils %patch0 -p1 -b .cssprofiles # don't append calibre1 to the name of the manpages. No need to compress either %patch1 -p1 -b .manpages # dos2unix newline conversion %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/* # remove shebangs %{__sed} -i -e '/^#!\//, 1d' src/calibre/*/*/*/*.py %{__sed} -i -e '/^#!\//, 1d' src/calibre/*/*/*.py %{__sed} -i -e '/^#![ ]*\//, 1d' src/calibre/*/*.py %{__sed} -i -e '/^#!\//, 1d' src/calibre/*.py %{__sed} -i -e '/^#!\//, 1d' resources/recipes/* %{__chmod} -x src/calibre/*/*/*/*.py %{__chmod} -x src/calibre/*/*/*.py %{__chmod} -x src/calibre/*/*.py %{__chmod} -x src/calibre/*.py %{__chmod} -x resources/recipes/* %build OVERRIDE_CFLAGS="%{optflags}" python setup.py build %install rm -rf %{buildroot} # this is the only file we need from the provided cssutils package # need it for the install cp -p src/cssutils/profiles.py src/calibre/cssutils_profiles.py mkdir -p %{buildroot}%{_datadir} # create directories for xdg-utils mkdir -p %{buildroot}%{_datadir}/icons mkdir -p %{buildroot}%{_datadir}/icons/hicolor mkdir -p %{buildroot}%{_datadir}/packages mkdir -p %{buildroot}%{_datadir}/mime mkdir -p %{buildroot}%{_datadir}/mime/packages mkdir -p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_datadir}/desktop-directories XDG_DATA_DIRS="%{buildroot}%{_datadir}" \ XDG_UTILS_INSTALL_MODE="system" \ LIBPATH="%{_libdir}" \ python setup.py install --root=%{buildroot}%{_prefix} \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --staging-libdir=%{buildroot}%{_libdir} \ # icons mkdir -p %{buildroot}%{_datadir}/pixmaps/ cp -p resources/images/library.png \ %{buildroot}%{_datadir}/pixmaps/%{name}.png cp -p resources/images/viewer.svg \ %{buildroot}%{_datadir}/pixmaps/calibre-viewer.svg # every file is empty here find %{buildroot}%{_datadir}/mime -maxdepth 1 -type f|xargs rm -f # packages aren't allowed to register mimetypes like this rm -f %{buildroot}%{_datadir}/applications/defaults.list # Version isn't used correctly and it's not required either desktop-file-install \ --remove-key="Version" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/calibre-gui.desktop desktop-file-install \ --remove-key="Version" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-lrfviewer.desktop desktop-file-install \ --remove-key="Version" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/calibre-ebook-viewer.desktop mv %{buildroot}%{_datadir}/mime/packages/calibre-mimetypes \ %{buildroot}%{_datadir}/mime/packages/calibre-mimetypes.xml # mimetype icon for lrf rm -rf %{buildroot}%{_datadir}/icons/hicolor/128x128 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps cp -p resources/images/mimetypes/lrf.svg \ %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-sony-bbeb.svg cp -p resources/images/viewer.svg \ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/calibre-viewer.svg # don't put bash completions in /usr/etc mv %{buildroot}%{_prefix}%{_sysconfdir} %{buildroot} # these are provided as separate packages rm -rf %{buildroot}%{_libdir}/%{name}/{odf,cherrypy,pyPdf,encutils,cssutils} rm -rf %{buildroot}%{_libdir}/%{name}/cal/utils/genshi rm -rf %{buildroot}%{_libdir}/%{name}/cal/trac # link to system fonts after we have deleted (see Source0) the non-free ones ln -s %{_datadir}/fonts/liberation/LiberationSans-Regular.ttf \ %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0003m_.ttf ln -s %{_datadir}/fonts/liberation/LiberationSerif-Regular.ttf \ %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0011m_.ttf ln -s %{_datadir}/fonts/liberation/LiberationMono-Regular.ttf \ %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0419m_.ttf # man pages mv %{buildroot}%{_datadir}/%{name}/man %{buildroot}%{_mandir} # move locales mv %{buildroot}%{_datadir}/%{name}/localization/locales \ %{buildroot}%{_datadir}/locale for file in %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/messages.mo; do lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:') mv %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/messages.mo \ %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/%{name}.mo done; for file in %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/iso639.mo; do lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:') mv %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/iso639.mo \ %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/%{name}_iso639.mo done; for file in %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/qt.qm; do lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:') mv $file %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/%{name}_$lang.qm done; %find_lang %{name} --with-qt --all-name # locales should be looked for in the proper place %{__sed} -i -e "s:P('localization/locales:('/usr/share/locale:" \ -e "s/messages.mo/calibre.mo/" \ -e "s/iso639.mo/calibre_iso639.mo/" \ %{buildroot}%{_libdir}/%{name}/%{name}/utils/localization.py # this is the only file we need from the provided cssutils package cp -p src/cssutils/profiles.py %{buildroot}%{_libdir}/%{name}/%{name}/ %{__rm} -f %{buildroot}%{_bindir}/%{name}-uninstall %clean %{__rm} -rf %{buildroot} %post update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYRIGHT LICENSE %{_bindir}/* %config(noreplace) %{_sysconfdir}/bash_completion.d/ %{_libdir}/%{name} %{_prefix}/lib/udev/rules.d/* %{_datadir}/%{name} %{_datadir}/pixmaps/* %{_datadir}/applications/* %{_datadir}/mime/packages/* %{_datadir}/icons/hicolor/scalable/mimetypes/* %{_datadir}/icons/hicolor/scalable/apps/* %{_mandir}/man1/* %changelog * Thu Oct 22 2009 Ionu? C. Ar??ri?i - 0.6.19-3 - removed unfree fonts from source package * Thu Oct 22 2009 Ionu? C. Ar??ri?i - 0.6.19-2 - readability enhancements - added python-genshi requires - removed libwmf require since ImageMagick provides libwmf-lite as a dependency and that's what we actually need * Wed Oct 21 2009 Ionu? Ar??ri?i - 0.6.19-1 - new upstream version: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.1920Oct2009 - delete fonts, calibre can find the system fonts - specify libdir as an install option, so calibre will link properly even on 64bit * Mon Oct 19 2009 Ionu? Ar??ri?i - 0.6.18-1 - updated requires list - new upstream release - can override CFLAGS now - removed trac and genshi duplicates - use xdg env variables to do desktop integration in the buildroot - added xdg-utils buildrequire - install udev rules in /usr/lib even on 64bit and don't own the whole dir - removed wrongly used Version field from .desktop files * Mon Oct 12 2009 Ionu? Ar??ri?i - 0.6.17-2 - mimick what calibre's desktop-integration script does (mimetypes, icons etc.) - removed unneeded INSTALL file - marked bash completion file as config(noreplace) and take ownership of the dir * Sat Oct 10 2009 Ionu? Ar??ri?i - 0.6.17-1 - new upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.1709Oct2009 - the install process changed significantly - locales were added * Thu Sep 10 2009 Ionu? Ar??ri?i - 0.6.11-1 - new upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.1104Sep2009 - minor path fixes - rearranged files section * Fri Aug 28 2009 Ionu? Ar??ri?i 0.6.10-1 - handle desktop files - don't compress manpages and don't list them as duplicates - added lrfviewer icon * Tue Aug 25 2009 Ionu? Ar??ri?i 0.6.8-1 - Initial RPM release --- NEW FILE generate-tarball.sh --- #!/bin/sh VERSION=$1 tar -xvzf calibre-$VERSION.tar.gz rm -f calibre/resources/fonts/liberation/* rm -f calibre/resources/fonts/prs500/* tar -cvzf calibre-$VERSION-nofonts.tar.gz calibre --- NEW FILE import.log --- calibre-0_6_19-3_fc11:HEAD:calibre-0.6.19-3.fc11.src.rpm:1257067210 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/calibre/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:52:06 -0000 1.1 +++ .cvsignore 1 Nov 2009 09:27:14 -0000 1.2 @@ -0,0 +1 @@ +calibre-0.6.19-nofonts.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/calibre/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:52:07 -0000 1.1 +++ sources 1 Nov 2009 09:27:15 -0000 1.2 @@ -0,0 +1 @@ +087e8b4bdd098ea1d22598c025d6eaaf calibre-0.6.19-nofonts.tar.gz From sciurius at fedoraproject.org Sun Nov 1 09:29:25 2009 From: sciurius at fedoraproject.org (Johan Vromans) Date: Sun, 1 Nov 2009 09:29:25 +0000 (UTC) Subject: rpms/perl-V/F-10 import.log, NONE, 1.1 perl-V.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101092925.A51AF11C00EE@cvs1.fedora.phx.redhat.com> Author: sciurius Update of /cvs/pkgs/rpms/perl-V/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3308/F-10 Modified Files: .cvsignore sources Added Files: import.log perl-V.spec Log Message: Initial check-in source from upstream. --- NEW FILE import.log --- perl-V-0_13-1_fc10:F-10:perl-V-0.13-1.fc10.src.rpm:1257067682 --- NEW FILE perl-V.spec --- Name: perl-V Version: 0.13 Release: 1%{?dist} Summary: Print version of the specified Perl modules Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/V Source0: http://search.cpan.org/CPAN/authors/id/A/AB/ABELTJE/V-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) %description A light-weight module for getting versions of Perl modules without loading them. %prep %setup -q -n V-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test TEST_VERBOSE=1 %install %{__rm} -rf %{buildroot} %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{__chmod} -R u+w %{buildroot}/* %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Oct 22 2009 Johan Vromans 0.13-1 - Initial Fedora RPM version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-V/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:43:37 -0000 1.1 +++ .cvsignore 1 Nov 2009 09:29:25 -0000 1.2 @@ -0,0 +1 @@ +V-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-V/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:43:37 -0000 1.1 +++ sources 1 Nov 2009 09:29:25 -0000 1.2 @@ -0,0 +1 @@ +fb4e5b1ae277880c1798677a9db8659e V-0.13.tar.gz From sciurius at fedoraproject.org Sun Nov 1 09:31:07 2009 From: sciurius at fedoraproject.org (Johan Vromans) Date: Sun, 1 Nov 2009 09:31:07 +0000 (UTC) Subject: rpms/perl-V/F-11 import.log, NONE, 1.1 perl-V.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101093107.2429111C02A5@cvs1.fedora.phx.redhat.com> Author: sciurius Update of /cvs/pkgs/rpms/perl-V/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3867/F-11 Modified Files: .cvsignore sources Added Files: import.log perl-V.spec Log Message: Initial import from upstream sources. --- NEW FILE import.log --- perl-V-0_13-1_fc10:F-11:perl-V-0.13-1.fc10.src.rpm:1257067821 --- NEW FILE perl-V.spec --- Name: perl-V Version: 0.13 Release: 1%{?dist} Summary: Print version of the specified Perl modules Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/V Source0: http://search.cpan.org/CPAN/authors/id/A/AB/ABELTJE/V-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) %description A light-weight module for getting versions of Perl modules without loading them. %prep %setup -q -n V-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test TEST_VERBOSE=1 %install %{__rm} -rf %{buildroot} %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{__chmod} -R u+w %{buildroot}/* %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Oct 22 2009 Johan Vromans 0.13-1 - Initial Fedora RPM version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-V/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:43:37 -0000 1.1 +++ .cvsignore 1 Nov 2009 09:31:06 -0000 1.2 @@ -0,0 +1 @@ +V-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-V/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:43:37 -0000 1.1 +++ sources 1 Nov 2009 09:31:06 -0000 1.2 @@ -0,0 +1 @@ +fb4e5b1ae277880c1798677a9db8659e V-0.13.tar.gz From mapleoin at fedoraproject.org Sun Nov 1 09:47:10 2009 From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=) Date: Sun, 1 Nov 2009 09:47:10 +0000 (UTC) Subject: rpms/calibre/F-12 calibre-cssprofiles.patch, NONE, 1.1 calibre-manpages.patch, NONE, 1.1 calibre.spec, NONE, 1.1 generate-tarball.sh, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101094710.6A88811C00EE@cvs1.fedora.phx.redhat.com> Author: mapleoin Update of /cvs/pkgs/rpms/calibre/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7955/F-12 Modified Files: .cvsignore sources Added Files: calibre-cssprofiles.patch calibre-manpages.patch calibre.spec generate-tarball.sh import.log Log Message: Initial CVS upload. calibre-cssprofiles.patch: stylizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE calibre-cssprofiles.patch --- diff -up calibre/src/calibre/ebooks/oeb/stylizer.py.cssprofiles calibre/src/calibre/ebooks/oeb/stylizer.py --- calibre/src/calibre/ebooks/oeb/stylizer.py.cssprofiles 2009-10-11 19:44:34.190050494 +0300 +++ calibre/src/calibre/ebooks/oeb/stylizer.py 2009-10-11 19:44:54.840926064 +0300 @@ -18,7 +18,7 @@ from xml.dom import SyntaxErr as CSSSynt import cssutils from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \ CSSValueList, CSSFontFaceRule, cssproperties -from cssutils import profile as cssprofiles +from calibre import cssutils_profiles as cssprofiles from lxml import etree from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES calibre-manpages.patch: linux.py | 2 +- utils/help2man.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE calibre-manpages.patch --- diff -up calibre/src/calibre/linux.py.manpages calibre/src/calibre/linux.py --- calibre/src/calibre/linux.py.manpages 2009-10-11 20:11:44.926081363 +0300 +++ calibre/src/calibre/linux.py 2009-10-11 20:11:55.616050312 +0300 @@ -331,7 +331,7 @@ class PostInstall: continue parser = parser() raw = create_man_page(prog, parser) - manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2') + manfile = os.path.join(manpath, prog+'.1') self.info('\tInstalling MAN page for', prog) open(manfile, 'wb').write(raw) self.manifest.append(manfile) diff -up calibre/src/calibre/utils/help2man.py.manpages calibre/src/calibre/utils/help2man.py --- calibre/src/calibre/utils/help2man.py.manpages 2009-10-11 20:12:24.795952999 +0300 +++ calibre/src/calibre/utils/help2man.py 2009-10-11 20:12:52.463949704 +0300 @@ -3,7 +3,7 @@ __license__ = 'GPL 3' __copyright__ = '2009, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import time, bz2 +import time from calibre.constants import __version__, __appname__, __author__ @@ -57,6 +57,6 @@ def create_man_page(prog, parser): lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for x in lines] - return bz2.compress((u'\n'.join(lines)).encode('utf-8')) + return (u'\n'.join(lines).encode('utf-8')) --- NEW FILE calibre.spec --- Name: calibre Version: 0.6.19 Release: 3%{?dist} Summary: E-book converter and library management Group: Applications/Multimedia License: GPLv3 URL: http://calibre.kovidgoyal.net/ # SourceURL: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Upstream packages some unfree fonts which we cannot redistribute. # While we're at it, also delete the liberation fonts which we already have. # # Download the upstream tarball and invoke this script while in the tarball's # directory: # ./generate-tarball.sh %{version} Source0: %{name}-%{version}-nofonts.tar.gz Source1: generate-tarball.sh Patch0: %{name}-cssprofiles.patch Patch1: %{name}-manpages.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python >= 2.6 BuildRequires: python-devel >= 2.6 BuildRequires: ImageMagick-devel BuildRequires: python-setuptools-devel BuildRequires: qt-devel BuildRequires: PyQt4-devel BuildRequires: poppler-qt4-devel >= 0.12 BuildRequires: podofo-devel BuildRequires: desktop-file-utils BuildRequires: python-mechanize BuildRequires: python-lxml BuildRequires: python-dateutil BuildRequires: python-imaging BuildRequires: xdg-utils Requires: pyPdf Requires: python-cherrypy Requires: python-cssutils Requires: ImageMagick Requires: odfpy Requires: django-tagging Requires: python-lxml Requires: python-imaging Requires: python-mechanize Requires: python-dateutil Requires: python-genshi %description Calibre is meant to be a complete e-library solution. It includes library management, format conversion, news feeds to ebook conversion as well as e-book reader sync features. Calibre is primarily a ebook cataloging program. It manages your ebook collection for you. It is designed around the concept of the logical book, i.e. a single entry in the database that may correspond to ebooks in several formats. It also supports conversion to and from a dozen different ebook formats. Supported input formats are: MOBI, LIT, PRC, EPUB, ODT, HTML, CBR, CBZ, RTF, TXT, PDF and LRS. %prep %setup -q -n %{name} # we've moved the profiles so we don't have to redistribute cssutils %patch0 -p1 -b .cssprofiles # don't append calibre1 to the name of the manpages. No need to compress either %patch1 -p1 -b .manpages # dos2unix newline conversion %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/* # remove shebangs %{__sed} -i -e '/^#!\//, 1d' src/calibre/*/*/*/*.py %{__sed} -i -e '/^#!\//, 1d' src/calibre/*/*/*.py %{__sed} -i -e '/^#![ ]*\//, 1d' src/calibre/*/*.py %{__sed} -i -e '/^#!\//, 1d' src/calibre/*.py %{__sed} -i -e '/^#!\//, 1d' resources/recipes/* %{__chmod} -x src/calibre/*/*/*/*.py %{__chmod} -x src/calibre/*/*/*.py %{__chmod} -x src/calibre/*/*.py %{__chmod} -x src/calibre/*.py %{__chmod} -x resources/recipes/* %build OVERRIDE_CFLAGS="%{optflags}" python setup.py build %install rm -rf %{buildroot} # this is the only file we need from the provided cssutils package # need it for the install cp -p src/cssutils/profiles.py src/calibre/cssutils_profiles.py mkdir -p %{buildroot}%{_datadir} # create directories for xdg-utils mkdir -p %{buildroot}%{_datadir}/icons mkdir -p %{buildroot}%{_datadir}/icons/hicolor mkdir -p %{buildroot}%{_datadir}/packages mkdir -p %{buildroot}%{_datadir}/mime mkdir -p %{buildroot}%{_datadir}/mime/packages mkdir -p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_datadir}/desktop-directories XDG_DATA_DIRS="%{buildroot}%{_datadir}" \ XDG_UTILS_INSTALL_MODE="system" \ LIBPATH="%{_libdir}" \ python setup.py install --root=%{buildroot}%{_prefix} \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --staging-libdir=%{buildroot}%{_libdir} \ # icons mkdir -p %{buildroot}%{_datadir}/pixmaps/ cp -p resources/images/library.png \ %{buildroot}%{_datadir}/pixmaps/%{name}.png cp -p resources/images/viewer.svg \ %{buildroot}%{_datadir}/pixmaps/calibre-viewer.svg # every file is empty here find %{buildroot}%{_datadir}/mime -maxdepth 1 -type f|xargs rm -f # packages aren't allowed to register mimetypes like this rm -f %{buildroot}%{_datadir}/applications/defaults.list # Version isn't used correctly and it's not required either desktop-file-install \ --remove-key="Version" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/calibre-gui.desktop desktop-file-install \ --remove-key="Version" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-lrfviewer.desktop desktop-file-install \ --remove-key="Version" \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/calibre-ebook-viewer.desktop mv %{buildroot}%{_datadir}/mime/packages/calibre-mimetypes \ %{buildroot}%{_datadir}/mime/packages/calibre-mimetypes.xml # mimetype icon for lrf rm -rf %{buildroot}%{_datadir}/icons/hicolor/128x128 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps cp -p resources/images/mimetypes/lrf.svg \ %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-sony-bbeb.svg cp -p resources/images/viewer.svg \ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/calibre-viewer.svg # don't put bash completions in /usr/etc mv %{buildroot}%{_prefix}%{_sysconfdir} %{buildroot} # these are provided as separate packages rm -rf %{buildroot}%{_libdir}/%{name}/{odf,cherrypy,pyPdf,encutils,cssutils} rm -rf %{buildroot}%{_libdir}/%{name}/cal/utils/genshi rm -rf %{buildroot}%{_libdir}/%{name}/cal/trac # link to system fonts after we have deleted (see Source0) the non-free ones ln -s %{_datadir}/fonts/liberation/LiberationSans-Regular.ttf \ %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0003m_.ttf ln -s %{_datadir}/fonts/liberation/LiberationSerif-Regular.ttf \ %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0011m_.ttf ln -s %{_datadir}/fonts/liberation/LiberationMono-Regular.ttf \ %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0419m_.ttf # man pages mv %{buildroot}%{_datadir}/%{name}/man %{buildroot}%{_mandir} # move locales mv %{buildroot}%{_datadir}/%{name}/localization/locales \ %{buildroot}%{_datadir}/locale for file in %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/messages.mo; do lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:') mv %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/messages.mo \ %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/%{name}.mo done; for file in %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/iso639.mo; do lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:') mv %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/iso639.mo \ %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/%{name}_iso639.mo done; for file in %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/qt.qm; do lang=$(echo $file|%{__sed} 's:.*locale/\(.*\)/LC_MESSAGES.*:\1:') mv $file %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/%{name}_$lang.qm done; %find_lang %{name} --with-qt --all-name # locales should be looked for in the proper place %{__sed} -i -e "s:P('localization/locales:('/usr/share/locale:" \ -e "s/messages.mo/calibre.mo/" \ -e "s/iso639.mo/calibre_iso639.mo/" \ %{buildroot}%{_libdir}/%{name}/%{name}/utils/localization.py # this is the only file we need from the provided cssutils package cp -p src/cssutils/profiles.py %{buildroot}%{_libdir}/%{name}/%{name}/ %{__rm} -f %{buildroot}%{_bindir}/%{name}-uninstall %clean %{__rm} -rf %{buildroot} %post update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYRIGHT LICENSE %{_bindir}/* %config(noreplace) %{_sysconfdir}/bash_completion.d/ %{_libdir}/%{name} %{_prefix}/lib/udev/rules.d/* %{_datadir}/%{name} %{_datadir}/pixmaps/* %{_datadir}/applications/* %{_datadir}/mime/packages/* %{_datadir}/icons/hicolor/scalable/mimetypes/* %{_datadir}/icons/hicolor/scalable/apps/* %{_mandir}/man1/* %changelog * Thu Oct 22 2009 Ionu? C. Ar??ri?i - 0.6.19-3 - removed unfree fonts from source package * Thu Oct 22 2009 Ionu? C. Ar??ri?i - 0.6.19-2 - readability enhancements - added python-genshi requires - removed libwmf require since ImageMagick provides libwmf-lite as a dependency and that's what we actually need * Wed Oct 21 2009 Ionu? Ar??ri?i - 0.6.19-1 - new upstream version: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.1920Oct2009 - delete fonts, calibre can find the system fonts - specify libdir as an install option, so calibre will link properly even on 64bit * Mon Oct 19 2009 Ionu? Ar??ri?i - 0.6.18-1 - updated requires list - new upstream release - can override CFLAGS now - removed trac and genshi duplicates - use xdg env variables to do desktop integration in the buildroot - added xdg-utils buildrequire - install udev rules in /usr/lib even on 64bit and don't own the whole dir - removed wrongly used Version field from .desktop files * Mon Oct 12 2009 Ionu? Ar??ri?i - 0.6.17-2 - mimick what calibre's desktop-integration script does (mimetypes, icons etc.) - removed unneeded INSTALL file - marked bash completion file as config(noreplace) and take ownership of the dir * Sat Oct 10 2009 Ionu? Ar??ri?i - 0.6.17-1 - new upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.1709Oct2009 - the install process changed significantly - locales were added * Thu Sep 10 2009 Ionu? Ar??ri?i - 0.6.11-1 - new upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.1104Sep2009 - minor path fixes - rearranged files section * Fri Aug 28 2009 Ionu? Ar??ri?i 0.6.10-1 - handle desktop files - don't compress manpages and don't list them as duplicates - added lrfviewer icon * Tue Aug 25 2009 Ionu? Ar??ri?i 0.6.8-1 - Initial RPM release --- NEW FILE generate-tarball.sh --- #!/bin/sh VERSION=$1 tar -xvzf calibre-$VERSION.tar.gz rm -f calibre/resources/fonts/liberation/* rm -f calibre/resources/fonts/prs500/* tar -cvzf calibre-$VERSION-nofonts.tar.gz calibre --- NEW FILE import.log --- calibre-0_6_19-3_fc11:F-12:calibre-0.6.19-3.fc11.src.rpm:1257068462 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/calibre/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:52:06 -0000 1.1 +++ .cvsignore 1 Nov 2009 09:47:09 -0000 1.2 @@ -0,0 +1 @@ +calibre-0.6.19-nofonts.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/calibre/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:52:07 -0000 1.1 +++ sources 1 Nov 2009 09:47:09 -0000 1.2 @@ -0,0 +1 @@ +087e8b4bdd098ea1d22598c025d6eaaf calibre-0.6.19-nofonts.tar.gz From sciurius at fedoraproject.org Sun Nov 1 10:04:11 2009 From: sciurius at fedoraproject.org (Johan Vromans) Date: Sun, 1 Nov 2009 10:04:11 +0000 (UTC) Subject: rpms/perl-V/F-12 import.log, NONE, 1.1 perl-V.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101100411.15AD811C00EE@cvs1.fedora.phx.redhat.com> Author: sciurius Update of /cvs/pkgs/rpms/perl-V/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11426/F-12 Modified Files: .cvsignore sources Added Files: import.log perl-V.spec Log Message: Initial import from upstream sources. --- NEW FILE import.log --- perl-V-0_13-1_fc10:F-12:perl-V-0.13-1.fc10.src.rpm:1257069815 --- NEW FILE perl-V.spec --- Name: perl-V Version: 0.13 Release: 1%{?dist} Summary: Print version of the specified Perl modules Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/V Source0: http://search.cpan.org/CPAN/authors/id/A/AB/ABELTJE/V-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) %description A light-weight module for getting versions of Perl modules without loading them. %prep %setup -q -n V-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test TEST_VERBOSE=1 %install %{__rm} -rf %{buildroot} %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{__chmod} -R u+w %{buildroot}/* %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Oct 22 2009 Johan Vromans 0.13-1 - Initial Fedora RPM version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-V/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:43:37 -0000 1.1 +++ .cvsignore 1 Nov 2009 10:04:09 -0000 1.2 @@ -0,0 +1 @@ +V-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-V/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:43:37 -0000 1.1 +++ sources 1 Nov 2009 10:04:10 -0000 1.2 @@ -0,0 +1 @@ +fb4e5b1ae277880c1798677a9db8659e V-0.13.tar.gz From sciurius at fedoraproject.org Sun Nov 1 10:05:18 2009 From: sciurius at fedoraproject.org (Johan Vromans) Date: Sun, 1 Nov 2009 10:05:18 +0000 (UTC) Subject: rpms/perl-V/devel import.log, NONE, 1.1 perl-V.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101100518.2E64E11C00EE@cvs1.fedora.phx.redhat.com> Author: sciurius Update of /cvs/pkgs/rpms/perl-V/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11806/devel Modified Files: .cvsignore sources Added Files: import.log perl-V.spec Log Message: Initial import from upstream sources. --- NEW FILE import.log --- perl-V-0_13-1_fc10:HEAD:perl-V-0.13-1.fc10.src.rpm:1257069885 --- NEW FILE perl-V.spec --- Name: perl-V Version: 0.13 Release: 1%{?dist} Summary: Print version of the specified Perl modules Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/V Source0: http://search.cpan.org/CPAN/authors/id/A/AB/ABELTJE/V-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) %description A light-weight module for getting versions of Perl modules without loading them. %prep %setup -q -n V-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test TEST_VERBOSE=1 %install %{__rm} -rf %{buildroot} %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' %{__chmod} -R u+w %{buildroot}/* %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog * Thu Oct 22 2009 Johan Vromans 0.13-1 - Initial Fedora RPM version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-V/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:43:37 -0000 1.1 +++ .cvsignore 1 Nov 2009 10:05:17 -0000 1.2 @@ -0,0 +1 @@ +V-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-V/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:43:37 -0000 1.1 +++ sources 1 Nov 2009 10:05:17 -0000 1.2 @@ -0,0 +1 @@ +fb4e5b1ae277880c1798677a9db8659e V-0.13.tar.gz From jussilehtola at fedoraproject.org Sun Nov 1 10:47:35 2009 From: jussilehtola at fedoraproject.org (Jussi Lehtola) Date: Sun, 1 Nov 2009 10:47:35 +0000 (UTC) Subject: rpms/PyMca/devel PyMca.desktop, NONE, 1.1 PyMca.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101104735.6347211C00EE@cvs1.fedora.phx.redhat.com> Author: jussilehtola Update of /cvs/pkgs/rpms/PyMca/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21676/devel Modified Files: .cvsignore sources Added Files: PyMca.desktop PyMca.spec import.log Log Message: Imported in Fedora. --- NEW FILE PyMca.desktop --- [Desktop Entry] Encoding=UTF-8 Name=PyMca Comment=A collection of Python tools for visualization and analysis of energy-dispersive X-ray fluorescence data Exec=pymca Terminal=false Type=Application Categories=Education;Science;DataVisualization;Physics; --- NEW FILE PyMca.spec --- %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyMca Version: 4.3.0 Release: 4%{?dist} Summary: GUI for multi-channel analyser spectra visualization and analysis Group: Applications/Engineering License: GPLv2+ URL: http://pymca.sourceforge.net/ Source0: http://downloads.sourceforge.net/sourceforge/pymca/pymca%{version}-src.tgz # Desktop file Source1: PyMca.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: python-devel BuildRequires: python-setuptools # Needed for normal operations BuildRequires: numpy BuildRequires: PyQt4 BuildRequires: PyQwt Requires: numpy Requires: PyQt4 Requires: PyQwt %description PyMCA provides a graphical interface for multi-channel analyser spectra visualization and analysis. PyMca can display spectra from a file or directly from SPEC during acquisitions. %prep %setup -q -n %{name}%{version} # Fix perms chmod 644 LICENSE.GPL README find -name *.c -exec chmod 644 {} \; find -name *.h -exec chmod 644 {} \; %build # setup.py asks for license approval echo yes | python setup.py build %install rm -rf %{buildroot} # setup.py asks for license approval echo yes | python setup.py install -O1 --skip-build --root %{buildroot} # Install desktop file desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} # Get rid of buildroot in files in %{_bindir} for bin in %{buildroot}%{_bindir}/*; do sed 's|%{buildroot}||g' $bin > $bin.new && touch -r $bin $bin.new && mv $bin.new $bin done # Fix library permissions find %{buildroot}%{python_sitearch}/PyMca/ -type f -exec chmod 644 {} \; chmod 755 %{buildroot}%{python_sitearch}/PyMca/*.so # Get rid of /usr/bin/env in libraries for lib in %{buildroot}%{python_sitearch}/PyMca/*.py; do sed '/\/usr\/bin\/env/d' $lib > $lib.new && touch -r $lib $lib.new && mv $lib.new $lib done %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.GPL README %{python_sitearch}/PyMca/ %{python_sitearch}/PyMca-%{version}-py*.egg-info/ %{_bindir}/edfviewer %{_bindir}/elementsinfo %{_bindir}/mca2edf %{_bindir}/peakidentifier %{_bindir}/pymca* %{_datadir}/applications/PyMca.desktop %changelog * Fri Oct 30 2009 Jussi Lehtola - 4.3.0-4 - Keep time stamps also on binfiles. * Fri Oct 30 2009 Jussi Lehtola - 4.3.0-3 - Added BR: python-devel. - Added desktop file. * Fri Oct 30 2009 Jussi Lehtola - 4.3.0-2 - Keep time stamps during sed of libraries. - Changed BR: python-setuptools-devel to python-setuptools-devel. * Thu Oct 08 2009 Jussi Lehtola - 4.3.0-1 - First release. --- NEW FILE import.log --- PyMca-4_3_0-4_fc12:HEAD:PyMca-4.3.0-4.fc12.src.rpm:1257072398 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PyMca/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:50:29 -0000 1.1 +++ .cvsignore 1 Nov 2009 10:47:33 -0000 1.2 @@ -0,0 +1 @@ +pymca4.3.0-src.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PyMca/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:50:29 -0000 1.1 +++ sources 1 Nov 2009 10:47:34 -0000 1.2 @@ -0,0 +1 @@ +e9d986a14899fecf38e5214c5712d409 pymca4.3.0-src.tgz From pkgdb at fedoraproject.org Sun Nov 1 11:37:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 11:37:55 +0000 Subject: [pkgdb] gammu: tomspur has requested watchbugzilla Message-ID: <20091101113755.5F01510F806@bastion2.fedora.phx.redhat.com> tomspur has requested the watchbugzilla acl on gammu (Fedora devel) To make changes to this package see: /pkgdb/packages/name/gammu From pkgdb at fedoraproject.org Sun Nov 1 11:37:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 11:37:57 +0000 Subject: [pkgdb] gammu: tomspur has requested watchcommits Message-ID: <20091101113757.A76D510F877@bastion2.fedora.phx.redhat.com> tomspur has requested the watchcommits acl on gammu (Fedora devel) To make changes to this package see: /pkgdb/packages/name/gammu From pkgdb at fedoraproject.org Sun Nov 1 11:37:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 11:37:59 +0000 Subject: [pkgdb] gammu: tomspur has requested commit Message-ID: <20091101113759.635AD10F806@bastion2.fedora.phx.redhat.com> tomspur has requested the commit acl on gammu (Fedora devel) To make changes to this package see: /pkgdb/packages/name/gammu From pkgdb at fedoraproject.org Sun Nov 1 11:38:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 11:38:05 +0000 Subject: [pkgdb] gammu: tomspur has requested watchbugzilla Message-ID: <20091101113805.5757A10F874@bastion2.fedora.phx.redhat.com> tomspur has requested the watchbugzilla acl on gammu (Fedora 12) To make changes to this package see: /pkgdb/packages/name/gammu From pkgdb at fedoraproject.org Sun Nov 1 11:38:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 11:38:07 +0000 Subject: [pkgdb] gammu: tomspur has requested watchcommits Message-ID: <20091101113807.280DB10F806@bastion2.fedora.phx.redhat.com> tomspur has requested the watchcommits acl on gammu (Fedora 12) To make changes to this package see: /pkgdb/packages/name/gammu From pkgdb at fedoraproject.org Sun Nov 1 11:38:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 11:38:08 +0000 Subject: [pkgdb] gammu: tomspur has requested commit Message-ID: <20091101113808.E134010F872@bastion2.fedora.phx.redhat.com> tomspur has requested the commit acl on gammu (Fedora 12) To make changes to this package see: /pkgdb/packages/name/gammu From pkgdb at fedoraproject.org Sun Nov 1 11:38:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 11:38:39 +0000 Subject: [pkgdb] gammu: tomspur has requested watchbugzilla Message-ID: <20091101113839.88CD310F806@bastion2.fedora.phx.redhat.com> tomspur has requested the watchbugzilla acl on gammu (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/gammu From pkgdb at fedoraproject.org Sun Nov 1 11:38:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 11:38:41 +0000 Subject: [pkgdb] gammu: tomspur has requested watchcommits Message-ID: <20091101113841.4D30710F87D@bastion2.fedora.phx.redhat.com> tomspur has requested the watchcommits acl on gammu (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/gammu From pkgdb at fedoraproject.org Sun Nov 1 11:38:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 11:38:43 +0000 Subject: [pkgdb] gammu: tomspur has requested commit Message-ID: <20091101113843.3F0E110F87F@bastion2.fedora.phx.redhat.com> tomspur has requested the commit acl on gammu (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/gammu From pbrobinson at fedoraproject.org Sun Nov 1 12:26:21 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Sun, 1 Nov 2009 12:26:21 +0000 (UTC) Subject: rpms/nbtk/devel .cvsignore, 1.9, 1.10 nbtk.spec, 1.31, 1.32 sources, 1.10, 1.11 Message-ID: <20091101122622.14BFB11C00EE@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/nbtk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11291 Modified Files: .cvsignore nbtk.spec sources Log Message: - New upstream 1.1.13 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nbtk/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 26 Oct 2009 23:42:43 -0000 1.9 +++ .cvsignore 1 Nov 2009 12:26:18 -0000 1.10 @@ -1 +1 @@ -nbtk-1.1.9.tar.bz2 +nbtk-0.1.13.tar.bz2 Index: nbtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- nbtk.spec 26 Oct 2009 23:42:43 -0000 1.31 +++ nbtk.spec 1 Nov 2009 12:26:19 -0000 1.32 @@ -1,5 +1,5 @@ Name: nbtk -Version: 1.1.9 +Version: 1.1.13 Release: 1%{?dist} Summary: A toolkit for moblin NetBooks @@ -86,6 +86,9 @@ rm -rf %{buildroot} %doc %{_datadir}/gtk-doc/html/%{name} %changelog +* Sun Nov 1 2009 Peter Robinson 1.1.13-1 +- New upstream 1.1.13 release + * Mon Oct 26 2009 Peter Robinson 1.1.9-1 - New upstream 1.1.9 release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nbtk/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 26 Oct 2009 23:42:43 -0000 1.10 +++ sources 1 Nov 2009 12:26:19 -0000 1.11 @@ -1 +1 @@ -697835b99ceb9c250ed5aeaae62776bb nbtk-1.1.9.tar.bz2 +a0b8f3ede226c7519b977835bd434376 nbtk-0.1.13.tar.bz2 From transif at fedoraproject.org Sun Nov 1 12:31:36 2009 From: transif at fedoraproject.org (Transifex System User) Date: Sun, 1 Nov 2009 12:31:36 +0000 (UTC) Subject: comps/po el.po,1.20,1.21 Message-ID: <20091101123136.A0D6611C02BC@cvs1.fedora.phx.redhat.com> Author: transif Update of /cvs/pkgs/comps/po In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12558/po Modified Files: el.po Log Message: Sending translation for Greek View full diff with command: /usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 el.poIndex: el.po =================================================================== RCS file: /cvs/pkgs/comps/po/el.po,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- el.po 29 Apr 2009 20:00:18 -0000 1.20 +++ el.po 1 Nov 2009 12:31:33 -0000 1.21 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-04-29 15:51-0400\n" -"PO-Revision-Date: 2009-04-01 19:58+0200\n" -"Last-Translator: nikosCharonitakis \n" +"PO-Revision-Date: 2009-11-01 14:22+0200\n" +"Last-Translator: \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,200 +21,320 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1 -#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1 +#: ../comps-f7.xml.in.h:1 +#: ../comps-f8.xml.in.h:1 +#: ../comps-f9.xml.in.h:1 +#: ../comps-f10.xml.in.h:1 +#: ../comps-f11.xml.in.h:1 msgid "A lightweight desktop environment that works well on low end machines." -msgstr "" -"?????? ?????????????? ?????????????????? ???????????????? ?????? ???????????????? ???????? ???????? ???? ???????????????????? " -"????????????????????." +msgstr "?????? ?????????????? ?????????????????? ???????????????? ?????? ???????????????? ???????? ???????? ???? ???????????????????? ????????????????????." -#: ../comps-f7.xml.in.h:2 ../comps-f8.xml.in.h:2 ../comps-f9.xml.in.h:2 -#: ../comps-f10.xml.in.h:3 ../comps-f11.xml.in.h:3 ../comps-el4.xml.in.h:1 +#: ../comps-f7.xml.in.h:2 +#: ../comps-f8.xml.in.h:2 +#: ../comps-f9.xml.in.h:2 +#: ../comps-f10.xml.in.h:3 +#: ../comps-f11.xml.in.h:3 +#: ../comps-el4.xml.in.h:1 #: ../comps-el5.xml.in.h:1 msgid "Administration Tools" msgstr "???????????????? ??????????????????????" -#: ../comps-f7.xml.in.h:3 ../comps-f8.xml.in.h:3 ../comps-f9.xml.in.h:3 -#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4 +#: ../comps-f7.xml.in.h:3 +#: ../comps-f8.xml.in.h:3 +#: ../comps-f9.xml.in.h:3 +#: ../comps-f10.xml.in.h:4 +#: ../comps-f11.xml.in.h:4 msgid "Afrikaans Support" msgstr "???????????????????? ??????????????????????" -#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4 -#: ../comps-f10.xml.in.h:5 ../comps-f11.xml.in.h:5 +#: ../comps-f7.xml.in.h:4 +#: ../comps-f8.xml.in.h:4 +#: ../comps-f9.xml.in.h:4 +#: ../comps-f10.xml.in.h:5 +#: ../comps-f11.xml.in.h:5 msgid "Albanian Support" msgstr "???????????????????? ??????????????????" -#: ../comps-f7.xml.in.h:5 ../comps-f8.xml.in.h:5 ../comps-f9.xml.in.h:5 -#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7 ../comps-el4.xml.in.h:2 +#: ../comps-f7.xml.in.h:5 +#: ../comps-f8.xml.in.h:5 +#: ../comps-f9.xml.in.h:5 +#: ../comps-f10.xml.in.h:6 +#: ../comps-f11.xml.in.h:7 +#: ../comps-el4.xml.in.h:2 #: ../comps-el5.xml.in.h:2 msgid "Applications" msgstr "??????????????????" -#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6 -#: ../comps-f10.xml.in.h:7 ../comps-f11.xml.in.h:8 +#: ../comps-f7.xml.in.h:6 +#: ../comps-f8.xml.in.h:6 +#: ../comps-f9.xml.in.h:6 +#: ../comps-f10.xml.in.h:7 +#: ../comps-f11.xml.in.h:8 msgid "Applications to perform a variety of tasks" msgstr "?????????????????? ?????? ?????? ???????????????? ????????????????" -#: ../comps-f7.xml.in.h:7 ../comps-f8.xml.in.h:7 ../comps-f9.xml.in.h:7 -#: ../comps-f10.xml.in.h:8 ../comps-f11.xml.in.h:9 ../comps-el4.xml.in.h:4 +#: ../comps-f7.xml.in.h:7 +#: ../comps-f8.xml.in.h:7 +#: ../comps-f9.xml.in.h:7 +#: ../comps-f10.xml.in.h:8 +#: ../comps-f11.xml.in.h:9 +#: ../comps-el4.xml.in.h:4 #: ../comps-el5.xml.in.h:4 msgid "Arabic Support" msgstr "???????????????????? ????????????????" -#: ../comps-f7.xml.in.h:8 ../comps-f8.xml.in.h:8 ../comps-f9.xml.in.h:8 -#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10 ../comps-el4.xml.in.h:5 +#: ../comps-f7.xml.in.h:8 +#: ../comps-f8.xml.in.h:8 +#: ../comps-f9.xml.in.h:8 +#: ../comps-f10.xml.in.h:9 +#: ../comps-f11.xml.in.h:10 +#: ../comps-el4.xml.in.h:5 #: ../comps-el5.xml.in.h:5 msgid "Armenian Support" msgstr "???????????????????? ??????????????????" -#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9 -#: ../comps-f10.xml.in.h:10 ../comps-f11.xml.in.h:11 +#: ../comps-f7.xml.in.h:9 +#: ../comps-f8.xml.in.h:9 +#: ../comps-f9.xml.in.h:9 +#: ../comps-f10.xml.in.h:10 +#: ../comps-f11.xml.in.h:11 msgid "Assamese Support" msgstr "???????????????????? Assamese" -#: ../comps-f7.xml.in.h:10 ../comps-f8.xml.in.h:10 ../comps-f9.xml.in.h:10 -#: ../comps-f10.xml.in.h:11 ../comps-f11.xml.in.h:12 ../comps-el4.xml.in.h:6 +#: ../comps-f7.xml.in.h:10 +#: ../comps-f8.xml.in.h:10 +#: ../comps-f9.xml.in.h:10 +#: ../comps-f10.xml.in.h:11 +#: ../comps-f11.xml.in.h:12 +#: ../comps-el4.xml.in.h:6 #: ../comps-el5.xml.in.h:6 msgid "Authoring and Publishing" msgstr "???????????????? ?????? ????????????????????" -#: ../comps-f7.xml.in.h:11 ../comps-f8.xml.in.h:11 ../comps-f9.xml.in.h:11 -#: ../comps-f10.xml.in.h:12 ../comps-f11.xml.in.h:14 +#: ../comps-f7.xml.in.h:11 +#: ../comps-f8.xml.in.h:11 +#: ../comps-f9.xml.in.h:11 +#: ../comps-f10.xml.in.h:12 +#: ../comps-f11.xml.in.h:14 msgid "Base" msgstr "????????" -#: ../comps-f7.xml.in.h:12 ../comps-f8.xml.in.h:12 ../comps-f9.xml.in.h:12 -#: ../comps-f10.xml.in.h:13 ../comps-f11.xml.in.h:15 ../comps-el4.xml.in.h:7 +#: ../comps-f7.xml.in.h:12 +#: ../comps-f8.xml.in.h:12 +#: ../comps-f9.xml.in.h:12 +#: ../comps-f10.xml.in.h:13 +#: ../comps-f11.xml.in.h:15 +#: ../comps-el4.xml.in.h:7 #: ../comps-el5.xml.in.h:7 msgid "Base System" msgstr "???????????? ??????????????" -#: ../comps-f7.xml.in.h:13 ../comps-f8.xml.in.h:13 ../comps-f9.xml.in.h:13 -#: ../comps-f10.xml.in.h:14 ../comps-f11.xml.in.h:16 +#: ../comps-f7.xml.in.h:13 +#: ../comps-f8.xml.in.h:13 +#: ../comps-f9.xml.in.h:13 +#: ../comps-f10.xml.in.h:14 +#: ../comps-f11.xml.in.h:16 msgid "Basic support for the Ruby programming language." msgstr "???????????? ???????????????????? ?????? ???? ???????????? ?????????????????????????????? Ruby" -#: ../comps-f7.xml.in.h:14 ../comps-f8.xml.in.h:14 ../comps-f9.xml.in.h:14 -#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:17 +#: ../comps-f7.xml.in.h:14 +#: ../comps-f8.xml.in.h:14 +#: ../comps-f9.xml.in.h:14 +#: ../comps-f10.xml.in.h:15 +#: ../comps-f11.xml.in.h:17 msgid "Basque Support" msgstr "???????????????????? ????????????????" -#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15 -#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:18 +#: ../comps-f7.xml.in.h:15 +#: ../comps-f8.xml.in.h:15 +#: ../comps-f9.xml.in.h:15 +#: ../comps-f10.xml.in.h:16 +#: ../comps-f11.xml.in.h:18 msgid "Belarusian Support" msgstr "???????????????????? Belarusian" -#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16 -#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:19 +#: ../comps-f7.xml.in.h:16 +#: ../comps-f8.xml.in.h:16 +#: ../comps-f9.xml.in.h:16 +#: ../comps-f10.xml.in.h:17 +#: ../comps-f11.xml.in.h:19 msgid "Bengali Support" msgstr "???????????????????? ??????????????????" -#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17 -#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:20 [...2439 lines suppressed...] msgstr "MinGW cross-compiler" @@ -1421,48 +1983,36 @@ msgid "Online Help and Documentation" msgstr "?????????????????????? ?????????????? ?????? ????????????????????" #: ../comps-f11.xml.in.h:164 -#, fuzzy msgid "Sanskrit Support" -msgstr "???????????????????? ??????????????????" +msgstr "???????????????????? ???????????????????????? " #: ../comps-f11.xml.in.h:165 -#, fuzzy msgid "Sardinian Support" -msgstr "???????????????????? ????????????????????" +msgstr "???????????????????? Sardinian " #: ../comps-f11.xml.in.h:182 msgid "Sugar Desktop Environment" msgstr "???????????????????? ???????????????? Sugar" #: ../comps-f11.xml.in.h:183 -msgid "" -"Support for cross-compiling programs to 32 bit Windows targets, testing " -"them, and building installers, all from within Fedora." -msgstr "" +msgid "Support for cross-compiling programs to 32 bit Windows targets, testing them, and building installers, all from within Fedora." +msgstr "???????????????????? ???????? ?????? Fedora, ?????? ?????? ?????????????????? ???????????????????????? ?????? 32 bit Windows, ???? ???????????? ???????? ?????? ?????? ???????????????????? ???????????????? ???????????????????????? ????????." #: ../comps-f11.xml.in.h:186 -#, fuzzy -msgid "" -"Support for developing software using the Objective CAML programming " -"language and libraries." -msgstr "???????????????????? ?????????????????? ???????????????????? ?????? ???????????? ?????????????????????????????? Java." +msgid "Support for developing software using the Objective CAML programming language and libraries." +msgstr "???????????????????? ?????????????????? ???????????????????? ???? ???? ?????????? ?????? ?????????????? ?????????????????????????????? ?????? ???????????????????? Objective CAML" #: ../comps-f11.xml.in.h:188 -#, fuzzy msgid "Swahili Support" -msgstr "???????????????????? Swati" +msgstr "???????????????????? ????????????????" #: ../comps-f11.xml.in.h:196 -#, fuzzy msgid "Tetum Support" -msgstr "???????????????????? Telugu" +msgstr "???????????????????? Tetum" #: ../comps-f11.xml.in.h:223 -#, fuzzy -msgid "" -"This group is a collection of tools used in the design, modification, " -"manipulation, and packaging of fonts." -msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????????? ????????????????????????." +msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts." +msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???? ??????????????????, ??????????????????????, ???????????????? ?????? ???????????????????? ?????????????? ????????????????????????????." #: ../comps-f11.xml.in.h:235 msgid "Turkmen Support" @@ -1472,88 +2022,69 @@ msgstr "???????????????????? ??????????? msgid "Upper Sorbian Support" msgstr "???????????????????? Upper Sorbian" -#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3 +#: ../comps-el4.xml.in.h:3 +#: ../comps-el5.xml.in.h:3 msgid "Applications for a variety of tasks" msgstr "?????????????????? ?????? ?????? ???????????????? ????????????????" -#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13 +#: ../comps-el4.xml.in.h:12 +#: ../comps-el5.xml.in.h:13 msgid "Dialup Networking Support" msgstr "???????????????????? ?????????????????? ???????? ??????????????????" -#: ../comps-el4.xml.in.h:22 ../comps-el5.xml.in.h:23 -msgid "" -"GNOME is a powerful, graphical user interface which includes a panel, " -"desktop, system icons, and a graphical file manager." -msgstr "" -"???? GNOME ?????????? ?????? ????????????, ?????????????? ???????????????????? ?????? ???????????????? ?????? ???????????? " -"??????????????????, ?????????????????? ????????????????, ?????????????????? ???????????????????? ?????? ?????????????? ?????????????????????? " -"??????????????." - -#: ../comps-el4.xml.in.h:35 ../comps-el5.xml.in.h:35 -msgid "" -"KDE is a powerful, graphical user interface which includes a panel, desktop, " -"system icons, and a graphical file manager." -msgstr "" -"???? KDE ?????????? ?????? ????????????, ?????????????? ???????????????????? ?????? ???????????????? ?????? ???????????? " -"??????????????????, ?????????????????? ????????????????, ?????????????????? ???????????????????? ?????? ?????????????? ?????????????????????? " -"??????????????." - -#: ../comps-el4.xml.in.h:44 ../comps-el5.xml.in.h:44 -msgid "" -"Sometimes called text editors, these are programs that allow you to create " -"and edit files. These include Emacs and Vi." -msgstr "" -"?????????????? ?????????????????????? ??????????????????????????, ?????????? ???? ?????????????????? ???????????? ???????????? ?????? " -"???????????????????? ?????? ?????????????????? ??????????????. ???????? ?? Emacs ?????? ?? Vi." +#: ../comps-el4.xml.in.h:22 +#: ../comps-el5.xml.in.h:23 +msgid "GNOME is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "???? GNOME ?????????? ?????? ????????????, ?????????????? ???????????????????? ?????? ???????????????? ?????? ???????????? ??????????????????, ?????????????????? ????????????????, ?????????????????? ???????????????????? ?????? ?????????????? ?????????????????????? ??????????????." + +#: ../comps-el4.xml.in.h:35 +#: ../comps-el5.xml.in.h:35 +msgid "KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager." +msgstr "???? KDE ?????????? ?????? ????????????, ?????????????? ???????????????????? ?????? ???????????????? ?????? ???????????? ??????????????????, ?????????????????? ????????????????, ?????????????????? ???????????????????? ?????? ?????????????? ?????????????????????? ??????????????." + +#: ../comps-el4.xml.in.h:44 +#: ../comps-el5.xml.in.h:44 +msgid "Sometimes called text editors, these are programs that allow you to create and edit files. These include Emacs and Vi." +msgstr "?????????????? ?????????????????????? ??????????????????????????, ?????????? ???? ?????????????????? ???????????? ???????????? ?????? ???????????????????? ?????? ?????????????????? ??????????????. ???????? ?? Emacs ?????? ?? Vi." -#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48 +#: ../comps-el4.xml.in.h:50 +#: ../comps-el5.xml.in.h:48 msgid "The XEmacs text editor." msgstr "?? ???????????????????????? ???????????????? XEmacs." -#: ../comps-el4.xml.in.h:54 ../comps-el5.xml.in.h:52 -msgid "" -"These tools allow you to create documentation in the DocBook format and " -"convert them to HTML, PDF, Postscript, and text." -msgstr "" -"???????? ???? ???????????????? ?????? ???????????????????? ???? ?????????????????????????? ?????????????? ???? ?????????? DocBook " -"?????? ???? ???? ?????????????????????? ???? HTML, PDF, Postscript ?? ?????? ???????? ??????????????." +#: ../comps-el4.xml.in.h:54 +#: ../comps-el5.xml.in.h:52 +msgid "These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text." +msgstr "???????? ???? ???????????????? ?????? ???????????????????? ???? ?????????????????????????? ?????????????? ???? ?????????? DocBook ?????? ???? ???? ?????????????????????? ???? HTML, PDF, Postscript ?? ?????? ???????? ??????????????." -#: ../comps-el4.xml.in.h:64 ../comps-el5.xml.in.h:62 +#: ../comps-el4.xml.in.h:64 +#: ../comps-el5.xml.in.h:62 msgid "This group is a collection of network servers for specific purposes" -msgstr "" -"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????????????? ?????????????? ?????? ???????????????? ??????????????" +msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????????????? ?????????????? ?????? ???????????????? ??????????????" -#: ../comps-el4.xml.in.h:65 ../comps-el5.xml.in.h:63 -msgid "" -"This group is a collection of tools and resources of Arabic environments." -msgstr "" -"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? " -"???????????????????????? ????????????????." - -#: ../comps-el4.xml.in.h:67 ../comps-el5.xml.in.h:66 -msgid "" -"This group is a collection of tools and resources of Hebrew environments." -msgstr "" -"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ???????????????? " -"????????????????????????." - -#: ../comps-el4.xml.in.h:68 ../comps-el5.xml.in.h:67 -msgid "" -"This group is a collection of tools and resources of Japanese environments." -msgstr "" -"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????????????? " -"????????????????????????." +#: ../comps-el4.xml.in.h:65 +#: ../comps-el5.xml.in.h:63 +msgid "This group is a collection of tools and resources of Arabic environments." +msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? ???????????????????????? ????????????????." + +#: ../comps-el4.xml.in.h:67 +#: ../comps-el5.xml.in.h:66 +msgid "This group is a collection of tools and resources of Hebrew environments." +msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ???????????????? ????????????????????????." + +#: ../comps-el4.xml.in.h:68 +#: ../comps-el5.xml.in.h:67 +msgid "This group is a collection of tools and resources of Japanese environments." +msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????????????? ????????????????????????." -#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77 +#: ../comps-el4.xml.in.h:77 +#: ../comps-el5.xml.in.h:77 msgid "XEmacs" msgstr "XEmacs" #: ../comps-el5.xml.in.h:65 -msgid "" -"This group is a collection of tools and resources of Czech environments." -msgstr "" -"???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? " -"????????????????????????." +msgid "This group is a collection of tools and resources of Czech environments." +msgstr "???????? ?? ?????????? ?????????? ?????? ?????????????? ?????? ???????????????? ?????? ???????????? ?????? ?????????????? ????????????????????????." #, fuzzy #~ msgid "British Support" @@ -1591,3 +2122,4 @@ msgstr "" #, fuzzy #~ msgid "Virtualization Support." #~ msgstr "????????????????????????????" + From pbrobinson at fedoraproject.org Sun Nov 1 12:31:46 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Sun, 1 Nov 2009 12:31:46 +0000 (UTC) Subject: rpms/nbtk/devel .cvsignore, 1.10, 1.11 nbtk.spec, 1.32, 1.33 sources, 1.11, 1.12 Message-ID: <20091101123146.0147311C02BC@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/nbtk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12500 Modified Files: .cvsignore nbtk.spec sources Log Message: - New upstream 1.1.12 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nbtk/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 1 Nov 2009 12:26:18 -0000 1.10 +++ .cvsignore 1 Nov 2009 12:31:45 -0000 1.11 @@ -1 +1 @@ -nbtk-0.1.13.tar.bz2 +nbtk-1.1.12.tar.bz2 Index: nbtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- nbtk.spec 1 Nov 2009 12:26:19 -0000 1.32 +++ nbtk.spec 1 Nov 2009 12:31:45 -0000 1.33 @@ -1,5 +1,5 @@ Name: nbtk -Version: 1.1.13 +Version: 1.1.12 Release: 1%{?dist} Summary: A toolkit for moblin NetBooks @@ -86,8 +86,8 @@ rm -rf %{buildroot} %doc %{_datadir}/gtk-doc/html/%{name} %changelog -* Sun Nov 1 2009 Peter Robinson 1.1.13-1 -- New upstream 1.1.13 release +* Sun Nov 1 2009 Peter Robinson 1.1.12-1 +- New upstream 1.1.12 release * Mon Oct 26 2009 Peter Robinson 1.1.9-1 - New upstream 1.1.9 release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nbtk/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 1 Nov 2009 12:26:19 -0000 1.11 +++ sources 1 Nov 2009 12:31:45 -0000 1.12 @@ -1 +1 @@ -a0b8f3ede226c7519b977835bd434376 nbtk-0.1.13.tar.bz2 +ab7b3a44c888c4909d2797e10e4ccd2f nbtk-1.1.12.tar.bz2 From adsllc at fedoraproject.org Sun Nov 1 13:01:31 2009 From: adsllc at fedoraproject.org (Dave Ludlow) Date: Sun, 1 Nov 2009 13:01:31 +0000 (UTC) Subject: rpms/drehatlas-xaporho-fonts/devel 61-drehatlas-xaporho.conf, NONE, 1.1 Makefile.xaporho, NONE, 1.1 drehatlas-xaporho-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101130131.31C9311C02BC@cvs1.fedora.phx.redhat.com> Author: adsllc Update of /cvs/pkgs/rpms/drehatlas-xaporho-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19415/devel Modified Files: .cvsignore sources Added Files: 61-drehatlas-xaporho.conf Makefile.xaporho drehatlas-xaporho-fonts.spec import.log Log Message: Initial checkin --- NEW FILE 61-drehatlas-xaporho.conf --- fantasy Xaporho Xaporho fantasy --- NEW FILE Makefile.xaporho --- BASENAME=Xaporho all: $(BASENAME).otf $(BASENAME).ttf $(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe fontforge -script convert-ttf.pe convert-ttf.pe: echo "Open('$(BASENAME).sfd')" > convert-ttf.pe echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe $(BASENAME).otf: $(BASENAME).sfd convert-otf.pe fontforge -script convert-otf.pe convert-otf.pe: echo "Open('$(BASENAME).sfd')" > convert-otf.pe echo "Generate('$(BASENAME).otf')" >> convert-otf.pe --- NEW FILE drehatlas-xaporho-fonts.spec --- %global fontname drehatlas-xaporho %global fontconf 61-%{fontname}.conf Name: %{fontname}-fonts Version: 1.0.3.2 Release: 2%{?dist} Summary: A Latin typeface that is sharp and angular Group: User Interface/X License: OFL URL: http://sourceforge.net/projects/drehatlas-fonts/ Source0: Xaporho-%{version}-src.zip Source1: %{fontconf} Source2: Makefile.xaporho BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel fontforge Requires: fontpackages-filesystem %description The Xaporho font was originally inspired by the logo of a hobby rock band named Xaporho. %prep %setup -q -c %{name}-%{version} # Wrap the license file at 80 chars fold -s LICENSE > LICENSE.new touch -r LICENSE LICENSE.new mv LICENSE.new LICENSE %build # A .ttf file is included, but .otf is preferred. make -f %{SOURCE2} Xaporho.otf %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{_fontdir} install -m 0644 -p *.otf %{buildroot}%{_fontdir} install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} install -m 0644 -p %{SOURCE1} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf} ln -s %{_fontconfig_templatedir}/%{fontconf} \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} %clean rm -fr %{buildroot} %_font_pkg -f %{fontconf} *.otf %doc LICENSE FONTLOG %changelog * Fri Oct 30 2009 Dave Ludlow 1.0.3.2-2 - Fixed typo in summary * Sun Oct 25 2009 Dave Ludlow 1.0.3.2-1 - Initial packaging --- NEW FILE import.log --- drehatlas-xaporho-fonts-1_0_3_2-2_fc12:HEAD:drehatlas-xaporho-fonts-1.0.3.2-2.fc12.src.rpm:1257080436 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/drehatlas-xaporho-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:42:27 -0000 1.1 +++ .cvsignore 1 Nov 2009 13:01:29 -0000 1.2 @@ -0,0 +1 @@ +Xaporho-1.0.3.2-src.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drehatlas-xaporho-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:42:27 -0000 1.1 +++ sources 1 Nov 2009 13:01:30 -0000 1.2 @@ -0,0 +1 @@ +3999ce6be63d10c894ca79f525cdeac9 Xaporho-1.0.3.2-src.zip From terjeros at fedoraproject.org Sun Nov 1 13:02:35 2009 From: terjeros at fedoraproject.org (terjeros) Date: Sun, 1 Nov 2009 13:02:35 +0000 (UTC) Subject: rpms/pssh/devel .cvsignore, 1.3, 1.4 pssh.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <20091101130235.9E18211C02BC@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/pssh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19907 Modified Files: .cvsignore pssh.spec sources Log Message: * Sun Nov 01 2009 Terje Rosten - 2.0-1 - 2.0 - Switch to new upstream - Move pscp to pscp.pssh Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pssh/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 5 Jan 2009 21:08:40 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:02:32 -0000 1.4 @@ -1 +1 @@ -pssh-1.4.3.tar.gz +pssh-2.0.tar.gz Index: pssh.spec =================================================================== RCS file: /cvs/extras/rpms/pssh/devel/pssh.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- pssh.spec 26 Jul 2009 19:35:45 -0000 1.5 +++ pssh.spec 1 Nov 2009 13:02:32 -0000 1.6 @@ -3,12 +3,12 @@ Summary: Parallel SSH tools Name: pssh -Version: 1.4.3 +Version: 2.0 Release: 3%{?dist} License: BSD -Url: http://www.theether.org/pssh/ +Url: http://code.google.com/p/parallel-ssh/ Group: Applications/Productivity -Source0: http://www.theether.org/pssh/pssh-%{version}.tar.gz +Source0: http://parallel-ssh.googlecode.com/files/pssh-%{version}.tar.gz Requires: openssh-clients BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,22 +32,28 @@ Parallell version includes: %install %{__rm} -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__mv} %{buildroot}%{_bindir}/pscp %{buildroot}%{_bindir}/pscp.pssh %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, -) -%doc AUTHORS BUGS ChangeLog COPYING TODO +%doc AUTHORS ChangeLog COPYING %{_bindir}/pnuke %{_bindir}/prsync -%{_bindir}/pscp +%{_bindir}/pscp.pssh %{_bindir}/pslurp %{_bindir}/pssh %{python_sitelib}/%{name}-%{version}* %{python_sitelib}/%{name}lib %changelog +* Sun Nov 01 2009 Terje Rosten - 2.0-1 +- 2.0 +- Switch to new upstream +- Move pscp to pscp.pssh + * Sun Jul 26 2009 Fedora Release Engineering - 1.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/pssh/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 5 Jan 2009 21:08:40 -0000 1.3 +++ sources 1 Nov 2009 13:02:32 -0000 1.4 @@ -1 +1 @@ -dcb8e1497fdd53dced9c3a5d33053757 pssh-1.4.3.tar.gz +07474f9f9dbefedc809e997f04e1dee5 pssh-2.0.tar.gz From adsllc at fedoraproject.org Sun Nov 1 13:03:19 2009 From: adsllc at fedoraproject.org (Dave Ludlow) Date: Sun, 1 Nov 2009 13:03:19 +0000 (UTC) Subject: rpms/drehatlas-xaporho-fonts/F-12 61-drehatlas-xaporho.conf, NONE, 1.1 Makefile.xaporho, NONE, 1.1 drehatlas-xaporho-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101130319.A222A11C00EE@cvs1.fedora.phx.redhat.com> Author: adsllc Update of /cvs/pkgs/rpms/drehatlas-xaporho-fonts/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20164/F-12 Modified Files: .cvsignore sources Added Files: 61-drehatlas-xaporho.conf Makefile.xaporho drehatlas-xaporho-fonts.spec import.log Log Message: Initial F-12 checking --- NEW FILE 61-drehatlas-xaporho.conf --- fantasy Xaporho Xaporho fantasy --- NEW FILE Makefile.xaporho --- BASENAME=Xaporho all: $(BASENAME).otf $(BASENAME).ttf $(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe fontforge -script convert-ttf.pe convert-ttf.pe: echo "Open('$(BASENAME).sfd')" > convert-ttf.pe echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe $(BASENAME).otf: $(BASENAME).sfd convert-otf.pe fontforge -script convert-otf.pe convert-otf.pe: echo "Open('$(BASENAME).sfd')" > convert-otf.pe echo "Generate('$(BASENAME).otf')" >> convert-otf.pe --- NEW FILE drehatlas-xaporho-fonts.spec --- %global fontname drehatlas-xaporho %global fontconf 61-%{fontname}.conf Name: %{fontname}-fonts Version: 1.0.3.2 Release: 2%{?dist} Summary: A Latin typeface that is sharp and angular Group: User Interface/X License: OFL URL: http://sourceforge.net/projects/drehatlas-fonts/ Source0: Xaporho-%{version}-src.zip Source1: %{fontconf} Source2: Makefile.xaporho BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel fontforge Requires: fontpackages-filesystem %description The Xaporho font was originally inspired by the logo of a hobby rock band named Xaporho. %prep %setup -q -c %{name}-%{version} # Wrap the license file at 80 chars fold -s LICENSE > LICENSE.new touch -r LICENSE LICENSE.new mv LICENSE.new LICENSE %build # A .ttf file is included, but .otf is preferred. make -f %{SOURCE2} Xaporho.otf %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{_fontdir} install -m 0644 -p *.otf %{buildroot}%{_fontdir} install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} install -m 0644 -p %{SOURCE1} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf} ln -s %{_fontconfig_templatedir}/%{fontconf} \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} %clean rm -fr %{buildroot} %_font_pkg -f %{fontconf} *.otf %doc LICENSE FONTLOG %changelog * Fri Oct 30 2009 Dave Ludlow 1.0.3.2-2 - Fixed typo in summary * Sun Oct 25 2009 Dave Ludlow 1.0.3.2-1 - Initial packaging --- NEW FILE import.log --- drehatlas-xaporho-fonts-1_0_3_2-2_fc12:F-12:drehatlas-xaporho-fonts-1.0.3.2-2.fc12.src.rpm:1257080551 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/drehatlas-xaporho-fonts/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:42:27 -0000 1.1 +++ .cvsignore 1 Nov 2009 13:03:18 -0000 1.2 @@ -0,0 +1 @@ +Xaporho-1.0.3.2-src.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drehatlas-xaporho-fonts/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:42:27 -0000 1.1 +++ sources 1 Nov 2009 13:03:18 -0000 1.2 @@ -0,0 +1 @@ +3999ce6be63d10c894ca79f525cdeac9 Xaporho-1.0.3.2-src.zip From pbrobinson at fedoraproject.org Sun Nov 1 13:04:24 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Sun, 1 Nov 2009 13:04:24 +0000 (UTC) Subject: rpms/nbtk/F-12 .cvsignore, 1.9, 1.10 nbtk.spec, 1.31, 1.32 sources, 1.10, 1.11 Message-ID: <20091101130424.25B8C11C00EE@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/nbtk/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20686 Modified Files: .cvsignore nbtk.spec sources Log Message: - New upstream 1.1.12 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nbtk/F-12/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 26 Oct 2009 23:51:53 -0000 1.9 +++ .cvsignore 1 Nov 2009 13:04:22 -0000 1.10 @@ -1 +1 @@ -nbtk-1.1.9.tar.bz2 +nbtk-1.1.12.tar.bz2 Index: nbtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/nbtk/F-12/nbtk.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- nbtk.spec 26 Oct 2009 23:51:53 -0000 1.31 +++ nbtk.spec 1 Nov 2009 13:04:22 -0000 1.32 @@ -1,5 +1,5 @@ Name: nbtk -Version: 1.1.9 +Version: 1.1.12 Release: 1%{?dist} Summary: A toolkit for moblin NetBooks @@ -86,6 +86,9 @@ rm -rf %{buildroot} %doc %{_datadir}/gtk-doc/html/%{name} %changelog +* Sun Nov 1 2009 Peter Robinson 1.1.12-1 +- New upstream 1.1.12 release + * Mon Oct 26 2009 Peter Robinson 1.1.9-1 - New upstream 1.1.9 release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nbtk/F-12/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 26 Oct 2009 23:51:53 -0000 1.10 +++ sources 1 Nov 2009 13:04:22 -0000 1.11 @@ -1 +1 @@ -697835b99ceb9c250ed5aeaae62776bb nbtk-1.1.9.tar.bz2 +ab7b3a44c888c4909d2797e10e4ccd2f nbtk-1.1.12.tar.bz2 From adsllc at fedoraproject.org Sun Nov 1 13:04:55 2009 From: adsllc at fedoraproject.org (Dave Ludlow) Date: Sun, 1 Nov 2009 13:04:55 +0000 (UTC) Subject: rpms/drehatlas-xaporho-fonts/F-11 61-drehatlas-xaporho.conf, NONE, 1.1 Makefile.xaporho, NONE, 1.1 drehatlas-xaporho-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101130455.5371C11C00EE@cvs1.fedora.phx.redhat.com> Author: adsllc Update of /cvs/pkgs/rpms/drehatlas-xaporho-fonts/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20854/F-11 Modified Files: .cvsignore sources Added Files: 61-drehatlas-xaporho.conf Makefile.xaporho drehatlas-xaporho-fonts.spec import.log Log Message: Initial F-11 checkin --- NEW FILE 61-drehatlas-xaporho.conf --- fantasy Xaporho Xaporho fantasy --- NEW FILE Makefile.xaporho --- BASENAME=Xaporho all: $(BASENAME).otf $(BASENAME).ttf $(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe fontforge -script convert-ttf.pe convert-ttf.pe: echo "Open('$(BASENAME).sfd')" > convert-ttf.pe echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe $(BASENAME).otf: $(BASENAME).sfd convert-otf.pe fontforge -script convert-otf.pe convert-otf.pe: echo "Open('$(BASENAME).sfd')" > convert-otf.pe echo "Generate('$(BASENAME).otf')" >> convert-otf.pe --- NEW FILE drehatlas-xaporho-fonts.spec --- %global fontname drehatlas-xaporho %global fontconf 61-%{fontname}.conf Name: %{fontname}-fonts Version: 1.0.3.2 Release: 2%{?dist} Summary: A Latin typeface that is sharp and angular Group: User Interface/X License: OFL URL: http://sourceforge.net/projects/drehatlas-fonts/ Source0: Xaporho-%{version}-src.zip Source1: %{fontconf} Source2: Makefile.xaporho BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel fontforge Requires: fontpackages-filesystem %description The Xaporho font was originally inspired by the logo of a hobby rock band named Xaporho. %prep %setup -q -c %{name}-%{version} # Wrap the license file at 80 chars fold -s LICENSE > LICENSE.new touch -r LICENSE LICENSE.new mv LICENSE.new LICENSE %build # A .ttf file is included, but .otf is preferred. make -f %{SOURCE2} Xaporho.otf %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{_fontdir} install -m 0644 -p *.otf %{buildroot}%{_fontdir} install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} install -m 0644 -p %{SOURCE1} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf} ln -s %{_fontconfig_templatedir}/%{fontconf} \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} %clean rm -fr %{buildroot} %_font_pkg -f %{fontconf} *.otf %doc LICENSE FONTLOG %changelog * Fri Oct 30 2009 Dave Ludlow 1.0.3.2-2 - Fixed typo in summary * Sun Oct 25 2009 Dave Ludlow 1.0.3.2-1 - Initial packaging --- NEW FILE import.log --- drehatlas-xaporho-fonts-1_0_3_2-2_fc12:F-11:drehatlas-xaporho-fonts-1.0.3.2-2.fc12.src.rpm:1257080651 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/drehatlas-xaporho-fonts/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:42:27 -0000 1.1 +++ .cvsignore 1 Nov 2009 13:04:54 -0000 1.2 @@ -0,0 +1 @@ +Xaporho-1.0.3.2-src.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drehatlas-xaporho-fonts/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:42:27 -0000 1.1 +++ sources 1 Nov 2009 13:04:54 -0000 1.2 @@ -0,0 +1 @@ +3999ce6be63d10c894ca79f525cdeac9 Xaporho-1.0.3.2-src.zip From adsllc at fedoraproject.org Sun Nov 1 13:06:50 2009 From: adsllc at fedoraproject.org (Dave Ludlow) Date: Sun, 1 Nov 2009 13:06:50 +0000 (UTC) Subject: rpms/drehatlas-xaporho-fonts/F-10 61-drehatlas-xaporho.conf, NONE, 1.1 Makefile.xaporho, NONE, 1.1 drehatlas-xaporho-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101130650.D73EF11C00EE@cvs1.fedora.phx.redhat.com> Author: adsllc Update of /cvs/pkgs/rpms/drehatlas-xaporho-fonts/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21604/F-10 Modified Files: .cvsignore sources Added Files: 61-drehatlas-xaporho.conf Makefile.xaporho drehatlas-xaporho-fonts.spec import.log Log Message: Initial F-10 checkin --- NEW FILE 61-drehatlas-xaporho.conf --- fantasy Xaporho Xaporho fantasy --- NEW FILE Makefile.xaporho --- BASENAME=Xaporho all: $(BASENAME).otf $(BASENAME).ttf $(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe fontforge -script convert-ttf.pe convert-ttf.pe: echo "Open('$(BASENAME).sfd')" > convert-ttf.pe echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe $(BASENAME).otf: $(BASENAME).sfd convert-otf.pe fontforge -script convert-otf.pe convert-otf.pe: echo "Open('$(BASENAME).sfd')" > convert-otf.pe echo "Generate('$(BASENAME).otf')" >> convert-otf.pe --- NEW FILE drehatlas-xaporho-fonts.spec --- %global fontname drehatlas-xaporho %global fontconf 61-%{fontname}.conf Name: %{fontname}-fonts Version: 1.0.3.2 Release: 2%{?dist} Summary: A Latin typeface that is sharp and angular Group: User Interface/X License: OFL URL: http://sourceforge.net/projects/drehatlas-fonts/ Source0: Xaporho-%{version}-src.zip Source1: %{fontconf} Source2: Makefile.xaporho BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel fontforge Requires: fontpackages-filesystem %description The Xaporho font was originally inspired by the logo of a hobby rock band named Xaporho. %prep %setup -q -c %{name}-%{version} # Wrap the license file at 80 chars fold -s LICENSE > LICENSE.new touch -r LICENSE LICENSE.new mv LICENSE.new LICENSE %build # A .ttf file is included, but .otf is preferred. make -f %{SOURCE2} Xaporho.otf %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{_fontdir} install -m 0644 -p *.otf %{buildroot}%{_fontdir} install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} install -m 0644 -p %{SOURCE1} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf} ln -s %{_fontconfig_templatedir}/%{fontconf} \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} %clean rm -fr %{buildroot} %_font_pkg -f %{fontconf} *.otf %doc LICENSE FONTLOG %changelog * Fri Oct 30 2009 Dave Ludlow 1.0.3.2-2 - Fixed typo in summary * Sun Oct 25 2009 Dave Ludlow 1.0.3.2-1 - Initial packaging --- NEW FILE import.log --- drehatlas-xaporho-fonts-1_0_3_2-2_fc12:F-10:drehatlas-xaporho-fonts-1.0.3.2-2.fc12.src.rpm:1257080748 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/drehatlas-xaporho-fonts/F-10/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:42:27 -0000 1.1 +++ .cvsignore 1 Nov 2009 13:06:45 -0000 1.2 @@ -0,0 +1 @@ +Xaporho-1.0.3.2-src.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/drehatlas-xaporho-fonts/F-10/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:42:27 -0000 1.1 +++ sources 1 Nov 2009 13:06:46 -0000 1.2 @@ -0,0 +1 @@ +3999ce6be63d10c894ca79f525cdeac9 Xaporho-1.0.3.2-src.zip From thomasj at fedoraproject.org Sun Nov 1 13:09:00 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 13:09:00 +0000 (UTC) Subject: rpms/skrooge/devel .cvsignore, 1.3, 1.4 skrooge.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <20091101130900.6AF6B11C00EE@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/skrooge/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22292 Modified Files: .cvsignore skrooge.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.5.3-1 - Updated to new upstream version - Readded a -DCMAKE workaround (please keep it for now) - Useing chmod -x to prevent spurious-executable-perm. Bug filed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 22 Sep 2009 18:46:37 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:08:58 -0000 1.4 @@ -1 +1 @@ -skrooge-0.5.2.tar.gz +skrooge-0.5.3.tar.bz2 Index: skrooge.spec =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/devel/skrooge.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- skrooge.spec 14 Oct 2009 14:54:56 -0000 1.6 +++ skrooge.spec 1 Nov 2009 13:08:58 -0000 1.7 @@ -1,17 +1,14 @@ Name: skrooge -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: Personal finances manager Group: Applications/Productivity License: GPLv2+ URL: http://extragear.kde.org/apps/skrooge/ -Source0: http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz +Source0: http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## upstream patches -Patch100: skrooge-0.5.2-docs.patch - BuildRequires: qca2-devel BuildRequires: libofx-devel BuildRequires: sqlite-devel @@ -42,15 +39,16 @@ Skrooge libraries %prep %setup -q -%patch100 -p1 -b .docs - -## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h -chmod -x skrooge_search/skgalarmboardwidget.h +## to prevent spurious-executable-perm in -debuginfo. https://bugs.kde.org/show_bug.cgi?id=212613 +chmod -x skrooge_calculator/skginterestboardwidget.cpp +chmod -x skrooge_calculator/skginterestboardwidget.h %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +## the -DCMAKE is needed to prevent unused-direct-shlib-dependency in -libs +## cant be fixed upstream, see: https://bugs.kde.org/show_bug.cgi?id=209912 +%{cmake_kde4} .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" popd make %{?_smp_mflags} -C %{_target_platform} @@ -119,10 +117,15 @@ update-mime-database %{_kde4_datadir}/mi %{_kde4_libdir}/lib*.so.* %changelog +* Sun Nov 01 2009 Thomas Janssen 0.5.3-1 +- Updated to new upstream version +- Readded a -DCMAKE workaround (please keep it for now) +- Useing chmod -x to prevent spurious-executable-perm. Bug filed. + * Wed Oct 14 2009 Rex Dieter 0.5.2-2 - (HTML) docs patch, use %%find_lang --with-kde - own %%{_kde4_appsdir}/skrooge*/ dirs -- %check: omit extraneous desktop-file-validate's +- %%check: omit extraneous desktop-file-validate's * Thu Oct 08 2009 Thomas Janssen 0.5.2-1 - Changed to final 0.5.2 version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 8 Oct 2009 19:40:57 -0000 1.4 +++ sources 1 Nov 2009 13:08:59 -0000 1.5 @@ -1 +1 @@ -52887f432cea1fa9d611af971c1048b7 skrooge-0.5.2.tar.gz +ce42f33233272b502c7916a6f3560139 skrooge-0.5.3.tar.bz2 From terjeros at fedoraproject.org Sun Nov 1 13:13:05 2009 From: terjeros at fedoraproject.org (terjeros) Date: Sun, 1 Nov 2009 13:13:05 +0000 (UTC) Subject: rpms/pssh/F-11 .cvsignore, 1.3, 1.4 pssh.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20091101131307.2F16811C02BA@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/pssh/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23310/F-11 Modified Files: .cvsignore pssh.spec sources Log Message: Sync with rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pssh/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 5 Jan 2009 21:08:40 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:13:01 -0000 1.4 @@ -1 +1 @@ -pssh-1.4.3.tar.gz +pssh-2.0.tar.gz Index: pssh.spec =================================================================== RCS file: /cvs/extras/rpms/pssh/F-11/pssh.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- pssh.spec 27 Feb 2009 02:47:38 -0000 1.4 +++ pssh.spec 1 Nov 2009 13:13:01 -0000 1.5 @@ -3,12 +3,12 @@ Summary: Parallel SSH tools Name: pssh -Version: 1.4.3 -Release: 2%{?dist} +Version: 2.0 +Release: 3%{?dist} License: BSD -Url: http://www.theether.org/pssh/ +Url: http://code.google.com/p/parallel-ssh/ Group: Applications/Productivity -Source0: http://www.theether.org/pssh/pssh-%{version}.tar.gz +Source0: http://parallel-ssh.googlecode.com/files/pssh-%{version}.tar.gz Requires: openssh-clients BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,22 +32,31 @@ Parallell version includes: %install %{__rm} -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__mv} %{buildroot}%{_bindir}/pscp %{buildroot}%{_bindir}/pscp.pssh %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, -) -%doc AUTHORS BUGS ChangeLog COPYING TODO +%doc AUTHORS ChangeLog COPYING %{_bindir}/pnuke %{_bindir}/prsync -%{_bindir}/pscp +%{_bindir}/pscp.pssh %{_bindir}/pslurp %{_bindir}/pssh %{python_sitelib}/%{name}-%{version}* %{python_sitelib}/%{name}lib %changelog +* Sun Nov 01 2009 Terje Rosten - 2.0-1 +- 2.0 +- Switch to new upstream +- Move pscp to pscp.pssh + +* Sun Jul 26 2009 Fedora Release Engineering - 1.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 1.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/pssh/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 5 Jan 2009 21:08:40 -0000 1.3 +++ sources 1 Nov 2009 13:13:01 -0000 1.4 @@ -1 +1 @@ -dcb8e1497fdd53dced9c3a5d33053757 pssh-1.4.3.tar.gz +07474f9f9dbefedc809e997f04e1dee5 pssh-2.0.tar.gz From terjeros at fedoraproject.org Sun Nov 1 13:13:06 2009 From: terjeros at fedoraproject.org (terjeros) Date: Sun, 1 Nov 2009 13:13:06 +0000 (UTC) Subject: rpms/pssh/F-12 .cvsignore, 1.3, 1.4 pssh.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <20091101131307.3371911C0338@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/pssh/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23310/F-12 Modified Files: .cvsignore pssh.spec sources Log Message: Sync with rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pssh/F-12/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 5 Jan 2009 21:08:40 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:13:04 -0000 1.4 @@ -1 +1 @@ -pssh-1.4.3.tar.gz +pssh-2.0.tar.gz Index: pssh.spec =================================================================== RCS file: /cvs/extras/rpms/pssh/F-12/pssh.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- pssh.spec 26 Jul 2009 19:35:45 -0000 1.5 +++ pssh.spec 1 Nov 2009 13:13:04 -0000 1.6 @@ -3,12 +3,12 @@ Summary: Parallel SSH tools Name: pssh -Version: 1.4.3 +Version: 2.0 Release: 3%{?dist} License: BSD -Url: http://www.theether.org/pssh/ +Url: http://code.google.com/p/parallel-ssh/ Group: Applications/Productivity -Source0: http://www.theether.org/pssh/pssh-%{version}.tar.gz +Source0: http://parallel-ssh.googlecode.com/files/pssh-%{version}.tar.gz Requires: openssh-clients BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,22 +32,28 @@ Parallell version includes: %install %{__rm} -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__mv} %{buildroot}%{_bindir}/pscp %{buildroot}%{_bindir}/pscp.pssh %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, -) -%doc AUTHORS BUGS ChangeLog COPYING TODO +%doc AUTHORS ChangeLog COPYING %{_bindir}/pnuke %{_bindir}/prsync -%{_bindir}/pscp +%{_bindir}/pscp.pssh %{_bindir}/pslurp %{_bindir}/pssh %{python_sitelib}/%{name}-%{version}* %{python_sitelib}/%{name}lib %changelog +* Sun Nov 01 2009 Terje Rosten - 2.0-1 +- 2.0 +- Switch to new upstream +- Move pscp to pscp.pssh + * Sun Jul 26 2009 Fedora Release Engineering - 1.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/pssh/F-12/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 5 Jan 2009 21:08:40 -0000 1.3 +++ sources 1 Nov 2009 13:13:04 -0000 1.4 @@ -1 +1 @@ -dcb8e1497fdd53dced9c3a5d33053757 pssh-1.4.3.tar.gz +07474f9f9dbefedc809e997f04e1dee5 pssh-2.0.tar.gz From terjeros at fedoraproject.org Sun Nov 1 13:13:05 2009 From: terjeros at fedoraproject.org (terjeros) Date: Sun, 1 Nov 2009 13:13:05 +0000 (UTC) Subject: rpms/pssh/F-10 .cvsignore, 1.3, 1.4 pssh.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20091101131307.2F25F11C0337@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/pssh/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23310/F-10 Modified Files: .cvsignore pssh.spec sources Log Message: Sync with rawhide. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pssh/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 5 Jan 2009 21:23:44 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:13:01 -0000 1.4 @@ -1 +1 @@ -pssh-1.4.3.tar.gz +pssh-2.0.tar.gz Index: pssh.spec =================================================================== RCS file: /cvs/extras/rpms/pssh/F-10/pssh.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- pssh.spec 5 Jan 2009 21:23:44 -0000 1.2 +++ pssh.spec 1 Nov 2009 13:13:01 -0000 1.3 @@ -3,12 +3,12 @@ Summary: Parallel SSH tools Name: pssh -Version: 1.4.3 -Release: 1%{?dist} +Version: 2.0 +Release: 3%{?dist} License: BSD -Url: http://www.theether.org/pssh/ +Url: http://code.google.com/p/parallel-ssh/ Group: Applications/Productivity -Source0: http://www.theether.org/pssh/pssh-%{version}.tar.gz +Source0: http://parallel-ssh.googlecode.com/files/pssh-%{version}.tar.gz Requires: openssh-clients BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,22 +32,34 @@ Parallell version includes: %install %{__rm} -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__mv} %{buildroot}%{_bindir}/pscp %{buildroot}%{_bindir}/pscp.pssh %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, -) -%doc AUTHORS BUGS ChangeLog COPYING TODO +%doc AUTHORS ChangeLog COPYING %{_bindir}/pnuke %{_bindir}/prsync -%{_bindir}/pscp +%{_bindir}/pscp.pssh %{_bindir}/pslurp %{_bindir}/pssh %{python_sitelib}/%{name}-%{version}* %{python_sitelib}/%{name}lib %changelog +* Sun Nov 01 2009 Terje Rosten - 2.0-1 +- 2.0 +- Switch to new upstream +- Move pscp to pscp.pssh + +* Sun Jul 26 2009 Fedora Release Engineering - 1.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jan 5 2009 Terje Rosten - 1.4.3-1 - 1.4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pssh/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 5 Jan 2009 21:23:44 -0000 1.3 +++ sources 1 Nov 2009 13:13:01 -0000 1.4 @@ -1 +1 @@ -dcb8e1497fdd53dced9c3a5d33053757 pssh-1.4.3.tar.gz +07474f9f9dbefedc809e997f04e1dee5 pssh-2.0.tar.gz From pkgdb at fedoraproject.org Sun Nov 1 13:13:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:13:42 +0000 Subject: [pkgdb] rubygem-nokogiri: kanarip has requested watchbugzilla Message-ID: <20091101131343.1D15C10F877@bastion2.fedora.phx.redhat.com> kanarip has requested the watchbugzilla acl on rubygem-nokogiri (Fedora devel) To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 13:13:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:13:43 +0000 Subject: [pkgdb] rubygem-nokogiri: kanarip has requested watchcommits Message-ID: <20091101131343.CFD9F10F87F@bastion2.fedora.phx.redhat.com> kanarip has requested the watchcommits acl on rubygem-nokogiri (Fedora devel) To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 13:13:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:13:45 +0000 Subject: [pkgdb] rubygem-nokogiri: kanarip has requested commit Message-ID: <20091101131345.90D5110F88F@bastion2.fedora.phx.redhat.com> kanarip has requested the commit acl on rubygem-nokogiri (Fedora devel) To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 13:13:51 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:13:51 +0000 Subject: [pkgdb] rubygem-nokogiri: kanarip has requested watchbugzilla Message-ID: <20091101131351.C892810F877@bastion2.fedora.phx.redhat.com> kanarip has requested the watchbugzilla acl on rubygem-nokogiri (Fedora 11) To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 13:13:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:13:53 +0000 Subject: [pkgdb] rubygem-nokogiri: kanarip has requested watchcommits Message-ID: <20091101131353.3613E10F87F@bastion2.fedora.phx.redhat.com> kanarip has requested the watchcommits acl on rubygem-nokogiri (Fedora 11) To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 13:13:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:13:54 +0000 Subject: [pkgdb] rubygem-nokogiri: kanarip has requested commit Message-ID: <20091101131354.EF3EE10F883@bastion2.fedora.phx.redhat.com> kanarip has requested the commit acl on rubygem-nokogiri (Fedora 11) To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 13:13:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:13:58 +0000 Subject: [pkgdb] rubygem-nokogiri: kanarip has requested watchbugzilla Message-ID: <20091101131358.70A8410F877@bastion2.fedora.phx.redhat.com> kanarip has requested the watchbugzilla acl on rubygem-nokogiri (Fedora 12) To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 13:13:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:13:59 +0000 Subject: [pkgdb] rubygem-nokogiri: kanarip has requested watchcommits Message-ID: <20091101131359.AFCDF10F888@bastion2.fedora.phx.redhat.com> kanarip has requested the watchcommits acl on rubygem-nokogiri (Fedora 12) To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 13:14:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:14:01 +0000 Subject: [pkgdb] rubygem-nokogiri: kanarip has requested commit Message-ID: <20091101131401.6B00910F87F@bastion2.fedora.phx.redhat.com> kanarip has requested the commit acl on rubygem-nokogiri (Fedora 12) To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From thomasj at fedoraproject.org Sun Nov 1 13:21:34 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 13:21:34 +0000 (UTC) Subject: rpms/skrooge/F-12 .cvsignore, 1.3, 1.4 skrooge.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20091101132135.205DE11C02BC@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/skrooge/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25961 Modified Files: .cvsignore skrooge.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.5.3-1 - Updated to new upstream version - Readded a -DCMAKE workaround (please keep it for now) - Useing chmod -x to prevent spurious-executable-perm. Bug filed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/F-12/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 22 Sep 2009 18:54:00 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:21:33 -0000 1.4 @@ -1 +1 @@ -skrooge-0.5.2.tar.gz +skrooge-0.5.3.tar.bz2 Index: skrooge.spec =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/F-12/skrooge.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- skrooge.spec 14 Oct 2009 16:13:20 -0000 1.5 +++ skrooge.spec 1 Nov 2009 13:21:33 -0000 1.6 @@ -1,17 +1,14 @@ Name: skrooge -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: Personal finances manager Group: Applications/Productivity License: GPLv2+ URL: http://extragear.kde.org/apps/skrooge/ -Source0: http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz +Source0: http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## upstream patches -Patch100: skrooge-0.5.2-docs.patch - BuildRequires: qca2-devel BuildRequires: libofx-devel BuildRequires: sqlite-devel @@ -42,15 +39,16 @@ Skrooge libraries %prep %setup -q -%patch100 -p1 -b .docs - -## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h -chmod -x skrooge_search/skgalarmboardwidget.h +## to prevent spurious-executable-perm in -debuginfo. https://bugs.kde.org/show_bug.cgi?id=212613 +chmod -x skrooge_calculator/skginterestboardwidget.cpp +chmod -x skrooge_calculator/skginterestboardwidget.h %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +## the -DCMAKE is needed to prevent unused-direct-shlib-dependency in -libs +## cant be fixed upstream, see: https://bugs.kde.org/show_bug.cgi?id=209912 +%{cmake_kde4} .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" popd make %{?_smp_mflags} -C %{_target_platform} @@ -119,10 +117,15 @@ update-mime-database %{_kde4_datadir}/mi %{_kde4_libdir}/lib*.so.* %changelog +* Sun Nov 01 2009 Thomas Janssen 0.5.3-1 +- Updated to new upstream version +- Readded a -DCMAKE workaround (please keep it for now) +- Useing chmod -x to prevent spurious-executable-perm. Bug filed. + * Wed Oct 14 2009 Rex Dieter 0.5.2-2 - (HTML) docs patch, use %%find_lang --with-kde - own %%{_kde4_appsdir}/skrooge*/ dirs -- %check: omit extraneous desktop-file-validate's +- %%check: omit extraneous desktop-file-validate's * Thu Oct 08 2009 Thomas Janssen 0.5.2-1 - Changed to final 0.5.2 version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/F-12/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 8 Oct 2009 20:07:28 -0000 1.4 +++ sources 1 Nov 2009 13:21:33 -0000 1.5 @@ -1 +1 @@ -52887f432cea1fa9d611af971c1048b7 skrooge-0.5.2.tar.gz +ce42f33233272b502c7916a6f3560139 skrooge-0.5.3.tar.bz2 From pkgdb at fedoraproject.org Sun Nov 1 13:27:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:27:06 +0000 Subject: [pkgdb] pyzor: lucilanga has requested watchcommits Message-ID: <20091101132706.AA25B10F874@bastion2.fedora.phx.redhat.com> lucilanga has requested the watchcommits acl on pyzor (Fedora devel) To make changes to this package see: /pkgdb/packages/name/pyzor From pkgdb at fedoraproject.org Sun Nov 1 13:27:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:27:07 +0000 Subject: [pkgdb] pyzor: lucilanga has requested commit Message-ID: <20091101132707.8233E10F879@bastion2.fedora.phx.redhat.com> lucilanga has requested the commit acl on pyzor (Fedora devel) To make changes to this package see: /pkgdb/packages/name/pyzor From pkgdb at fedoraproject.org Sun Nov 1 13:27:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:27:07 +0000 Subject: [pkgdb] pyzor: lucilanga has requested watchbugzilla Message-ID: <20091101132707.A4FDD10F882@bastion2.fedora.phx.redhat.com> lucilanga has requested the watchbugzilla acl on pyzor (Fedora devel) To make changes to this package see: /pkgdb/packages/name/pyzor From pkgdb at fedoraproject.org Sun Nov 1 13:27:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:27:17 +0000 Subject: [pkgdb] pyzor: lucilanga has requested watchbugzilla Message-ID: <20091101132717.1C6B210F871@bastion2.fedora.phx.redhat.com> lucilanga has requested the watchbugzilla acl on pyzor (Fedora 12) To make changes to this package see: /pkgdb/packages/name/pyzor From pkgdb at fedoraproject.org Sun Nov 1 13:27:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:27:24 +0000 Subject: [pkgdb] pyzor: lucilanga has requested watchcommits Message-ID: <20091101132724.D5AD310F871@bastion2.fedora.phx.redhat.com> lucilanga has requested the watchcommits acl on pyzor (Fedora 12) To make changes to this package see: /pkgdb/packages/name/pyzor From pkgdb at fedoraproject.org Sun Nov 1 13:27:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:27:26 +0000 Subject: [pkgdb] pyzor: lucilanga has requested commit Message-ID: <20091101132726.6E70810F87B@bastion2.fedora.phx.redhat.com> lucilanga has requested the commit acl on pyzor (Fedora 12) To make changes to this package see: /pkgdb/packages/name/pyzor From pkgdb at fedoraproject.org Sun Nov 1 13:27:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:27:32 +0000 Subject: [pkgdb] pyzor: lucilanga has requested watchbugzilla Message-ID: <20091101132732.3A1A810F872@bastion2.fedora.phx.redhat.com> lucilanga has requested the watchbugzilla acl on pyzor (Fedora 11) To make changes to this package see: /pkgdb/packages/name/pyzor From pkgdb at fedoraproject.org Sun Nov 1 13:27:35 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:27:35 +0000 Subject: [pkgdb] pyzor: lucilanga has requested watchcommits Message-ID: <20091101132735.3B96210F87D@bastion2.fedora.phx.redhat.com> lucilanga has requested the watchcommits acl on pyzor (Fedora 11) To make changes to this package see: /pkgdb/packages/name/pyzor From pkgdb at fedoraproject.org Sun Nov 1 13:27:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 13:27:36 +0000 Subject: [pkgdb] pyzor: lucilanga has requested commit Message-ID: <20091101132736.8B6D610F871@bastion2.fedora.phx.redhat.com> lucilanga has requested the commit acl on pyzor (Fedora 11) To make changes to this package see: /pkgdb/packages/name/pyzor From adsllc at fedoraproject.org Sun Nov 1 13:30:20 2009 From: adsllc at fedoraproject.org (Dave Ludlow) Date: Sun, 1 Nov 2009 13:30:20 +0000 (UTC) Subject: comps comps-f10.xml.in, 1.290, 1.291 comps-f11.xml.in, 1.324, 1.325 comps-f12.xml.in, 1.180, 1.181 comps-f13.xml.in, 1.69, 1.70 Message-ID: <20091101133020.43A1311C0338@cvs1.fedora.phx.redhat.com> Author: adsllc Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28866 Modified Files: comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in Log Message: Add drehatlas-xaporho-fonts package Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.290 retrieving revision 1.291 diff -u -p -r1.290 -r1.291 --- comps-f10.xml.in 31 Oct 2009 21:19:14 -0000 1.290 +++ comps-f10.xml.in 1 Nov 2009 13:30:17 -0000 1.291 @@ -1463,6 +1463,7 @@ doulos-fonts drehatlas-warender-bibliothek-fonts drehatlas-widelands-fonts + drehatlas-xaporho-fonts ecolier-court-fonts edrip-fonts fonts-truetype-apl Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.324 retrieving revision 1.325 diff -u -p -r1.324 -r1.325 --- comps-f11.xml.in 31 Oct 2009 21:19:14 -0000 1.324 +++ comps-f11.xml.in 1 Nov 2009 13:30:17 -0000 1.325 @@ -1724,6 +1724,7 @@ denemo-music-fonts drehatlas-warender-bibliothek-fonts drehatlas-widelands-fonts + drehatlas-xaporho-fonts dustin-domestic-manners-fonts dustin-dustismo-roman-fonts dustin-dustismo-sans-fonts Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.180 retrieving revision 1.181 diff -u -p -r1.180 -r1.181 --- comps-f12.xml.in 31 Oct 2009 21:19:14 -0000 1.180 +++ comps-f12.xml.in 1 Nov 2009 13:30:18 -0000 1.181 @@ -1909,6 +1909,7 @@ denemo-music-fonts drehatlas-warender-bibliothek-fonts drehatlas-widelands-fonts + drehatlas-xaporho-fonts dustin-domestic-manners-fonts dustin-dustismo-roman-fonts dustin-dustismo-sans-fonts Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- comps-f13.xml.in 31 Oct 2009 21:19:14 -0000 1.69 +++ comps-f13.xml.in 1 Nov 2009 13:30:18 -0000 1.70 @@ -1898,6 +1898,7 @@ denemo-music-fonts drehatlas-warender-bibliothek-fonts drehatlas-widelands-fonts + drehatlas-xaporho-fonts dustin-domestic-manners-fonts dustin-dustismo-roman-fonts dustin-dustismo-sans-fonts From terjeros at fedoraproject.org Sun Nov 1 13:32:09 2009 From: terjeros at fedoraproject.org (terjeros) Date: Sun, 1 Nov 2009 13:32:09 +0000 (UTC) Subject: rpms/hgsvn/devel hgsvn-no-mercurial.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hgsvn.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <20091101133209.AE28411C02BC@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/hgsvn/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29425 Modified Files: .cvsignore hgsvn.spec sources Added Files: hgsvn-no-mercurial.patch Log Message: * Sun Nov 01 2009 Terje Rosten - 0.1.7-1 - Update to 0.1.7 - Fix license issue (bz #531456) * Fri Jul 24 2009 Fedora Release Engineering - 0.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild hgsvn-no-mercurial.patch: common.py | 15 ++------------- ui.py | 40 ++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 35 deletions(-) --- NEW FILE hgsvn-no-mercurial.patch --- diff -r 31723fc15e14 hgsvn/common.py --- a/hgsvn/common.py Mon Oct 19 07:31:27 2009 +0200 +++ b/hgsvn/common.py Sun Nov 01 13:58:15 2009 +0100 @@ -37,19 +37,8 @@ pass -# We import the lock logic from Mercurial if it is available, and fall back -# to a dummy (always successful) lock if not. -try: - from mercurial.lock import lock as _lock - try: - from mercurial.error import LockHeld - except ImportError: - # LockHeld was defined in mercurial.lock in Mercurial < 1.2 - from mercurial.lock import LockHeld - -except ImportError: - _lock = _SimpleFileLock - LockHeld = _LockHeld +_lock = _SimpleFileLock +LockHeld = _LockHeld hgsvn_private_dir = ".hgsvn" diff -r 31723fc15e14 hgsvn/ui.py --- a/hgsvn/ui.py Mon Oct 19 07:31:27 2009 +0200 +++ b/hgsvn/ui.py Sun Nov 01 13:58:15 2009 +0100 @@ -5,31 +5,27 @@ import os import sys -try: - # First try to import the Mercurial implementation. - from mercurial.util import termwidth -except ImportError: - # Fallback to local copy of Mercurial's implementation. - def termwidth(): - if 'COLUMNS' in os.environ: +# Fallback to local copy of Mercurial's implementation. +def termwidth(): + if 'COLUMNS' in os.environ: + try: + return int(os.environ['COLUMNS']) + except ValueError: + pass + try: + import termios, array, fcntl + for dev in (sys.stdout, sys.stdin): try: - return int(os.environ['COLUMNS']) + fd = dev.fileno() + if not os.isatty(fd): + continue + arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) + return array.array('h', arri)[1] except ValueError: pass - try: - import termios, array, fcntl - for dev in (sys.stdout, sys.stdin): - try: - fd = dev.fileno() - if not os.isatty(fd): - continue - arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) - return array.array('h', arri)[1] - except ValueError: - pass - except ImportError: - pass - return 80 + except ImportError: + pass + return 80 # Log levels Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hgsvn/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 22 Aug 2008 18:30:41 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:32:08 -0000 1.4 @@ -1 +1 @@ -hgsvn-0.1.6.tar.gz +hgsvn-0.1.7.tar.gz Index: hgsvn.spec =================================================================== RCS file: /cvs/extras/rpms/hgsvn/devel/hgsvn.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- hgsvn.spec 25 Jul 2009 02:09:25 -0000 1.6 +++ hgsvn.spec 1 Nov 2009 13:32:09 -0000 1.7 @@ -3,22 +3,19 @@ Summary: A set of scripts to work locally on subversion checkouts using mercurial Name: hgsvn -Version: 0.1.6 -Release: 4%{?dist} +Version: 0.1.7 +Release: 1%{?dist} License: GPLv3+ Group: Development/Tools URL : http://pypi.python.org/pypi/%{name}/ Source0: http://pypi.python.org/packages/source/h/%{name}/%{name}-%{version}.tar.gz +Patch0: hgsvn-no-mercurial.patch BuildArch: noarch Requires: mercurial subversion python-setuptools BuildRequires: python-devel # Needed in %%check BuildRequires: mercurial python-nose subversion -%if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel -%else -BuildRequires: python-setuptools -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -32,6 +29,7 @@ fast local operations like hg log and hg %prep %setup -q +%patch0 -p1 %build CFLAGS="%{optflags}" %{__python} setup.py build @@ -43,18 +41,23 @@ CFLAGS="%{optflags}" %{__python} setup.p %clean %{__rm} -rf %{buildroot} -#check -#{__python} setup.py test +%check +%{__python} setup.py test %files %defattr(-, root, root, -) %doc AUTHORS.txt COPYING.txt README.txt TODO.txt %{_bindir}/hgimportsvn %{_bindir}/hgpullsvn +%{_bindir}/hgpushsvn %{python_sitelib}/%{name} %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info %changelog +* Sun Nov 01 2009 Terje Rosten - 0.1.7-1 +- Update to 0.1.7 +- Fix license issue (bz #531456) + * Fri Jul 24 2009 Fedora Release Engineering - 0.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/hgsvn/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 22 Aug 2008 18:30:41 -0000 1.3 +++ sources 1 Nov 2009 13:32:09 -0000 1.4 @@ -1 +1 @@ -717f21210fb84e7538d76a95a582a647 hgsvn-0.1.6.tar.gz +aaa4ef4124ac388832cddc85c1866236 hgsvn-0.1.7.tar.gz From thomasj at fedoraproject.org Sun Nov 1 13:37:24 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 13:37:24 +0000 (UTC) Subject: rpms/skrooge/F-11 .cvsignore, 1.3, 1.4 skrooge.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20091101133724.D195011C00EE@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/skrooge/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30825 Modified Files: .cvsignore skrooge.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.5.3-1 - Updated to new upstream version - Readded a -DCMAKE workaround (please keep it for now) - Useing chmod -x to prevent spurious-executable-perm. Bug filed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 22 Sep 2009 19:10:14 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:37:23 -0000 1.4 @@ -1 +1 @@ -skrooge-0.5.2.tar.gz +skrooge-0.5.3.tar.bz2 Index: skrooge.spec =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/F-11/skrooge.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- skrooge.spec 14 Oct 2009 16:28:44 -0000 1.5 +++ skrooge.spec 1 Nov 2009 13:37:23 -0000 1.6 @@ -1,17 +1,14 @@ Name: skrooge -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: Personal finances manager Group: Applications/Productivity License: GPLv2+ URL: http://extragear.kde.org/apps/skrooge/ -Source0: http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz +Source0: http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## upstream patches -Patch100: skrooge-0.5.2-docs.patch - BuildRequires: qca2-devel BuildRequires: libofx-devel BuildRequires: sqlite-devel @@ -42,15 +39,16 @@ Skrooge libraries %prep %setup -q -%patch100 -p1 -b .docs - -## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h -chmod -x skrooge_search/skgalarmboardwidget.h +## to prevent spurious-executable-perm in -debuginfo. https://bugs.kde.org/show_bug.cgi?id=212613 +chmod -x skrooge_calculator/skginterestboardwidget.cpp +chmod -x skrooge_calculator/skginterestboardwidget.h %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +## the -DCMAKE is needed to prevent unused-direct-shlib-dependency in -libs +## cant be fixed upstream, see: https://bugs.kde.org/show_bug.cgi?id=209912 +%{cmake_kde4} .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" popd make %{?_smp_mflags} -C %{_target_platform} @@ -119,10 +117,15 @@ update-mime-database %{_kde4_datadir}/mi %{_kde4_libdir}/lib*.so.* %changelog +* Sun Nov 01 2009 Thomas Janssen 0.5.3-1 +- Updated to new upstream version +- Readded a -DCMAKE workaround (please keep it for now) +- Useing chmod -x to prevent spurious-executable-perm. Bug filed. + * Wed Oct 14 2009 Rex Dieter 0.5.2-2 - (HTML) docs patch, use %%find_lang --with-kde - own %%{_kde4_appsdir}/skrooge*/ dirs -- %check: omit extraneous desktop-file-validate's +- %%check: omit extraneous desktop-file-validate's * Thu Oct 08 2009 Thomas Janssen 0.5.2-1 - Changed to final 0.5.2 version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 8 Oct 2009 20:31:58 -0000 1.4 +++ sources 1 Nov 2009 13:37:23 -0000 1.5 @@ -1 +1 @@ -52887f432cea1fa9d611af971c1048b7 skrooge-0.5.2.tar.gz +ce42f33233272b502c7916a6f3560139 skrooge-0.5.3.tar.bz2 From terjeros at fedoraproject.org Sun Nov 1 13:40:47 2009 From: terjeros at fedoraproject.org (terjeros) Date: Sun, 1 Nov 2009 13:40:47 +0000 (UTC) Subject: rpms/hgsvn/F-10 hgsvn-no-mercurial.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hgsvn.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20091101134047.8FE1311C0418@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/hgsvn/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31805/F-10 Modified Files: .cvsignore hgsvn.spec sources Added Files: hgsvn-no-mercurial.patch Log Message: Sync with rawhide. hgsvn-no-mercurial.patch: common.py | 15 ++------------- ui.py | 40 ++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 35 deletions(-) --- NEW FILE hgsvn-no-mercurial.patch --- diff -r 31723fc15e14 hgsvn/common.py --- a/hgsvn/common.py Mon Oct 19 07:31:27 2009 +0200 +++ b/hgsvn/common.py Sun Nov 01 13:58:15 2009 +0100 @@ -37,19 +37,8 @@ pass -# We import the lock logic from Mercurial if it is available, and fall back -# to a dummy (always successful) lock if not. -try: - from mercurial.lock import lock as _lock - try: - from mercurial.error import LockHeld - except ImportError: - # LockHeld was defined in mercurial.lock in Mercurial < 1.2 - from mercurial.lock import LockHeld - -except ImportError: - _lock = _SimpleFileLock - LockHeld = _LockHeld +_lock = _SimpleFileLock +LockHeld = _LockHeld hgsvn_private_dir = ".hgsvn" diff -r 31723fc15e14 hgsvn/ui.py --- a/hgsvn/ui.py Mon Oct 19 07:31:27 2009 +0200 +++ b/hgsvn/ui.py Sun Nov 01 13:58:15 2009 +0100 @@ -5,31 +5,27 @@ import os import sys -try: - # First try to import the Mercurial implementation. - from mercurial.util import termwidth -except ImportError: - # Fallback to local copy of Mercurial's implementation. - def termwidth(): - if 'COLUMNS' in os.environ: +# Fallback to local copy of Mercurial's implementation. +def termwidth(): + if 'COLUMNS' in os.environ: + try: + return int(os.environ['COLUMNS']) + except ValueError: + pass + try: + import termios, array, fcntl + for dev in (sys.stdout, sys.stdin): try: - return int(os.environ['COLUMNS']) + fd = dev.fileno() + if not os.isatty(fd): + continue + arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) + return array.array('h', arri)[1] except ValueError: pass - try: - import termios, array, fcntl - for dev in (sys.stdout, sys.stdin): - try: - fd = dev.fileno() - if not os.isatty(fd): - continue - arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) - return array.array('h', arri)[1] - except ValueError: - pass - except ImportError: - pass - return 80 + except ImportError: + pass + return 80 # Log levels Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hgsvn/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 22 Aug 2008 18:30:41 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:40:46 -0000 1.4 @@ -1 +1 @@ -hgsvn-0.1.6.tar.gz +hgsvn-0.1.7.tar.gz Index: hgsvn.spec =================================================================== RCS file: /cvs/extras/rpms/hgsvn/F-10/hgsvn.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- hgsvn.spec 22 Aug 2008 18:30:41 -0000 1.3 +++ hgsvn.spec 1 Nov 2009 13:40:46 -0000 1.4 @@ -3,22 +3,19 @@ Summary: A set of scripts to work locally on subversion checkouts using mercurial Name: hgsvn -Version: 0.1.6 +Version: 0.1.7 Release: 1%{?dist} License: GPLv3+ Group: Development/Tools URL : http://pypi.python.org/pypi/%{name}/ Source0: http://pypi.python.org/packages/source/h/%{name}/%{name}-%{version}.tar.gz +Patch0: hgsvn-no-mercurial.patch BuildArch: noarch Requires: mercurial subversion python-setuptools BuildRequires: python-devel # Needed in %%check BuildRequires: mercurial python-nose subversion -%if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel -%else -BuildRequires: python-setuptools -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -32,6 +29,7 @@ fast local operations like hg log and hg %prep %setup -q +%patch0 -p1 %build CFLAGS="%{optflags}" %{__python} setup.py build @@ -43,18 +41,32 @@ CFLAGS="%{optflags}" %{__python} setup.p %clean %{__rm} -rf %{buildroot} -#check -#{__python} setup.py test +%check +%{__python} setup.py test %files %defattr(-, root, root, -) %doc AUTHORS.txt COPYING.txt README.txt TODO.txt %{_bindir}/hgimportsvn %{_bindir}/hgpullsvn +%{_bindir}/hgpushsvn %{python_sitelib}/%{name} %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info %changelog +* Sun Nov 01 2009 Terje Rosten - 0.1.7-1 +- Update to 0.1.7 +- Fix license issue (bz #531456) + +* Fri Jul 24 2009 Fedora Release Engineering - 0.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 0.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.1.6-2 +- Rebuild for Python 2.6 + * Fri Aug 22 2008 Terje Rosten - 0.1.6-1 - 0.1.6 - tests are broken, disable %%check Index: sources =================================================================== RCS file: /cvs/extras/rpms/hgsvn/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 22 Aug 2008 18:30:41 -0000 1.3 +++ sources 1 Nov 2009 13:40:46 -0000 1.4 @@ -1 +1 @@ -717f21210fb84e7538d76a95a582a647 hgsvn-0.1.6.tar.gz +aaa4ef4124ac388832cddc85c1866236 hgsvn-0.1.7.tar.gz From terjeros at fedoraproject.org Sun Nov 1 13:40:47 2009 From: terjeros at fedoraproject.org (terjeros) Date: Sun, 1 Nov 2009 13:40:47 +0000 (UTC) Subject: rpms/hgsvn/F-11 hgsvn-no-mercurial.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hgsvn.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <20091101134047.E4ACF11C0418@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/hgsvn/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31805/F-11 Modified Files: .cvsignore hgsvn.spec sources Added Files: hgsvn-no-mercurial.patch Log Message: Sync with rawhide. hgsvn-no-mercurial.patch: common.py | 15 ++------------- ui.py | 40 ++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 35 deletions(-) --- NEW FILE hgsvn-no-mercurial.patch --- diff -r 31723fc15e14 hgsvn/common.py --- a/hgsvn/common.py Mon Oct 19 07:31:27 2009 +0200 +++ b/hgsvn/common.py Sun Nov 01 13:58:15 2009 +0100 @@ -37,19 +37,8 @@ pass -# We import the lock logic from Mercurial if it is available, and fall back -# to a dummy (always successful) lock if not. -try: - from mercurial.lock import lock as _lock - try: - from mercurial.error import LockHeld - except ImportError: - # LockHeld was defined in mercurial.lock in Mercurial < 1.2 - from mercurial.lock import LockHeld - -except ImportError: - _lock = _SimpleFileLock - LockHeld = _LockHeld +_lock = _SimpleFileLock +LockHeld = _LockHeld hgsvn_private_dir = ".hgsvn" diff -r 31723fc15e14 hgsvn/ui.py --- a/hgsvn/ui.py Mon Oct 19 07:31:27 2009 +0200 +++ b/hgsvn/ui.py Sun Nov 01 13:58:15 2009 +0100 @@ -5,31 +5,27 @@ import os import sys -try: - # First try to import the Mercurial implementation. - from mercurial.util import termwidth -except ImportError: - # Fallback to local copy of Mercurial's implementation. - def termwidth(): - if 'COLUMNS' in os.environ: +# Fallback to local copy of Mercurial's implementation. +def termwidth(): + if 'COLUMNS' in os.environ: + try: + return int(os.environ['COLUMNS']) + except ValueError: + pass + try: + import termios, array, fcntl + for dev in (sys.stdout, sys.stdin): try: - return int(os.environ['COLUMNS']) + fd = dev.fileno() + if not os.isatty(fd): + continue + arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) + return array.array('h', arri)[1] except ValueError: pass - try: - import termios, array, fcntl - for dev in (sys.stdout, sys.stdin): - try: - fd = dev.fileno() - if not os.isatty(fd): - continue - arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) - return array.array('h', arri)[1] - except ValueError: - pass - except ImportError: - pass - return 80 + except ImportError: + pass + return 80 # Log levels Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hgsvn/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 22 Aug 2008 18:30:41 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:40:47 -0000 1.4 @@ -1 +1 @@ -hgsvn-0.1.6.tar.gz +hgsvn-0.1.7.tar.gz Index: hgsvn.spec =================================================================== RCS file: /cvs/extras/rpms/hgsvn/F-11/hgsvn.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- hgsvn.spec 25 Feb 2009 03:47:38 -0000 1.5 +++ hgsvn.spec 1 Nov 2009 13:40:47 -0000 1.6 @@ -3,22 +3,19 @@ Summary: A set of scripts to work locally on subversion checkouts using mercurial Name: hgsvn -Version: 0.1.6 -Release: 3%{?dist} +Version: 0.1.7 +Release: 1%{?dist} License: GPLv3+ Group: Development/Tools URL : http://pypi.python.org/pypi/%{name}/ Source0: http://pypi.python.org/packages/source/h/%{name}/%{name}-%{version}.tar.gz +Patch0: hgsvn-no-mercurial.patch BuildArch: noarch Requires: mercurial subversion python-setuptools BuildRequires: python-devel # Needed in %%check BuildRequires: mercurial python-nose subversion -%if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel -%else -BuildRequires: python-setuptools -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -32,6 +29,7 @@ fast local operations like hg log and hg %prep %setup -q +%patch0 -p1 %build CFLAGS="%{optflags}" %{__python} setup.py build @@ -43,18 +41,26 @@ CFLAGS="%{optflags}" %{__python} setup.p %clean %{__rm} -rf %{buildroot} -#check -#{__python} setup.py test +%check +%{__python} setup.py test %files %defattr(-, root, root, -) %doc AUTHORS.txt COPYING.txt README.txt TODO.txt %{_bindir}/hgimportsvn %{_bindir}/hgpullsvn +%{_bindir}/hgpushsvn %{python_sitelib}/%{name} %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info %changelog +* Sun Nov 01 2009 Terje Rosten - 0.1.7-1 +- Update to 0.1.7 +- Fix license issue (bz #531456) + +* Fri Jul 24 2009 Fedora Release Engineering - 0.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Feb 24 2009 Fedora Release Engineering - 0.1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/hgsvn/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 22 Aug 2008 18:30:41 -0000 1.3 +++ sources 1 Nov 2009 13:40:47 -0000 1.4 @@ -1 +1 @@ -717f21210fb84e7538d76a95a582a647 hgsvn-0.1.6.tar.gz +aaa4ef4124ac388832cddc85c1866236 hgsvn-0.1.7.tar.gz From terjeros at fedoraproject.org Sun Nov 1 13:40:49 2009 From: terjeros at fedoraproject.org (terjeros) Date: Sun, 1 Nov 2009 13:40:49 +0000 (UTC) Subject: rpms/hgsvn/F-12 hgsvn-no-mercurial.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hgsvn.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <20091101134049.2B79111C0418@cvs1.fedora.phx.redhat.com> Author: terjeros Update of /cvs/extras/rpms/hgsvn/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31805/F-12 Modified Files: .cvsignore hgsvn.spec sources Added Files: hgsvn-no-mercurial.patch Log Message: Sync with rawhide. hgsvn-no-mercurial.patch: common.py | 15 ++------------- ui.py | 40 ++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 35 deletions(-) --- NEW FILE hgsvn-no-mercurial.patch --- diff -r 31723fc15e14 hgsvn/common.py --- a/hgsvn/common.py Mon Oct 19 07:31:27 2009 +0200 +++ b/hgsvn/common.py Sun Nov 01 13:58:15 2009 +0100 @@ -37,19 +37,8 @@ pass -# We import the lock logic from Mercurial if it is available, and fall back -# to a dummy (always successful) lock if not. -try: - from mercurial.lock import lock as _lock - try: - from mercurial.error import LockHeld - except ImportError: - # LockHeld was defined in mercurial.lock in Mercurial < 1.2 - from mercurial.lock import LockHeld - -except ImportError: - _lock = _SimpleFileLock - LockHeld = _LockHeld +_lock = _SimpleFileLock +LockHeld = _LockHeld hgsvn_private_dir = ".hgsvn" diff -r 31723fc15e14 hgsvn/ui.py --- a/hgsvn/ui.py Mon Oct 19 07:31:27 2009 +0200 +++ b/hgsvn/ui.py Sun Nov 01 13:58:15 2009 +0100 @@ -5,31 +5,27 @@ import os import sys -try: - # First try to import the Mercurial implementation. - from mercurial.util import termwidth -except ImportError: - # Fallback to local copy of Mercurial's implementation. - def termwidth(): - if 'COLUMNS' in os.environ: +# Fallback to local copy of Mercurial's implementation. +def termwidth(): + if 'COLUMNS' in os.environ: + try: + return int(os.environ['COLUMNS']) + except ValueError: + pass + try: + import termios, array, fcntl + for dev in (sys.stdout, sys.stdin): try: - return int(os.environ['COLUMNS']) + fd = dev.fileno() + if not os.isatty(fd): + continue + arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) + return array.array('h', arri)[1] except ValueError: pass - try: - import termios, array, fcntl - for dev in (sys.stdout, sys.stdin): - try: - fd = dev.fileno() - if not os.isatty(fd): - continue - arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) - return array.array('h', arri)[1] - except ValueError: - pass - except ImportError: - pass - return 80 + except ImportError: + pass + return 80 # Log levels Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hgsvn/F-12/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 22 Aug 2008 18:30:41 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:40:47 -0000 1.4 @@ -1 +1 @@ -hgsvn-0.1.6.tar.gz +hgsvn-0.1.7.tar.gz Index: hgsvn.spec =================================================================== RCS file: /cvs/extras/rpms/hgsvn/F-12/hgsvn.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- hgsvn.spec 25 Jul 2009 02:09:25 -0000 1.6 +++ hgsvn.spec 1 Nov 2009 13:40:48 -0000 1.7 @@ -3,22 +3,19 @@ Summary: A set of scripts to work locally on subversion checkouts using mercurial Name: hgsvn -Version: 0.1.6 -Release: 4%{?dist} +Version: 0.1.7 +Release: 1%{?dist} License: GPLv3+ Group: Development/Tools URL : http://pypi.python.org/pypi/%{name}/ Source0: http://pypi.python.org/packages/source/h/%{name}/%{name}-%{version}.tar.gz +Patch0: hgsvn-no-mercurial.patch BuildArch: noarch Requires: mercurial subversion python-setuptools BuildRequires: python-devel # Needed in %%check BuildRequires: mercurial python-nose subversion -%if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel -%else -BuildRequires: python-setuptools -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -32,6 +29,7 @@ fast local operations like hg log and hg %prep %setup -q +%patch0 -p1 %build CFLAGS="%{optflags}" %{__python} setup.py build @@ -43,18 +41,23 @@ CFLAGS="%{optflags}" %{__python} setup.p %clean %{__rm} -rf %{buildroot} -#check -#{__python} setup.py test +%check +%{__python} setup.py test %files %defattr(-, root, root, -) %doc AUTHORS.txt COPYING.txt README.txt TODO.txt %{_bindir}/hgimportsvn %{_bindir}/hgpullsvn +%{_bindir}/hgpushsvn %{python_sitelib}/%{name} %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info %changelog +* Sun Nov 01 2009 Terje Rosten - 0.1.7-1 +- Update to 0.1.7 +- Fix license issue (bz #531456) + * Fri Jul 24 2009 Fedora Release Engineering - 0.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/hgsvn/F-12/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 22 Aug 2008 18:30:41 -0000 1.3 +++ sources 1 Nov 2009 13:40:48 -0000 1.4 @@ -1 +1 @@ -717f21210fb84e7538d76a95a582a647 hgsvn-0.1.6.tar.gz +aaa4ef4124ac388832cddc85c1866236 hgsvn-0.1.7.tar.gz From peter at fedoraproject.org Sun Nov 1 13:46:32 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Sun, 1 Nov 2009 13:46:32 +0000 (UTC) Subject: rpms/rtpproxy/devel rtpproxy.init, NONE, 1.1 .cvsignore, 1.10, 1.11 import.log, 1.5, 1.6 rtpproxy.spec, 1.12, 1.13 rtpproxy.sysconfig, 1.1, 1.2 sources, 1.10, 1.11 rtpproxy--init.diff, 1.1, NONE Message-ID: <20091101134632.6283411C00EE@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/rtpproxy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1161/devel Modified Files: .cvsignore import.log rtpproxy.spec rtpproxy.sysconfig sources Added Files: rtpproxy.init Removed Files: rtpproxy--init.diff Log Message: Ver. 1.2.1 --- NEW FILE rtpproxy.init --- #!/bin/bash # # Startup script for rtpproxy # # chkconfig: - 85 15 # description: A symmetric RTP proxy # # processname: rtpproxy ### BEGIN INIT INFO # Provides: rtpproxy # Required-Start: $local_fs $network $syslog # Required-Stop: $local_fs $network $syslog # Default-Start: # Default-Stop: 0 1 6 # Short-Description: A symmetric RTP proxy # Description: A symmetric RTP proxy ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions prog=rtpproxy rtpproxy=/usr/bin/$prog lockfile=/var/lock/subsys/$prog pidfile=/var/run/$prog.pid OPTIONS= # User-defined options and/or overrides of the variables, # listed above, should go there: [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog RETVAL=0 start() { echo -n $"Starting $prog: " # check whether rtpproxy was already started if pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "already running" && warning && echo return 0 fi daemon $rtpproxy -p $pidfile -u rtpproxy $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile return $RETVAL } stop() { echo -n $"Stopping $prog: " # check whether rtpproxy was already started if ! pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "not running" && warning && echo return 0 fi killproc -p $pidfile $prog RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $lockfile $pidfile return $RETVAL } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status -p $pidfile $prog RETVAL=$? ;; restart|force-reload) stop start ;; reload) echo -n $"Reloading $prog: not supported" && failure && echo RETVAL=3 ;; condrestart|try-restart) if [ -f $pidfile ] ; then stop start fi ;; *) echo $"Usage: $prog {start|stop|restart|condrestart|status|help}" RETVAL=2 esac exit $RETVAL Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 27 Mar 2009 14:39:52 -0000 1.10 +++ .cvsignore 1 Nov 2009 13:46:31 -0000 1.11 @@ -1 +1 @@ -rtpproxy-1.2.0.tar.gz +rtpproxy-1.2.1.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/devel/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 27 Mar 2009 14:39:52 -0000 1.5 +++ import.log 1 Nov 2009 13:46:31 -0000 1.6 @@ -3,3 +3,4 @@ rtpproxy-1_2-0_1_alpha_200807211_fc9:HEA rtpproxy-1_2-0_2_alpha_200807211_fc9:HEAD:rtpproxy-1.2-0.2.alpha.200807211.fc9.src.rpm:1223295887 rtpproxy-1_2-0_3_beta_200901120_fc10:HEAD:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233053623 rtpproxy-1_2_0-1_fc10:HEAD:rtpproxy-1.2.0-1.fc10.src.rpm:1238164727 +rtpproxy-1_2_1-1_fc11:HEAD:rtpproxy-1.2.1-1.fc11.src.rpm:1257083106 Index: rtpproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/devel/rtpproxy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- rtpproxy.spec 27 Jul 2009 03:19:06 -0000 1.12 +++ rtpproxy.spec 1 Nov 2009 13:46:31 -0000 1.13 @@ -1,14 +1,13 @@ Name: rtpproxy -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: A symmetric RTP proxy Group: Applications/Internet License: BSD URL: http://www.rtpproxy.org Source0: http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz Source1: rtpproxy.sysconfig -# Fedora specific -Patch0: rtpproxy--init.diff +Source2: rtpproxy.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gsm-devel Requires(pre): /usr/sbin/useradd @@ -25,7 +24,6 @@ rewriting SDP bodies in SIP messages tha %prep %setup -q -%patch0 -p0 -b .init_fix %build @@ -36,8 +34,8 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} @@ -72,6 +70,10 @@ fi %changelog +* Sun Nov 1 2009 Peter Lemenkov - 1.2.1-1 +- Ver. 1.2.1 +- Brand new init-script + * Sun Jul 26 2009 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: rtpproxy.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/devel/rtpproxy.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rtpproxy.sysconfig 27 Jan 2009 10:55:02 -0000 1.1 +++ rtpproxy.sysconfig 1 Nov 2009 13:46:31 -0000 1.2 @@ -1,2 +1,2 @@ -OPTIONS="-u rtpproxy" +OPTIONS="" Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 27 Mar 2009 14:39:53 -0000 1.10 +++ sources 1 Nov 2009 13:46:31 -0000 1.11 @@ -1 +1 @@ -eb4e650ec00618a77a35f0abb91f988a rtpproxy-1.2.0.tar.gz +b0b5d6cdce3f17cdbbac473c11a2d0e5 rtpproxy-1.2.1.tar.gz --- rtpproxy--init.diff DELETED --- From peter at fedoraproject.org Sun Nov 1 13:48:22 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Sun, 1 Nov 2009 13:48:22 +0000 (UTC) Subject: rpms/rtpproxy/F-12 rtpproxy.init, NONE, 1.1 .cvsignore, 1.10, 1.11 import.log, 1.5, 1.6 rtpproxy.spec, 1.12, 1.13 rtpproxy.sysconfig, 1.1, 1.2 sources, 1.10, 1.11 rtpproxy--init.diff, 1.1, NONE Message-ID: <20091101134822.60B9F11C0417@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/rtpproxy/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1776/F-12 Modified Files: .cvsignore import.log rtpproxy.spec rtpproxy.sysconfig sources Added Files: rtpproxy.init Removed Files: rtpproxy--init.diff Log Message: Ver. 1.2.1 --- NEW FILE rtpproxy.init --- #!/bin/bash # # Startup script for rtpproxy # # chkconfig: - 85 15 # description: A symmetric RTP proxy # # processname: rtpproxy ### BEGIN INIT INFO # Provides: rtpproxy # Required-Start: $local_fs $network $syslog # Required-Stop: $local_fs $network $syslog # Default-Start: # Default-Stop: 0 1 6 # Short-Description: A symmetric RTP proxy # Description: A symmetric RTP proxy ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions prog=rtpproxy rtpproxy=/usr/bin/$prog lockfile=/var/lock/subsys/$prog pidfile=/var/run/$prog.pid OPTIONS= # User-defined options and/or overrides of the variables, # listed above, should go there: [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog RETVAL=0 start() { echo -n $"Starting $prog: " # check whether rtpproxy was already started if pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "already running" && warning && echo return 0 fi daemon $rtpproxy -p $pidfile -u rtpproxy $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile return $RETVAL } stop() { echo -n $"Stopping $prog: " # check whether rtpproxy was already started if ! pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "not running" && warning && echo return 0 fi killproc -p $pidfile $prog RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $lockfile $pidfile return $RETVAL } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status -p $pidfile $prog RETVAL=$? ;; restart|force-reload) stop start ;; reload) echo -n $"Reloading $prog: not supported" && failure && echo RETVAL=3 ;; condrestart|try-restart) if [ -f $pidfile ] ; then stop start fi ;; *) echo $"Usage: $prog {start|stop|restart|condrestart|status|help}" RETVAL=2 esac exit $RETVAL Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-12/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 27 Mar 2009 14:39:52 -0000 1.10 +++ .cvsignore 1 Nov 2009 13:48:20 -0000 1.11 @@ -1 +1 @@ -rtpproxy-1.2.0.tar.gz +rtpproxy-1.2.1.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-12/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 27 Mar 2009 14:39:52 -0000 1.5 +++ import.log 1 Nov 2009 13:48:20 -0000 1.6 @@ -3,3 +3,4 @@ rtpproxy-1_2-0_1_alpha_200807211_fc9:HEA rtpproxy-1_2-0_2_alpha_200807211_fc9:HEAD:rtpproxy-1.2-0.2.alpha.200807211.fc9.src.rpm:1223295887 rtpproxy-1_2-0_3_beta_200901120_fc10:HEAD:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233053623 rtpproxy-1_2_0-1_fc10:HEAD:rtpproxy-1.2.0-1.fc10.src.rpm:1238164727 +rtpproxy-1_2_1-1_fc11:F-12:rtpproxy-1.2.1-1.fc11.src.rpm:1257083239 Index: rtpproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-12/rtpproxy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- rtpproxy.spec 27 Jul 2009 03:19:06 -0000 1.12 +++ rtpproxy.spec 1 Nov 2009 13:48:21 -0000 1.13 @@ -1,14 +1,13 @@ Name: rtpproxy -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: A symmetric RTP proxy Group: Applications/Internet License: BSD URL: http://www.rtpproxy.org Source0: http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz Source1: rtpproxy.sysconfig -# Fedora specific -Patch0: rtpproxy--init.diff +Source2: rtpproxy.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gsm-devel Requires(pre): /usr/sbin/useradd @@ -25,7 +24,6 @@ rewriting SDP bodies in SIP messages tha %prep %setup -q -%patch0 -p0 -b .init_fix %build @@ -36,8 +34,8 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} @@ -72,6 +70,10 @@ fi %changelog +* Sun Nov 1 2009 Peter Lemenkov - 1.2.1-1 +- Ver. 1.2.1 +- Brand new init-script + * Sun Jul 26 2009 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: rtpproxy.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-12/rtpproxy.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rtpproxy.sysconfig 27 Jan 2009 10:55:02 -0000 1.1 +++ rtpproxy.sysconfig 1 Nov 2009 13:48:21 -0000 1.2 @@ -1,2 +1,2 @@ -OPTIONS="-u rtpproxy" +OPTIONS="" Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-12/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 27 Mar 2009 14:39:53 -0000 1.10 +++ sources 1 Nov 2009 13:48:21 -0000 1.11 @@ -1 +1 @@ -eb4e650ec00618a77a35f0abb91f988a rtpproxy-1.2.0.tar.gz +b0b5d6cdce3f17cdbbac473c11a2d0e5 rtpproxy-1.2.1.tar.gz --- rtpproxy--init.diff DELETED --- From peter at fedoraproject.org Sun Nov 1 13:49:50 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Sun, 1 Nov 2009 13:49:50 +0000 (UTC) Subject: rpms/rtpproxy/F-11 rtpproxy.init, NONE, 1.1 .cvsignore, 1.10, 1.11 import.log, 1.5, 1.6 rtpproxy.spec, 1.11, 1.12 rtpproxy.sysconfig, 1.1, 1.2 sources, 1.10, 1.11 rtpproxy--init.diff, 1.1, NONE Message-ID: <20091101134950.98CBF11C00EE@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/rtpproxy/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2283/F-11 Modified Files: .cvsignore import.log rtpproxy.spec rtpproxy.sysconfig sources Added Files: rtpproxy.init Removed Files: rtpproxy--init.diff Log Message: Ver. 1.2.1 --- NEW FILE rtpproxy.init --- #!/bin/bash # # Startup script for rtpproxy # # chkconfig: - 85 15 # description: A symmetric RTP proxy # # processname: rtpproxy ### BEGIN INIT INFO # Provides: rtpproxy # Required-Start: $local_fs $network $syslog # Required-Stop: $local_fs $network $syslog # Default-Start: # Default-Stop: 0 1 6 # Short-Description: A symmetric RTP proxy # Description: A symmetric RTP proxy ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions prog=rtpproxy rtpproxy=/usr/bin/$prog lockfile=/var/lock/subsys/$prog pidfile=/var/run/$prog.pid OPTIONS= # User-defined options and/or overrides of the variables, # listed above, should go there: [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog RETVAL=0 start() { echo -n $"Starting $prog: " # check whether rtpproxy was already started if pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "already running" && warning && echo return 0 fi daemon $rtpproxy -p $pidfile -u rtpproxy $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile return $RETVAL } stop() { echo -n $"Stopping $prog: " # check whether rtpproxy was already started if ! pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "not running" && warning && echo return 0 fi killproc -p $pidfile $prog RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $lockfile $pidfile return $RETVAL } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status -p $pidfile $prog RETVAL=$? ;; restart|force-reload) stop start ;; reload) echo -n $"Reloading $prog: not supported" && failure && echo RETVAL=3 ;; condrestart|try-restart) if [ -f $pidfile ] ; then stop start fi ;; *) echo $"Usage: $prog {start|stop|restart|condrestart|status|help}" RETVAL=2 esac exit $RETVAL Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-11/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 27 Mar 2009 14:39:52 -0000 1.10 +++ .cvsignore 1 Nov 2009 13:49:49 -0000 1.11 @@ -1 +1 @@ -rtpproxy-1.2.0.tar.gz +rtpproxy-1.2.1.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-11/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 27 Mar 2009 14:39:52 -0000 1.5 +++ import.log 1 Nov 2009 13:49:49 -0000 1.6 @@ -3,3 +3,4 @@ rtpproxy-1_2-0_1_alpha_200807211_fc9:HEA rtpproxy-1_2-0_2_alpha_200807211_fc9:HEAD:rtpproxy-1.2-0.2.alpha.200807211.fc9.src.rpm:1223295887 rtpproxy-1_2-0_3_beta_200901120_fc10:HEAD:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233053623 rtpproxy-1_2_0-1_fc10:HEAD:rtpproxy-1.2.0-1.fc10.src.rpm:1238164727 +rtpproxy-1_2_1-1_fc11:F-11:rtpproxy-1.2.1-1.fc11.src.rpm:1257083341 Index: rtpproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-11/rtpproxy.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- rtpproxy.spec 27 Mar 2009 14:39:52 -0000 1.11 +++ rtpproxy.spec 1 Nov 2009 13:49:50 -0000 1.12 @@ -1,5 +1,5 @@ Name: rtpproxy -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: A symmetric RTP proxy Group: Applications/Internet @@ -7,8 +7,7 @@ License: BSD URL: http://www.rtpproxy.org Source0: http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz Source1: rtpproxy.sysconfig -# Fedora specific -Patch0: rtpproxy--init.diff +Source2: rtpproxy.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gsm-devel Requires(pre): /usr/sbin/useradd @@ -25,7 +24,6 @@ rewriting SDP bodies in SIP messages tha %prep %setup -q -%patch0 -p0 -b .init_fix %build @@ -36,8 +34,8 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} @@ -72,6 +70,13 @@ fi %changelog +* Sun Nov 1 2009 Peter Lemenkov - 1.2.1-1 +- Ver. 1.2.1 +- Brand new init-script + +* Sun Jul 26 2009 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Mar 27 2009 Peter Lemenkov - 1.2.0-1 - Ver. 1.2.0 Index: rtpproxy.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-11/rtpproxy.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rtpproxy.sysconfig 27 Jan 2009 10:55:02 -0000 1.1 +++ rtpproxy.sysconfig 1 Nov 2009 13:49:50 -0000 1.2 @@ -1,2 +1,2 @@ -OPTIONS="-u rtpproxy" +OPTIONS="" Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-11/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 27 Mar 2009 14:39:53 -0000 1.10 +++ sources 1 Nov 2009 13:49:50 -0000 1.11 @@ -1 +1 @@ -eb4e650ec00618a77a35f0abb91f988a rtpproxy-1.2.0.tar.gz +b0b5d6cdce3f17cdbbac473c11a2d0e5 rtpproxy-1.2.1.tar.gz --- rtpproxy--init.diff DELETED --- From thomasj at fedoraproject.org Sun Nov 1 13:51:55 2009 From: thomasj at fedoraproject.org (thomasj) Date: Sun, 1 Nov 2009 13:51:55 +0000 (UTC) Subject: rpms/skrooge/F-10 .cvsignore, 1.3, 1.4 skrooge.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <20091101135155.8947411C02BC@cvs1.fedora.phx.redhat.com> Author: thomasj Update of /cvs/pkgs/rpms/skrooge/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2845 Modified Files: .cvsignore skrooge.spec sources Log Message: * Sun Nov 01 2009 Thomas Janssen 0.5.3-1 - Updated to new upstream version - Readded a -DCMAKE workaround (please keep it for now) - Useing chmod -x to prevent spurious-executable-perm. Bug filed. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 22 Sep 2009 19:25:54 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:51:54 -0000 1.4 @@ -1 +1 @@ -skrooge-0.5.2.tar.gz +skrooge-0.5.3.tar.bz2 Index: skrooge.spec =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/F-10/skrooge.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- skrooge.spec 14 Oct 2009 15:50:16 -0000 1.5 +++ skrooge.spec 1 Nov 2009 13:51:55 -0000 1.6 @@ -1,17 +1,14 @@ Name: skrooge -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: Personal finances manager Group: Applications/Productivity License: GPLv2+ URL: http://extragear.kde.org/apps/skrooge/ -Source0: http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz +Source0: http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## upstream patches -Patch100: skrooge-0.5.2-docs.patch - BuildRequires: qca2-devel BuildRequires: libofx-devel BuildRequires: sqlite-devel @@ -42,15 +39,16 @@ Skrooge libraries %prep %setup -q -%patch100 -p1 -b .docs - -## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h -chmod -x skrooge_search/skgalarmboardwidget.h +## to prevent spurious-executable-perm in -debuginfo. https://bugs.kde.org/show_bug.cgi?id=212613 +chmod -x skrooge_calculator/skginterestboardwidget.cpp +chmod -x skrooge_calculator/skginterestboardwidget.h %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +## the -DCMAKE is needed to prevent unused-direct-shlib-dependency in -libs +## cant be fixed upstream, see: https://bugs.kde.org/show_bug.cgi?id=209912 +%{cmake_kde4} .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" popd make %{?_smp_mflags} -C %{_target_platform} @@ -119,10 +117,15 @@ update-mime-database %{_kde4_datadir}/mi %{_kde4_libdir}/lib*.so.* %changelog +* Sun Nov 01 2009 Thomas Janssen 0.5.3-1 +- Updated to new upstream version +- Readded a -DCMAKE workaround (please keep it for now) +- Useing chmod -x to prevent spurious-executable-perm. Bug filed. + * Wed Oct 14 2009 Rex Dieter 0.5.2-2 - (HTML) docs patch, use %%find_lang --with-kde - own %%{_kde4_appsdir}/skrooge*/ dirs -- %check: omit extraneous desktop-file-validate's +- %%check: omit extraneous desktop-file-validate's * Thu Oct 08 2009 Thomas Janssen 0.5.2-1 - Changed to final 0.5.2 version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/skrooge/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 8 Oct 2009 20:56:15 -0000 1.4 +++ sources 1 Nov 2009 13:51:55 -0000 1.5 @@ -1 +1 @@ -52887f432cea1fa9d611af971c1048b7 skrooge-0.5.2.tar.gz +ce42f33233272b502c7916a6f3560139 skrooge-0.5.3.tar.bz2 From peter at fedoraproject.org Sun Nov 1 13:52:09 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Sun, 1 Nov 2009 13:52:09 +0000 (UTC) Subject: rpms/rtpproxy/F-10 rtpproxy.init, NONE, 1.1 .cvsignore, 1.10, 1.11 import.log, 1.5, 1.6 rtpproxy.spec, 1.10, 1.11 rtpproxy.sysconfig, 1.1, 1.2 sources, 1.10, 1.11 rtpproxy--init.diff, 1.1, NONE Message-ID: <20091101135209.9CC1B11C02BC@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/rtpproxy/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3025/F-10 Modified Files: .cvsignore import.log rtpproxy.spec rtpproxy.sysconfig sources Added Files: rtpproxy.init Removed Files: rtpproxy--init.diff Log Message: Ver. 1.2.1 --- NEW FILE rtpproxy.init --- #!/bin/bash # # Startup script for rtpproxy # # chkconfig: - 85 15 # description: A symmetric RTP proxy # # processname: rtpproxy ### BEGIN INIT INFO # Provides: rtpproxy # Required-Start: $local_fs $network $syslog # Required-Stop: $local_fs $network $syslog # Default-Start: # Default-Stop: 0 1 6 # Short-Description: A symmetric RTP proxy # Description: A symmetric RTP proxy ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions prog=rtpproxy rtpproxy=/usr/bin/$prog lockfile=/var/lock/subsys/$prog pidfile=/var/run/$prog.pid OPTIONS= # User-defined options and/or overrides of the variables, # listed above, should go there: [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog RETVAL=0 start() { echo -n $"Starting $prog: " # check whether rtpproxy was already started if pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "already running" && warning && echo return 0 fi daemon $rtpproxy -p $pidfile -u rtpproxy $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile return $RETVAL } stop() { echo -n $"Stopping $prog: " # check whether rtpproxy was already started if ! pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "not running" && warning && echo return 0 fi killproc -p $pidfile $prog RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $lockfile $pidfile return $RETVAL } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status -p $pidfile $prog RETVAL=$? ;; restart|force-reload) stop start ;; reload) echo -n $"Reloading $prog: not supported" && failure && echo RETVAL=3 ;; condrestart|try-restart) if [ -f $pidfile ] ; then stop start fi ;; *) echo $"Usage: $prog {start|stop|restart|condrestart|status|help}" RETVAL=2 esac exit $RETVAL Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-10/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 27 Mar 2009 14:42:48 -0000 1.10 +++ .cvsignore 1 Nov 2009 13:52:08 -0000 1.11 @@ -1 +1 @@ -rtpproxy-1.2.0.tar.gz +rtpproxy-1.2.1.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-10/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- import.log 27 Mar 2009 14:42:48 -0000 1.5 +++ import.log 1 Nov 2009 13:52:08 -0000 1.6 @@ -3,3 +3,4 @@ rtpproxy-1_2-0_1_alpha_200807211_fc9:HEA rtpproxy-1_2-0_2_alpha_200807211_fc9:HEAD:rtpproxy-1.2-0.2.alpha.200807211.fc9.src.rpm:1223295887 rtpproxy-1_2-0_3_beta_200901120_fc10:F-10:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233053827 rtpproxy-1_2_0-1_fc10:F-10:rtpproxy-1.2.0-1.fc10.src.rpm:1238164852 +rtpproxy-1_2_1-1_fc11:F-10:rtpproxy-1.2.1-1.fc11.src.rpm:1257083467 Index: rtpproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-10/rtpproxy.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- rtpproxy.spec 27 Mar 2009 14:42:48 -0000 1.10 +++ rtpproxy.spec 1 Nov 2009 13:52:08 -0000 1.11 @@ -1,5 +1,5 @@ Name: rtpproxy -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: A symmetric RTP proxy Group: Applications/Internet @@ -7,8 +7,7 @@ License: BSD URL: http://www.rtpproxy.org Source0: http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz Source1: rtpproxy.sysconfig -# Fedora specific -Patch0: rtpproxy--init.diff +Source2: rtpproxy.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gsm-devel Requires(pre): /usr/sbin/useradd @@ -25,7 +24,6 @@ rewriting SDP bodies in SIP messages tha %prep %setup -q -%patch0 -p0 -b .init_fix %build @@ -36,8 +34,8 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} @@ -72,6 +70,13 @@ fi %changelog +* Sun Nov 1 2009 Peter Lemenkov - 1.2.1-1 +- Ver. 1.2.1 +- Brand new init-script + +* Sun Jul 26 2009 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Mar 27 2009 Peter Lemenkov - 1.2.0-1 - Ver. 1.2.0 Index: rtpproxy.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-10/rtpproxy.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rtpproxy.sysconfig 27 Jan 2009 10:57:55 -0000 1.1 +++ rtpproxy.sysconfig 1 Nov 2009 13:52:08 -0000 1.2 @@ -1,2 +1,2 @@ -OPTIONS="-u rtpproxy" +OPTIONS="" Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/F-10/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 27 Mar 2009 14:42:48 -0000 1.10 +++ sources 1 Nov 2009 13:52:08 -0000 1.11 @@ -1 +1 @@ -eb4e650ec00618a77a35f0abb91f988a rtpproxy-1.2.0.tar.gz +b0b5d6cdce3f17cdbbac473c11a2d0e5 rtpproxy-1.2.1.tar.gz --- rtpproxy--init.diff DELETED --- From peter at fedoraproject.org Sun Nov 1 13:54:53 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Sun, 1 Nov 2009 13:54:53 +0000 (UTC) Subject: rpms/rtpproxy/EL-5 rtpproxy.init, NONE, 1.1 .cvsignore, 1.9, 1.10 import.log, 1.3, 1.4 rtpproxy.spec, 1.8, 1.9 rtpproxy.sysconfig, 1.1, 1.2 sources, 1.9, 1.10 rtpproxy--init.diff, 1.1, NONE Message-ID: <20091101135453.564A711C00EE@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/rtpproxy/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3941/EL-5 Modified Files: .cvsignore import.log rtpproxy.spec rtpproxy.sysconfig sources Added Files: rtpproxy.init Removed Files: rtpproxy--init.diff Log Message: Ver. 1.2.1 --- NEW FILE rtpproxy.init --- #!/bin/bash # # Startup script for rtpproxy # # chkconfig: - 85 15 # description: A symmetric RTP proxy # # processname: rtpproxy ### BEGIN INIT INFO # Provides: rtpproxy # Required-Start: $local_fs $network $syslog # Required-Stop: $local_fs $network $syslog # Default-Start: # Default-Stop: 0 1 6 # Short-Description: A symmetric RTP proxy # Description: A symmetric RTP proxy ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions prog=rtpproxy rtpproxy=/usr/bin/$prog lockfile=/var/lock/subsys/$prog pidfile=/var/run/$prog.pid OPTIONS= # User-defined options and/or overrides of the variables, # listed above, should go there: [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog RETVAL=0 start() { echo -n $"Starting $prog: " # check whether rtpproxy was already started if pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "already running" && warning && echo return 0 fi daemon $rtpproxy -p $pidfile -u rtpproxy $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile return $RETVAL } stop() { echo -n $"Stopping $prog: " # check whether rtpproxy was already started if ! pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "not running" && warning && echo return 0 fi killproc -p $pidfile $prog RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $lockfile $pidfile return $RETVAL } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status -p $pidfile $prog RETVAL=$? ;; restart|force-reload) stop start ;; reload) echo -n $"Reloading $prog: not supported" && failure && echo RETVAL=3 ;; condrestart|try-restart) if [ -f $pidfile ] ; then stop start fi ;; *) echo $"Usage: $prog {start|stop|restart|condrestart|status|help}" RETVAL=2 esac exit $RETVAL Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-5/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 27 Mar 2009 09:20:20 -0000 1.9 +++ .cvsignore 1 Nov 2009 13:54:51 -0000 1.10 @@ -1 +1 @@ -rtpproxy-1.2.0.tar.gz +rtpproxy-1.2.1.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-5/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 27 Mar 2009 09:20:20 -0000 1.3 +++ import.log 1 Nov 2009 13:54:51 -0000 1.4 @@ -1,3 +1,4 @@ rtpproxy-1_1-1_fc9:EL-5:rtpproxy-1.1-1.fc9.src.rpm:1213799367 rtpproxy-1_2-0_3_beta_200901120_fc10:EL-5:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233054245 rtpproxy-1_2_0-1_fc10:EL-5:rtpproxy-1.2.0-1.fc10.src.rpm:1238145569 +rtpproxy-1_2_1-1_fc11:EL-5:rtpproxy-1.2.1-1.fc11.src.rpm:1257083617 Index: rtpproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-5/rtpproxy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- rtpproxy.spec 27 Mar 2009 09:20:20 -0000 1.8 +++ rtpproxy.spec 1 Nov 2009 13:54:51 -0000 1.9 @@ -1,5 +1,5 @@ Name: rtpproxy -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: A symmetric RTP proxy Group: Applications/Internet @@ -7,8 +7,7 @@ License: BSD URL: http://www.rtpproxy.org Source0: http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz Source1: rtpproxy.sysconfig -# Fedora specific -Patch0: rtpproxy--init.diff +Source2: rtpproxy.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gsm-devel Requires(pre): /usr/sbin/useradd @@ -25,7 +24,6 @@ rewriting SDP bodies in SIP messages tha %prep %setup -q -%patch0 -p0 -b .init_fix %build @@ -36,8 +34,8 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} @@ -72,6 +70,13 @@ fi %changelog +* Sun Nov 1 2009 Peter Lemenkov - 1.2.1-1 +- Ver. 1.2.1 +- Brand new init-script + +* Sun Jul 26 2009 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Mar 27 2009 Peter Lemenkov - 1.2.0-1 - Ver. 1.2.0 Index: rtpproxy.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-5/rtpproxy.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rtpproxy.sysconfig 27 Jan 2009 11:06:21 -0000 1.1 +++ rtpproxy.sysconfig 1 Nov 2009 13:54:51 -0000 1.2 @@ -1,2 +1,2 @@ -OPTIONS="-u rtpproxy" +OPTIONS="" Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 27 Mar 2009 09:20:20 -0000 1.9 +++ sources 1 Nov 2009 13:54:51 -0000 1.10 @@ -1 +1 @@ -eb4e650ec00618a77a35f0abb91f988a rtpproxy-1.2.0.tar.gz +b0b5d6cdce3f17cdbbac473c11a2d0e5 rtpproxy-1.2.1.tar.gz --- rtpproxy--init.diff DELETED --- From peter at fedoraproject.org Sun Nov 1 14:05:59 2009 From: peter at fedoraproject.org (Peter Lemenkov) Date: Sun, 1 Nov 2009 14:05:59 +0000 (UTC) Subject: rpms/rtpproxy/EL-4 rtpproxy.init, NONE, 1.1 .cvsignore, 1.9, 1.10 import.log, 1.3, 1.4 rtpproxy.spec, 1.8, 1.9 rtpproxy.sysconfig, 1.1, 1.2 sources, 1.9, 1.10 rtpproxy--init.diff, 1.1, NONE Message-ID: <20091101140600.201C311C00EE@cvs1.fedora.phx.redhat.com> Author: peter Update of /cvs/pkgs/rpms/rtpproxy/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7239/EL-4 Modified Files: .cvsignore import.log rtpproxy.spec rtpproxy.sysconfig sources Added Files: rtpproxy.init Removed Files: rtpproxy--init.diff Log Message: Ver. 1.2.1 --- NEW FILE rtpproxy.init --- #!/bin/bash # # Startup script for rtpproxy # # chkconfig: - 85 15 # description: A symmetric RTP proxy # # processname: rtpproxy ### BEGIN INIT INFO # Provides: rtpproxy # Required-Start: $local_fs $network $syslog # Required-Stop: $local_fs $network $syslog # Default-Start: # Default-Stop: 0 1 6 # Short-Description: A symmetric RTP proxy # Description: A symmetric RTP proxy ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions prog=rtpproxy rtpproxy=/usr/bin/$prog lockfile=/var/lock/subsys/$prog pidfile=/var/run/$prog.pid OPTIONS= # User-defined options and/or overrides of the variables, # listed above, should go there: [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog RETVAL=0 start() { echo -n $"Starting $prog: " # check whether rtpproxy was already started if pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "already running" && warning && echo return 0 fi daemon $rtpproxy -p $pidfile -u rtpproxy $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile return $RETVAL } stop() { echo -n $"Stopping $prog: " # check whether rtpproxy was already started if ! pidofproc -p $pidfile > /dev/null 2>&1 ; then echo -n "not running" && warning && echo return 0 fi killproc -p $pidfile $prog RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $lockfile $pidfile return $RETVAL } # See how we were called. case "$1" in start) start ;; stop) stop ;; status) status -p $pidfile $prog RETVAL=$? ;; restart|force-reload) stop start ;; reload) echo -n $"Reloading $prog: not supported" && failure && echo RETVAL=3 ;; condrestart|try-restart) if [ -f $pidfile ] ; then stop start fi ;; *) echo $"Usage: $prog {start|stop|restart|condrestart|status|help}" RETVAL=2 esac exit $RETVAL Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 27 Mar 2009 09:22:50 -0000 1.9 +++ .cvsignore 1 Nov 2009 14:05:57 -0000 1.10 @@ -1 +1 @@ -rtpproxy-1.2.0.tar.gz +rtpproxy-1.2.1.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-4/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- import.log 27 Mar 2009 09:22:51 -0000 1.3 +++ import.log 1 Nov 2009 14:05:57 -0000 1.4 @@ -1,3 +1,4 @@ rtpproxy-1_1-1_fc9:EL-4:rtpproxy-1.1-1.fc9.src.rpm:1213799532 rtpproxy-1_2-0_3_beta_200901120_fc10:EL-4:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233054461 rtpproxy-1_2_0-1_fc10:EL-4:rtpproxy-1.2.0-1.fc10.src.rpm:1238145708 +rtpproxy-1_2_1-1_fc11:EL-4:rtpproxy-1.2.1-1.fc11.src.rpm:1257083942 Index: rtpproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-4/rtpproxy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- rtpproxy.spec 27 Mar 2009 09:22:51 -0000 1.8 +++ rtpproxy.spec 1 Nov 2009 14:05:58 -0000 1.9 @@ -1,5 +1,5 @@ Name: rtpproxy -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: A symmetric RTP proxy Group: Applications/Internet @@ -7,8 +7,7 @@ License: BSD URL: http://www.rtpproxy.org Source0: http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz Source1: rtpproxy.sysconfig -# Fedora specific -Patch0: rtpproxy--init.diff +Source2: rtpproxy.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gsm-devel Requires(pre): /usr/sbin/useradd @@ -25,7 +24,6 @@ rewriting SDP bodies in SIP messages tha %prep %setup -q -%patch0 -p0 -b .init_fix %build @@ -36,8 +34,8 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +install -D -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} @@ -72,6 +70,13 @@ fi %changelog +* Sun Nov 1 2009 Peter Lemenkov - 1.2.1-1 +- Ver. 1.2.1 +- Brand new init-script + +* Sun Jul 26 2009 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Mar 27 2009 Peter Lemenkov - 1.2.0-1 - Ver. 1.2.0 Index: rtpproxy.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-4/rtpproxy.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rtpproxy.sysconfig 27 Jan 2009 11:09:39 -0000 1.1 +++ rtpproxy.sysconfig 1 Nov 2009 14:05:58 -0000 1.2 @@ -1,2 +1,2 @@ -OPTIONS="-u rtpproxy" +OPTIONS="" Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rtpproxy/EL-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 27 Mar 2009 09:22:51 -0000 1.9 +++ sources 1 Nov 2009 14:05:58 -0000 1.10 @@ -1 +1 @@ -eb4e650ec00618a77a35f0abb91f988a rtpproxy-1.2.0.tar.gz +b0b5d6cdce3f17cdbbac473c11a2d0e5 rtpproxy-1.2.1.tar.gz --- rtpproxy--init.diff DELETED --- From musuruan at fedoraproject.org Sun Nov 1 14:25:34 2009 From: musuruan at fedoraproject.org (musuruan) Date: Sun, 1 Nov 2009 14:25:34 +0000 (UTC) Subject: rpms/libicns/devel .cvsignore, 1.5, 1.6 libicns.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <20091101142534.3771A11C00EE@cvs1.fedora.phx.redhat.com> Author: musuruan Update of /cvs/pkgs/rpms/libicns/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11736 Modified Files: .cvsignore libicns.spec sources Log Message: * Sun Nov 01 2009 Andrea Musuruane - 0.7.1-1 - Updated to new upstream 0.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libicns/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Jun 2009 15:51:08 -0000 1.5 +++ .cvsignore 1 Nov 2009 14:25:30 -0000 1.6 @@ -1 +1 @@ -libicns-0.7.0.tar.gz +libicns-0.7.1.tar.gz Index: libicns.spec =================================================================== RCS file: /cvs/pkgs/rpms/libicns/devel/libicns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- libicns.spec 23 Aug 2009 13:22:13 -0000 1.7 +++ libicns.spec 1 Nov 2009 14:25:30 -0000 1.8 @@ -1,6 +1,6 @@ Name: libicns -Version: 0.7.0 -Release: 3%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: Library for manipulating Macintosh icns files Group: System Environment/Libraries @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 01 2009 Andrea Musuruane - 0.7.1-1 +- Updated to new upstream 0.7.1 + * Sun Aug 23 2009 Andrea Musuruane - 0.7.0-3 - Updated to new upstream 0.7.0 that was released without bumping the version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libicns/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 23 Aug 2009 13:22:13 -0000 1.6 +++ sources 1 Nov 2009 14:25:31 -0000 1.7 @@ -1 +1 @@ -e2932389d10ccee20dc922155165c8f8 libicns-0.7.0.tar.gz +ff4624353a074c6cb51e41d145070e10 libicns-0.7.1.tar.gz From musuruan at fedoraproject.org Sun Nov 1 14:27:17 2009 From: musuruan at fedoraproject.org (musuruan) Date: Sun, 1 Nov 2009 14:27:17 +0000 (UTC) Subject: rpms/libicns/F-12 .cvsignore, 1.5, 1.6 libicns.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <20091101142717.42FB711C00EE@cvs1.fedora.phx.redhat.com> Author: musuruan Update of /cvs/pkgs/rpms/libicns/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12271 Modified Files: .cvsignore libicns.spec sources Log Message: * Sun Nov 01 2009 Andrea Musuruane - 0.7.1-1 - Updated to new upstream 0.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libicns/F-12/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Jun 2009 15:51:08 -0000 1.5 +++ .cvsignore 1 Nov 2009 14:27:16 -0000 1.6 @@ -1 +1 @@ -libicns-0.7.0.tar.gz +libicns-0.7.1.tar.gz Index: libicns.spec =================================================================== RCS file: /cvs/pkgs/rpms/libicns/F-12/libicns.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- libicns.spec 23 Aug 2009 13:22:13 -0000 1.7 +++ libicns.spec 1 Nov 2009 14:27:16 -0000 1.8 @@ -1,6 +1,6 @@ Name: libicns -Version: 0.7.0 -Release: 3%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: Library for manipulating Macintosh icns files Group: System Environment/Libraries @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 01 2009 Andrea Musuruane - 0.7.1-1 +- Updated to new upstream 0.7.1 + * Sun Aug 23 2009 Andrea Musuruane - 0.7.0-3 - Updated to new upstream 0.7.0 that was released without bumping the version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libicns/F-12/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 23 Aug 2009 13:22:13 -0000 1.6 +++ sources 1 Nov 2009 14:27:16 -0000 1.7 @@ -1 +1 @@ -e2932389d10ccee20dc922155165c8f8 libicns-0.7.0.tar.gz +ff4624353a074c6cb51e41d145070e10 libicns-0.7.1.tar.gz From musuruan at fedoraproject.org Sun Nov 1 14:28:47 2009 From: musuruan at fedoraproject.org (musuruan) Date: Sun, 1 Nov 2009 14:28:47 +0000 (UTC) Subject: rpms/libicns/F-11 .cvsignore, 1.5, 1.6 libicns.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <20091101142847.880AC11C00EE@cvs1.fedora.phx.redhat.com> Author: musuruan Update of /cvs/pkgs/rpms/libicns/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13002 Modified Files: .cvsignore libicns.spec sources Log Message: * Sun Nov 01 2009 Andrea Musuruane - 0.7.1-1 - Updated to new upstream 0.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libicns/F-11/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Jun 2009 15:59:10 -0000 1.5 +++ .cvsignore 1 Nov 2009 14:28:47 -0000 1.6 @@ -1 +1 @@ -libicns-0.7.0.tar.gz +libicns-0.7.1.tar.gz Index: libicns.spec =================================================================== RCS file: /cvs/pkgs/rpms/libicns/F-11/libicns.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- libicns.spec 23 Aug 2009 13:29:39 -0000 1.6 +++ libicns.spec 1 Nov 2009 14:28:47 -0000 1.7 @@ -1,6 +1,6 @@ Name: libicns -Version: 0.7.0 -Release: 3%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: Library for manipulating Macintosh icns files Group: System Environment/Libraries @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 01 2009 Andrea Musuruane - 0.7.1-1 +- Updated to new upstream 0.7.1 + * Sun Aug 23 2009 Andrea Musuruane - 0.7.0-3 - Updated to new upstream 0.7.0 that was released without bumping the version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libicns/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 23 Aug 2009 13:29:39 -0000 1.6 +++ sources 1 Nov 2009 14:28:47 -0000 1.7 @@ -1 +1 @@ -e2932389d10ccee20dc922155165c8f8 libicns-0.7.0.tar.gz +ff4624353a074c6cb51e41d145070e10 libicns-0.7.1.tar.gz From musuruan at fedoraproject.org Sun Nov 1 14:30:35 2009 From: musuruan at fedoraproject.org (musuruan) Date: Sun, 1 Nov 2009 14:30:35 +0000 (UTC) Subject: rpms/libicns/F-10 .cvsignore, 1.5, 1.6 libicns.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <20091101143035.2242811C02BC@cvs1.fedora.phx.redhat.com> Author: musuruan Update of /cvs/pkgs/rpms/libicns/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13937 Modified Files: .cvsignore libicns.spec sources Log Message: * Sun Nov 01 2009 Andrea Musuruane - 0.7.1-1 - Updated to new upstream 0.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libicns/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 13 Jun 2009 16:13:33 -0000 1.5 +++ .cvsignore 1 Nov 2009 14:30:32 -0000 1.6 @@ -1 +1 @@ -libicns-0.7.0.tar.gz +libicns-0.7.1.tar.gz Index: libicns.spec =================================================================== RCS file: /cvs/pkgs/rpms/libicns/F-10/libicns.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- libicns.spec 23 Aug 2009 13:37:00 -0000 1.5 +++ libicns.spec 1 Nov 2009 14:30:33 -0000 1.6 @@ -1,6 +1,6 @@ Name: libicns -Version: 0.7.0 -Release: 3%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: Library for manipulating Macintosh icns files Group: System Environment/Libraries @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 01 2009 Andrea Musuruane - 0.7.1-1 +- Updated to new upstream 0.7.1 + * Sun Aug 23 2009 Andrea Musuruane - 0.7.0-3 - Updated to new upstream 0.7.0 that was released without bumping the version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libicns/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 23 Aug 2009 13:37:00 -0000 1.6 +++ sources 1 Nov 2009 14:30:33 -0000 1.7 @@ -1 +1 @@ -e2932389d10ccee20dc922155165c8f8 libicns-0.7.0.tar.gz +ff4624353a074c6cb51e41d145070e10 libicns-0.7.1.tar.gz From lkundrak at fedoraproject.org Sun Nov 1 14:47:31 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Nov 2009 14:47:31 +0000 (UTC) Subject: rpms/inkscape/devel inkscape.spec,1.86,1.87 sources,1.27,1.28 Message-ID: <20091101144731.E878911C00EE@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18323 Modified Files: inkscape.spec sources Log Message: * Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre4.20091101svn - Move to a later snapshot - python-lxml and numpy seem to be rather popular, add them as hard deps Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -p -r1.86 -r1.87 --- inkscape.spec 7 Oct 2009 11:09:05 -0000 1.86 +++ inkscape.spec 1 Nov 2009 14:47:31 -0000 1.87 @@ -1,13 +1,13 @@ Name: inkscape Version: 0.47 -Release: 0.16.pre3.20091017svn%{?dist} +Release: 0.16.pre4.20091101svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ #Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape +# svn export -r22548 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22548 inkscape # tar czf inkscape.tar.gz inkscape Source0: %{name}.tar.gz @@ -84,6 +84,8 @@ Requires: uniconvertor # perl(vars) # perl(warnings) %endif +Requires: python-lxml +Requires: numpy Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -218,6 +220,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre4.20091101svn +- Move to a later snapshot +- python-lxml and numpy seem to be rather popular, add them as hard deps + * Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre3.20091017svn - Move to a later snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- sources 7 Oct 2009 11:09:06 -0000 1.27 +++ sources 1 Nov 2009 14:47:31 -0000 1.28 @@ -1 +1 @@ -b6737491add9549d5da3c1e9e9d4db1c inkscape.tar.gz +e92cc0964ccc2c2b190b6c557f8008b3 inkscape.tar.gz From lkundrak at fedoraproject.org Sun Nov 1 15:14:53 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Nov 2009 15:14:53 +0000 (UTC) Subject: rpms/inkscape/EL-5 inkscape.spec,1.42,1.43 sources,1.15,1.16 Message-ID: <20091101151453.197B011C00EE@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25440/EL-5 Modified Files: inkscape.spec sources Log Message: Merge from devel Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/EL-5/inkscape.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -p -r1.42 -r1.43 --- inkscape.spec 7 Oct 2009 12:50:43 -0000 1.42 +++ inkscape.spec 1 Nov 2009 15:14:52 -0000 1.43 @@ -1,13 +1,13 @@ Name: inkscape Version: 0.47 -Release: 0.16.pre3.20091017svn%{?dist} +Release: 0.16.pre4.20091101svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ #Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape +# svn export -r22548 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22548 inkscape # tar czf inkscape.tar.gz inkscape Source0: %{name}.tar.gz @@ -84,6 +84,8 @@ Requires: uniconvertor # perl(vars) # perl(warnings) %endif +Requires: python-lxml +Requires: numpy Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -218,6 +220,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre4.20091101svn +- Move to a later snapshot +- python-lxml and numpy seem to be rather popular, add them as hard deps + * Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre3.20091017svn - Move to a later snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/EL-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 7 Oct 2009 12:50:43 -0000 1.15 +++ sources 1 Nov 2009 15:14:52 -0000 1.16 @@ -1 +1 @@ -b6737491add9549d5da3c1e9e9d4db1c inkscape.tar.gz +e92cc0964ccc2c2b190b6c557f8008b3 inkscape.tar.gz From lkundrak at fedoraproject.org Sun Nov 1 15:14:53 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Nov 2009 15:14:53 +0000 (UTC) Subject: rpms/inkscape/F-10 inkscape.spec,1.65,1.66 sources,1.21,1.22 Message-ID: <20091101151453.9696411C00EE@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25440/F-10 Modified Files: inkscape.spec sources Log Message: Merge from devel Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-10/inkscape.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -p -r1.65 -r1.66 --- inkscape.spec 7 Oct 2009 12:50:39 -0000 1.65 +++ inkscape.spec 1 Nov 2009 15:14:52 -0000 1.66 @@ -1,13 +1,13 @@ Name: inkscape Version: 0.47 -Release: 0.16.pre3.20091017svn%{?dist} +Release: 0.16.pre4.20091101svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ #Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape +# svn export -r22548 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22548 inkscape # tar czf inkscape.tar.gz inkscape Source0: %{name}.tar.gz @@ -84,6 +84,8 @@ Requires: uniconvertor # perl(vars) # perl(warnings) %endif +Requires: python-lxml +Requires: numpy Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -218,6 +220,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre4.20091101svn +- Move to a later snapshot +- python-lxml and numpy seem to be rather popular, add them as hard deps + * Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre3.20091017svn - Move to a later snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-10/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sources 7 Oct 2009 12:50:40 -0000 1.21 +++ sources 1 Nov 2009 15:14:52 -0000 1.22 @@ -1 +1 @@ -b6737491add9549d5da3c1e9e9d4db1c inkscape.tar.gz +e92cc0964ccc2c2b190b6c557f8008b3 inkscape.tar.gz From lkundrak at fedoraproject.org Sun Nov 1 15:14:54 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Nov 2009 15:14:54 +0000 (UTC) Subject: rpms/inkscape/F-11 inkscape.spec,1.80,1.81 sources,1.28,1.29 Message-ID: <20091101151454.62BA111C00EE@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25440/F-11 Modified Files: inkscape.spec sources Log Message: Merge from devel Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-11/inkscape.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -p -r1.80 -r1.81 --- inkscape.spec 7 Oct 2009 12:50:36 -0000 1.80 +++ inkscape.spec 1 Nov 2009 15:14:53 -0000 1.81 @@ -1,13 +1,13 @@ Name: inkscape Version: 0.47 -Release: 0.16.pre3.20091017svn%{?dist} +Release: 0.16.pre4.20091101svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ #Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape +# svn export -r22548 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22548 inkscape # tar czf inkscape.tar.gz inkscape Source0: %{name}.tar.gz @@ -84,6 +84,8 @@ Requires: uniconvertor # perl(vars) # perl(warnings) %endif +Requires: python-lxml +Requires: numpy Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -218,6 +220,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre4.20091101svn +- Move to a later snapshot +- python-lxml and numpy seem to be rather popular, add them as hard deps + * Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre3.20091017svn - Move to a later snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-11/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- sources 7 Oct 2009 12:50:36 -0000 1.28 +++ sources 1 Nov 2009 15:14:53 -0000 1.29 @@ -1 +1 @@ -b6737491add9549d5da3c1e9e9d4db1c inkscape.tar.gz +e92cc0964ccc2c2b190b6c557f8008b3 inkscape.tar.gz From lkundrak at fedoraproject.org Sun Nov 1 15:16:40 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Nov 2009 15:16:40 +0000 (UTC) Subject: rpms/inkscape/F-12 inkscape.spec,1.86,1.87 sources,1.27,1.28 Message-ID: <20091101151640.EB17411C00EE@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26223 Modified Files: inkscape.spec sources Log Message: Merge from devel Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-12/inkscape.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -p -r1.86 -r1.87 --- inkscape.spec 7 Oct 2009 14:06:32 -0000 1.86 +++ inkscape.spec 1 Nov 2009 15:16:39 -0000 1.87 @@ -1,13 +1,13 @@ Name: inkscape Version: 0.47 -Release: 0.16.pre3.20091017svn%{?dist} +Release: 0.16.pre4.20091101svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ #Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape +# svn export -r22548 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22548 inkscape # tar czf inkscape.tar.gz inkscape Source0: %{name}.tar.gz @@ -84,6 +84,8 @@ Requires: uniconvertor # perl(vars) # perl(warnings) %endif +Requires: python-lxml +Requires: numpy Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -218,6 +220,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre4.20091101svn +- Move to a later snapshot +- python-lxml and numpy seem to be rather popular, add them as hard deps + * Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre3.20091017svn - Move to a later snapshot Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-12/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- sources 7 Oct 2009 14:06:32 -0000 1.27 +++ sources 1 Nov 2009 15:16:40 -0000 1.28 @@ -1 +1 @@ -b6737491add9549d5da3c1e9e9d4db1c inkscape.tar.gz +e92cc0964ccc2c2b190b6c557f8008b3 inkscape.tar.gz From till at fedoraproject.org Sun Nov 1 16:34:07 2009 From: till at fedoraproject.org (Till Maas) Date: Sun, 1 Nov 2009 16:34:07 +0000 (UTC) Subject: rpms/bindfs/EL-5 bindfs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101163407.7360011C00EE@cvs1.fedora.phx.redhat.com> Author: till Update of /cvs/pkgs/rpms/bindfs/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15423 Modified Files: .cvsignore sources Added Files: bindfs.spec Log Message: * Thu Sep 17 2009 Peter Lemenkov - 1.8.3-3 - Rebuilt with new fuse --- NEW FILE bindfs.spec --- Name: bindfs Version: 1.8.3 Release: 3%{?dist} Summary: Fuse filesystem to mirror a directory Group: System Environment/Base License: GPLv2+ URL: http://code.google.com/p/bindfs/ Source0: http://bindfs.googlecode.com/files/bindfs-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fuse-devel BuildRequires: recode %description Bindfs allows you to mirror a directory and also change the the permissions in the mirror directory. %prep %setup -q recode latin1..utf8 ChangeLog %build %configure INSTALL="%{_bindir}/install -p" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING ChangeLog README %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %changelog * Thu Sep 17 2009 Peter Lemenkov - 1.8.3-3 - Rebuilt with new fuse * Fri Jul 24 2009 Fedora Release Engineering - 1.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Apr 13 2009 Till Maas - 1.8.3-1 - Update to new upstream release * Mon Feb 23 2009 Fedora Release Engineering - 1.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Sun Dec 14 2008 Till Maas - 1.8.2-2 - Update URL and Source0 to google code * Sun Dec 14 2008 Till Maas - 1.8.2-1 - Update to new release with GPLv2+ license headers * Fri Dec 12 2008 Till Maas - 1.8.1-2 - Skip Requires: fuse - Preseve timestamp of manpage with install -p in %%configure * Fri Dec 12 2008 Till Maas - 1.8.1-1 - Update to new release * Wed Oct 29 2008 Till Maas - 1.8-2 - Convert ChangeLog to UTF8 * Wed Oct 29 2008 Till Maas - 1.8-1 - Update to new release * Fri Oct 05 2007 Till Maas - 1.3-1 - initial spec for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bindfs/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 14 Dec 2008 05:19:00 -0000 1.1 +++ .cvsignore 1 Nov 2009 16:34:05 -0000 1.2 @@ -0,0 +1 @@ +bindfs-1.8.3.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bindfs/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 14 Dec 2008 05:19:00 -0000 1.1 +++ sources 1 Nov 2009 16:34:05 -0000 1.2 @@ -0,0 +1 @@ +9ff4eafc37ce7ed4092bd6fec086e7cf bindfs-1.8.3.tar.gz From hubbitus at fedoraproject.org Sun Nov 1 16:37:42 2009 From: hubbitus at fedoraproject.org (Pavel Alexeev) Date: Sun, 1 Nov 2009 16:37:42 +0000 (UTC) Subject: rpms/x11vnc/EL-5 x11vnc.spec,1.1,1.2 Message-ID: <20091101163742.D00A411C00EE@cvs1.fedora.phx.redhat.com> Author: hubbitus Update of /cvs/pkgs/rpms/x11vnc/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16384 Modified Files: x11vnc.spec Log Message: - Noarch subpackage became only on Fedora ( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 ) - Also -javaviewers subpackage compleatly disabled on PPC arch on EL-5 because there no java-devel >= 1:1.6.0 and java-1.6.0-openjdk-devel. ( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 ) Index: x11vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/x11vnc/EL-5/x11vnc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- x11vnc.spec 20 Oct 2009 14:28:48 -0000 1.1 +++ x11vnc.spec 1 Nov 2009 16:37:42 -0000 1.2 @@ -2,7 +2,7 @@ Summary: VNC server for the current X11 Summary(ru): VNC-???????????? ?????? ?????????????? ???????????? X11 Name: x11vnc Version: 0.9.8 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2 Group: User Interface/X URL: http://www.karlrunge.com/x11vnc/ @@ -12,8 +12,6 @@ BuildRequires: libjpeg-devel, zlib-devel BuildRequires: xorg-x11-proto-devel, libXext-devel, libXtst-devel BuildRequires: libXfixes-devel, libvncserver-devel -BuildRequires: java-1.6.0-openjdk-devel - # In Fedora 12 /usr/include/X11/extensions/XInput.h in libXi-devel but in # previous versions in xorg-x11-proto-devel /usr/include/X11/extensions/shmproto.h # placed in libXext-devel in F12 and in xorg-x11-proto-devel early. @@ -51,6 +49,8 @@ versatile and productive while still eas ?? ???????????? ?? ???????????????????????????????? ????????????????????, ??????????????, ????????????, ???????????????? ???????????? ?? ??????????????????????????. +# Required java not available on EL-5.ppc +%if ! ( %{_arch}==ppc && 5 == 0%{?rhel} ) %package javaviewers Version: %{version} Summary: VNC clients (browser java applets) @@ -58,11 +58,13 @@ Summary(ru): VNC-?????????????? ?? ????? Requires: %{name} = %{version}-%{release} License: GPLv2+ Group: User Interface/X -BuildArch: noarch -BuildRequires: java-devel >= 1:1.6.0 +# EL-5 does not support noarch subpackages ( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 ) +%if 0%{?fedora} > 9 || 0%{?rhel} > 5 +BuildArch: noarch +%endif +BuildRequires: java-devel >= 1:1.6.0 java-1.6.0-openjdk-devel BuildRequires: jpackage-utils - %description javaviewers The package contains the corresponding java clients for %{name}. They can be used with any java-enabled browser and provide an easy access to @@ -74,6 +76,7 @@ Java-?????????????? ?????? ????????????? ???????????? ???? ???????? ???????????????? ?? ?????????? ?????????????????????? ??????????????????, ?????? ???????? ?????????????????? Java +%endif # EL-5.ppc %prep %setup -q @@ -99,6 +102,7 @@ find -name '*.jar' -exec rm {} \; %build %configure --with-system-libvncserver --without-tightvnc-filetransfer +%if ! ( %{_arch}==ppc && 5 == 0%{?rhel} ) # First rebuild jars, what have been removed in %%prep. pushd classes/ssl/src %{__make} %{?_smp_mflags} @@ -108,6 +112,10 @@ pushd classes/ssl/src %{__ln_s} ssl/src/$jarfile ../../; done popd +%else +%{__rm} -rf classes +sed -ri 's/(DUST_)?SUBDIRS = x11vnc classes/\1SUBDIRS = x11vnc/' Makefile +%endif %{__make} %{?_smp_mflags} @@ -115,6 +123,7 @@ popd %{__rm} -rf %{buildroot} %{__make} install DESTDIR="%{buildroot}" +%if ! ( %{_arch}==ppc && 5 == 0%{?rhel} ) # And Java viewers pushd classes/ssl %{__make} install DESTDIR="%{buildroot}" @@ -123,6 +132,7 @@ popd # Rename README file to avoid name bump %{__mv} classes/ssl/src/tight/README classes/ssl/src/tight/README.tight %{__mv} classes/ssl/src/ultra/README classes/ssl/src/ultra/README.ultra +%endif %clean %{__rm} -rf %{buildroot} @@ -134,13 +144,22 @@ popd %{_bindir}/x11vnc %{_datadir}/applications/x11vnc.desktop +%if ! ( %{_arch}==ppc && 5 == 0%{?rhel} ) %files javaviewers %defattr(-,root,root,-) %doc classes/ssl/README classes/ssl/src/tight/README.tight classes/ssl/src/ultra/README.ultra %{_datadir}/%{name} %exclude %{_datadir}/%{name}/classes/ssl/README +%endif %changelog +* Sun Nov 1 2009 Pavel Alexeev - 0.9.8-15 +- Noarch subpackage became only on Fedora + ( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 ) +- Also -javaviewers subpackage compleatly disabled on PPC arch on EL-5 because + there no java-devel >= 1:1.6.0 and java-1.6.0-openjdk-devel. + ( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 ) + * Tue Oct 6 2009 Pavel Alexeev - 0.9.8-14 - Make -javaviewers subpackage noarch. From mschwendt at fedoraproject.org Sun Nov 1 16:43:13 2009 From: mschwendt at fedoraproject.org (Michael Schwendt) Date: Sun, 1 Nov 2009 16:43:13 +0000 (UTC) Subject: rpms/audacious-plugins/F-12 audacious-plugins-2.1-playlist-scrollbar.patch, NONE, 1.1 audacious-plugins.spec, 1.58, 1.59 Message-ID: <20091101164313.C50DE11C00EE@cvs1.fedora.phx.redhat.com> Author: mschwendt Update of /cvs/pkgs/rpms/audacious-plugins/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18712 Modified Files: audacious-plugins.spec Added Files: audacious-plugins-2.1-playlist-scrollbar.patch Log Message: * Sun Nov 1 2009 Michael Schwendt - 2.1-12 - Fix playlist scrollbar page up/down click. audacious-plugins-2.1-playlist-scrollbar.patch: ui_skinned_playlist_slider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE audacious-plugins-2.1-playlist-scrollbar.patch --- diff -Nur audacious-plugins-fedora-2.1-orig/src/skins/ui_skinned_playlist_slider.c audacious-plugins-2.1-fedora-scrollbar/src/skins/ui_skinned_playlist_slider.c --- audacious-plugins-fedora-2.1-orig/src/skins/ui_skinned_playlist_slider.c 2009-07-07 00:40:36.000000000 +0200 +++ audacious-plugins-2.1-fedora-scrollbar/src/skins/ui_skinned_playlist_slider.c 2009-11-01 17:17:57.000000000 +0100 @@ -278,7 +278,7 @@ if (y < priv->prev_y) n *= -1; - ui_skinned_playlist_scroll_to (priv->list, n); + ui_skinned_playlist_scroll_to (priv->list, first + n); } ui_skinned_playlist_slider_update (widget); Index: audacious-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- audacious-plugins.spec 30 Oct 2009 10:15:55 -0000 1.58 +++ audacious-plugins.spec 1 Nov 2009 16:43:13 -0000 1.59 @@ -5,7 +5,7 @@ Name: audacious-plugins Version: 2.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Plugins for the Audacious media player Group: Applications/Multimedia URL: http://audacious-media-player.org/ @@ -31,6 +31,7 @@ Patch6: audacious-plugins-2.1-pulseaudio Patch7: audacious-plugins-2.1-modplug.patch Patch8: audacious-plugins-2.1-sndfile-playfix.patch Patch9: audacious-plugins-2.1-filewriter-dialogs.patch +Patch10: audacious-plugins-2.1-playlist-scrollbar.patch BuildRequires: audacious-devel >= %{aud_ver} BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel @@ -160,6 +161,7 @@ vortex compressed files. %patch7 -p1 -b .modplug %patch8 -p1 -b .sndfile-playfix %patch9 -p1 -b .filewriter-dialogs +%patch10 -p1 -b .playlist-scrollbar sed -i '\,^.SILENT:,d' buildsys.mk.in @@ -243,6 +245,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 1 2009 Michael Schwendt - 2.1-12 +- Fix playlist scrollbar page up/down click. + * Fri Oct 30 2009 Michael Schwendt - 2.1-11 - Fix non-top-level filewriter plugin dialogs. From belegdol at fedoraproject.org Sun Nov 1 17:16:48 2009 From: belegdol at fedoraproject.org (belegdol) Date: Sun, 1 Nov 2009 17:16:48 +0000 (UTC) Subject: rpms/gnome-subtitles/devel .cvsignore, 1.2, 1.3 gnome-subtitles.spec, 1.9, 1.10 sources, 1.2, 1.3 gnome-subtitles-0.8-smp.patch, 1.1, NONE Message-ID: <20091101171648.3F44611C00EE@cvs1.fedora.phx.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/gnome-subtitles/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27541 Modified Files: .cvsignore gnome-subtitles.spec sources Removed Files: gnome-subtitles-0.8-smp.patch Log Message: * Sun Nov 01 2009 Julian Sikorski - 0.9.1-1 - Updated to 0.9.1 - Dropped the SMP build patch - Added desktop-database scriptlets - Re-enabled parallel make - Updated the License tag - Added intltool to BuildRequires, removed explicit gettext Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 19 May 2008 19:04:29 -0000 1.2 +++ .cvsignore 1 Nov 2009 17:16:45 -0000 1.3 @@ -1 +1 @@ -gnome-subtitles-0.8.tar.gz +gnome-subtitles-0.9.1.tar.gz Index: gnome-subtitles.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/devel/gnome-subtitles.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- gnome-subtitles.spec 26 Oct 2009 20:48:40 -0000 1.9 +++ gnome-subtitles.spec 1 Nov 2009 17:16:46 -0000 1.10 @@ -1,29 +1,28 @@ Name: gnome-subtitles -Version: 0.8 -Release: 10%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Subtitle editor for Gnome Group: Applications/Multimedia -License: GPLv2+ +#Files under src/External/NCharDet are MPLv1.1 or GPLv2+ or LGPLv2+ +License: GPLv2+ and (MPLv1.1 or GPLv2+ or LGPLv2+) URL: http://gnome-subtitles.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: gnome-subtitles-0.8-smp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: gettext BuildRequires: gnome-doc-utils BuildRequires: gnome-sharp-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk2-devel BuildRequires: gtk-sharp2-devel +BuildRequires: intltool BuildRequires: mono-devel BuildRequires: perl(XML::Parser) BuildRequires: scrollkeeper -BuildRequires: sublib-devel -Requires(pre): GConf2 +Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 @@ -31,7 +30,11 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper # No mono available here. -ExcludeArch: sparc64 +ExcludeArch: sparc64 + +#sublib is now merged with gnome-subtitles +Obsoletes: sublib < 0.9-7 +Obsoletes: sublib-devel < 0.9-7 %description Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports the @@ -40,14 +43,12 @@ translation and synchronization. %prep %setup -q -%patch0 -p0 -b .smp %build %configure --disable-schemas-install \ --disable-scrollkeeper -# %{__make} %{?_smp_mflags} -%{__make} +%{__make} %{?_smp_mflags} %install @@ -79,6 +80,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +update-desktop-database &> /dev/null || : %preun @@ -91,11 +93,12 @@ fi %postun scrollkeeper-update -q || : +update-desktop-database &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING CREDITS NEWS README +%doc AUTHORS ChangeLog COPYING NEWS README %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas %{_bindir}/gnome-subtitles %{_libdir}/gnome-subtitles @@ -108,6 +111,14 @@ scrollkeeper-update -q || : %changelog +* Sun Nov 01 2009 Julian Sikorski - 0.9.1-1 +- Updated to 0.9.1 +- Dropped the SMP build patch +- Added desktop-database scriptlets +- Re-enabled parallel make +- Updated the License tag +- Added intltool to BuildRequires, removed explicit gettext + * Mon Oct 26 2009 Dennis Gilmore - 0.8-10 - ExcludeArch sparc64 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 19 May 2008 19:04:29 -0000 1.2 +++ sources 1 Nov 2009 17:16:46 -0000 1.3 @@ -1 +1 @@ -9590389ba91f9cfd94b6b36454dc2420 gnome-subtitles-0.8.tar.gz +1c5f01aaf14dbd91581b286bf92f08d7 gnome-subtitles-0.9.1.tar.gz --- gnome-subtitles-0.8-smp.patch DELETED --- From rombobeorn at fedoraproject.org Sun Nov 1 17:17:00 2009 From: rombobeorn at fedoraproject.org (=?utf-8?q?Bj=C3=B6rn_Persson?=) Date: Sun, 1 Nov 2009 17:17:00 +0000 (UTC) Subject: rpms/PragmARC/devel PragmARC.spec, NONE, 1.1 build_pragmarc.gpr, NONE, 1.1 import.log, NONE, 1.1 pragmarc.gpr, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101171700.B77BC11C00EE@cvs1.fedora.phx.redhat.com> Author: rombobeorn Update of /cvs/pkgs/rpms/PragmARC/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27630/devel Modified Files: .cvsignore sources Added Files: PragmARC.spec build_pragmarc.gpr import.log pragmarc.gpr Log Message: Initial import (#509159). --- NEW FILE PragmARC.spec --- Name: PragmARC Version: 20060427 Release: 5%{?dist} Summary: PragmAda Reusable Components, a component library for Ada Summary(sv): PragmAda Reusable Components, ett komponentbibliotek f?r ada Group: System Environment/Libraries License: GPLv2+ with exceptions URL: http://pragmada.x10hosting.com/pragmarc.htm Source1: http://pragmada.x10hosting.com/pragmarc.zip Source2: build_pragmarc.gpr Source3: pragmarc.gpr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat fedora-gnat-project-common dos2unix chrpath %description The PragmAda Reusable Components (PragmARCs) is a library of containers, algorithms and utility components for Ada, ranging from the basic-but-essential to the high-level. %description -l sv PragmAda Reusable Components (PragmARC) ?r ett bibliotek med beh?llare, algoritmer och nyttiga komponenter f?r ada. Det inneh?ller s?v?l grundl?ggande byggstenar som h?gniv?komponenter. %package devel Summary: Development files for %{name} Summary(sv): Filer f?r programmering med %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} fedora-gnat-project-common %description devel The %{name}-devel package contains source code and linking information for developing applications that use %{name}. %description devel -l sv Paketet %{name}-devel inneh?ller k?llkod och l?nkningsinformation som beh?vs f?r att utveckla program som anv?nder %{name}. %prep %setup -c -T unzip %{SOURCE1} cp -p %{SOURCE2} pragmarc.gpr %build # Prepare build target directories. mkdir --parents build_target%{_includedir}/pragmarc build_target%{_libdir}/pragmarc # Delete files that won't be used. rm compile_all.adb assertion_handler.adb # Compile the library. gnatmake -P pragmarc.gpr %{GNAT_optflags} -XPragmARC_Build_Target=build_target # Remove the unnecessary runpath that Gnatmake added. chrpath --delete build_target%{_libdir}/libpragmarc.so.%{version} # Convert line breaks. dos2unix --keepdate license.txt readme.txt arc_list.txt design.txt Test/* %install rm -rf %{buildroot} mv build_target %{buildroot} # Add the project file for projects that use this library. mkdir --parents %{buildroot}%{_GNAT_project_dir} cp -p %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc license.txt gpl.txt %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc readme.txt arc_list.txt design.txt Test %{_includedir}/* %{_libdir}/*.so %{_libdir}/pragmarc %{_GNAT_project_dir}/* %changelog * Fri Oct 30 2009 Bj?rn Persson - 20060427-5 - Removed a symlink correction that isn't needed in Fedora 11 and later. * Wed Aug 05 2009 Bj?rn Persson - 20060427-4 - Updated the URLs because the PragmAda site moved. * Thu Jul 23 2009 Bj?rn Persson - 20060427-3 - Added a BuildRoot tag even though it's unnecessary. * Thu Jul 02 2009 Bj?rn Persson - 20060427-2 - updated to require fedora-gnat-project-common * Sun Jun 28 2009 Bj?rn Persson - 20060427-1 - ready to be submitted for review --- NEW FILE build_pragmarc.gpr --- -- This project file works together with the RPM spec file to compile the -- PragmARCs into an RPM package. -- Copyright 2009 B. Persson, Bjorn at Rombobeorn.se -- -- This is free software; you can redistribute it and/or modify it under -- terms of the GNU General Public License as published by the Free Software -- Foundation; either version 2, or (at your option) any later version. with "common"; project PragmARC is Version := external("RPM_PACKAGE_VERSION"); Build_Target := external("PragmARC_Build_Target"); for Library_Name use "pragmarc"; for Library_Kind use "relocatable"; for Library_Version use "libpragmarc.so." & Version; for Library_Src_Dir use Build_Target & "/usr/include/pragmarc"; for Library_Dir use Build_Target & "/usr/" & Common.Lib; for Library_ALI_Dir use Build_Target & "/usr/" & Common.Lib & "/pragmarc"; for Library_Interface use ("PragmARC", "PragmARC.Ansi_Tty_Control", "PragmARC.Assertion_Handler", "PragmARC.Assignment", "PragmARC.Bag_Unbounded", "PragmARC.Bag_Unbounded_Unprotected", "PragmARC.Binary_Searcher", "PragmARC.Binary_Semaphore_Handler", "PragmARC.Character_Regular_Expression_Matcher", "PragmARC.Complex", "PragmARC.Date_Handler", "PragmARC.Deck_Handler", "PragmARC.Forwarder", "PragmARC.Genetic_Algorithm", "PragmARC.Get_Line", "PragmARC.Hash_Fast_Variable_Length", "PragmARC.Images", "PragmARC.Images.Image", "PragmARC.Least_Squares_Fitting", "PragmARC.Linear_Equation_Solver", "PragmARC.List_Bounded", "PragmARC.List_Bounded_Unprotected", "PragmARC.List_Unbounded", "PragmARC.List_Unbounded_Unprotected", "PragmARC.Math", "PragmARC.Math.Integer_Functions", "PragmARC.Math.Functions", "PragmARC.Matrix_Math", "PragmARC.Menu_Handler", "PragmARC.Min_Max", "PragmARC.Mixed_Case", "PragmARC.Monitor_Handler", "PragmARC.Postfix_Calculator", "PragmARC.Protected_Option", "PragmARC.Queue_Bounded", "PragmARC.Queue_Bounded_Blocking", "PragmARC.Queue_Bounded_Unprotected", "PragmARC.Queue_Unbounded", "PragmARC.Queue_Unbounded_Blocking", "PragmARC.Queue_Unbounded_Unprotected", "PragmARC.Quick_Searcher", "PragmARC.Reflection", "PragmARC.Regular_Expression_Matcher", "PragmARC.REM_NN_Wrapper", "PragmARC.Safe_Pointers", "PragmARC.Safe_Suspension_Objects", "PragmARC.Safe_Semaphore_Handler", "PragmARC.Set_Discrete", "PragmARC.Skip_List_Unbounded", "PragmARC.Skip_List_Unbounded.Put", "PragmARC.Sort_Heap", "PragmARC.Sort_Insertion", "PragmARC.Sort_Quick_In_Place", "PragmARC.Sort_Radix", "PragmARC.Stack_Unbounded", "PragmARC.Stack_Unbounded_Unprotected", "PragmARC.Three_Way", "PragmARC.Transporter_Handler", "PragmARC.Universal_Random", "PragmARC.Us_Card", "PragmARC.Us_Deck", "PragmARC.Word_Input", "PragmARC.Wrapping"); package Builder is for Default_Switches ("Ada") use ("-gnato", "-gnat95"); end Builder; end PragmARC; --- NEW FILE import.log --- PragmARC-20060427-5_fc11:HEAD:PragmARC-20060427-5.fc11.src.rpm:1257095745 --- NEW FILE pragmarc.gpr --- -- Projects that use the PragmAda Reusable Components should import this file. -- Copyright 2009 B. Persson, Bjorn at Rombobeorn.se -- -- This is free software; you can redistribute it and/or modify it under -- terms of the GNU General Public License as published by the Free Software -- Foundation; either version 2, or (at your option) any later version. with "common"; project PragmARC is for Library_Name use "pragmarc"; for Source_Dirs use ("/usr/include/pragmarc"); for Library_Dir use "/usr/" & Common.Lib; for Library_ALI_Dir use "/usr/" & Common.Lib & "/pragmarc"; for Externally_Built use "true"; end PragmARC; Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/PragmARC/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:54:48 -0000 1.1 +++ .cvsignore 1 Nov 2009 17:16:58 -0000 1.2 @@ -0,0 +1 @@ +pragmarc.zip Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PragmARC/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:54:48 -0000 1.1 +++ sources 1 Nov 2009 17:16:59 -0000 1.2 @@ -0,0 +1 @@ +40bd5bc9b5c59eb7c174b2a2e5324eeb pragmarc.zip From belegdol at fedoraproject.org Sun Nov 1 17:22:52 2009 From: belegdol at fedoraproject.org (belegdol) Date: Sun, 1 Nov 2009 17:22:52 +0000 (UTC) Subject: rpms/gnome-subtitles/F-12 .cvsignore, 1.2, 1.3 gnome-subtitles.spec, 1.9, 1.10 sources, 1.2, 1.3 gnome-subtitles-0.8-smp.patch, 1.1, NONE Message-ID: <20091101172253.15F6D11C00EE@cvs1.fedora.phx.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/gnome-subtitles/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29114 Modified Files: .cvsignore gnome-subtitles.spec sources Removed Files: gnome-subtitles-0.8-smp.patch Log Message: * Sun Nov 01 2009 Julian Sikorski - 0.9.1-1 - Updated to 0.9.1 - Dropped the SMP build patch - Added desktop-database scriptlets - Re-enabled parallel make - Updated the License tag - Added intltool to BuildRequires, removed explicit gettext Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-12/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 19 May 2008 19:04:29 -0000 1.2 +++ .cvsignore 1 Nov 2009 17:22:51 -0000 1.3 @@ -1 +1 @@ -gnome-subtitles-0.8.tar.gz +gnome-subtitles-0.9.1.tar.gz Index: gnome-subtitles.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-12/gnome-subtitles.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- gnome-subtitles.spec 26 Oct 2009 20:47:19 -0000 1.9 +++ gnome-subtitles.spec 1 Nov 2009 17:22:51 -0000 1.10 @@ -1,29 +1,28 @@ Name: gnome-subtitles -Version: 0.8 -Release: 10%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Subtitle editor for Gnome Group: Applications/Multimedia -License: GPLv2+ +#Files under src/External/NCharDet are MPLv1.1 or GPLv2+ or LGPLv2+ +License: GPLv2+ and (MPLv1.1 or GPLv2+ or LGPLv2+) URL: http://gnome-subtitles.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: gnome-subtitles-0.8-smp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: gettext BuildRequires: gnome-doc-utils BuildRequires: gnome-sharp-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk2-devel BuildRequires: gtk-sharp2-devel +BuildRequires: intltool BuildRequires: mono-devel BuildRequires: perl(XML::Parser) BuildRequires: scrollkeeper -BuildRequires: sublib-devel -Requires(pre): GConf2 +Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 @@ -31,7 +30,11 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper # No mono available here. -ExcludeArch: sparc64 +ExcludeArch: sparc64 + +#sublib is now merged with gnome-subtitles +Obsoletes: sublib < 0.9-7 +Obsoletes: sublib-devel < 0.9-7 %description Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports the @@ -40,14 +43,12 @@ translation and synchronization. %prep %setup -q -%patch0 -p0 -b .smp %build %configure --disable-schemas-install \ --disable-scrollkeeper -# %{__make} %{?_smp_mflags} -%{__make} +%{__make} %{?_smp_mflags} %install @@ -79,6 +80,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +update-desktop-database &> /dev/null || : %preun @@ -91,11 +93,12 @@ fi %postun scrollkeeper-update -q || : +update-desktop-database &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING CREDITS NEWS README +%doc AUTHORS ChangeLog COPYING NEWS README %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas %{_bindir}/gnome-subtitles %{_libdir}/gnome-subtitles @@ -108,6 +111,14 @@ scrollkeeper-update -q || : %changelog +* Sun Nov 01 2009 Julian Sikorski - 0.9.1-1 +- Updated to 0.9.1 +- Dropped the SMP build patch +- Added desktop-database scriptlets +- Re-enabled parallel make +- Updated the License tag +- Added intltool to BuildRequires, removed explicit gettext + * Mon Oct 26 2009 Dennis Gilmore - 0.8-10 - ExcludeArch sparc64 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-12/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 19 May 2008 19:04:29 -0000 1.2 +++ sources 1 Nov 2009 17:22:51 -0000 1.3 @@ -1 +1 @@ -9590389ba91f9cfd94b6b36454dc2420 gnome-subtitles-0.8.tar.gz +1c5f01aaf14dbd91581b286bf92f08d7 gnome-subtitles-0.9.1.tar.gz --- gnome-subtitles-0.8-smp.patch DELETED --- From belegdol at fedoraproject.org Sun Nov 1 17:29:05 2009 From: belegdol at fedoraproject.org (belegdol) Date: Sun, 1 Nov 2009 17:29:05 +0000 (UTC) Subject: rpms/sublib/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE sources, 1.2, NONE sublib.spec, 1.5, NONE Message-ID: <20091101172905.1DC4611C00EE@cvs1.fedora.phx.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/sublib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30690 Added Files: dead.package Removed Files: .cvsignore Makefile sources sublib.spec Log Message: sublib was merged with gnome-subtitles --- NEW FILE dead.package --- sublib was merged with gnome-subtitles --- .cvsignore DELETED --- --- Makefile DELETED --- --- sources DELETED --- --- sublib.spec DELETED --- From belegdol at fedoraproject.org Sun Nov 1 17:29:49 2009 From: belegdol at fedoraproject.org (belegdol) Date: Sun, 1 Nov 2009 17:29:49 +0000 (UTC) Subject: rpms/gnome-subtitles/F-11 .cvsignore, 1.2, 1.3 gnome-subtitles.spec, 1.8, 1.9 sources, 1.2, 1.3 gnome-subtitles-0.8-smp.patch, 1.1, NONE Message-ID: <20091101172949.7B66711C00EE@cvs1.fedora.phx.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/gnome-subtitles/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30884 Modified Files: .cvsignore gnome-subtitles.spec sources Removed Files: gnome-subtitles-0.8-smp.patch Log Message: * Sun Nov 01 2009 Julian Sikorski - 0.9.1-1 - Updated to 0.9.1 - Dropped the SMP build patch - Added desktop-database scriptlets - Re-enabled parallel make - Updated the License tag - Added intltool to BuildRequires, removed explicit gettext Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 19 May 2008 19:04:29 -0000 1.2 +++ .cvsignore 1 Nov 2009 17:29:48 -0000 1.3 @@ -1 +1 @@ -gnome-subtitles-0.8.tar.gz +gnome-subtitles-0.9.1.tar.gz Index: gnome-subtitles.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-11/gnome-subtitles.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- gnome-subtitles.spec 21 Aug 2009 00:06:48 -0000 1.8 +++ gnome-subtitles.spec 1 Nov 2009 17:29:49 -0000 1.9 @@ -1,35 +1,40 @@ Name: gnome-subtitles -Version: 0.8 -Release: 9%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Subtitle editor for Gnome Group: Applications/Multimedia -License: GPLv2+ +#Files under src/External/NCharDet are MPLv1.1 or GPLv2+ or LGPLv2+ +License: GPLv2+ and (MPLv1.1 or GPLv2+ or LGPLv2+) URL: http://gnome-subtitles.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: gnome-subtitles-0.8-smp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: gettext BuildRequires: gnome-doc-utils BuildRequires: gnome-sharp-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk2-devel BuildRequires: gtk-sharp2-devel +BuildRequires: intltool BuildRequires: mono-devel BuildRequires: perl(XML::Parser) BuildRequires: scrollkeeper -BuildRequires: sublib-devel -Requires(pre): GConf2 +Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 Requires(post): scrollkeeper Requires(postun): scrollkeeper +# No mono available here. +ExcludeArch: sparc64 + +#sublib is now merged with gnome-subtitles +Obsoletes: sublib < 0.9-7 +Obsoletes: sublib-devel < 0.9-7 %description Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports the @@ -38,14 +43,12 @@ translation and synchronization. %prep %setup -q -%patch0 -p0 -b .smp %build %configure --disable-schemas-install \ --disable-scrollkeeper -# %{__make} %{?_smp_mflags} -%{__make} +%{__make} %{?_smp_mflags} %install @@ -77,6 +80,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +update-desktop-database &> /dev/null || : %preun @@ -89,11 +93,12 @@ fi %postun scrollkeeper-update -q || : +update-desktop-database &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING CREDITS NEWS README +%doc AUTHORS ChangeLog COPYING NEWS README %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas %{_bindir}/gnome-subtitles %{_libdir}/gnome-subtitles @@ -106,6 +111,17 @@ scrollkeeper-update -q || : %changelog +* Sun Nov 01 2009 Julian Sikorski - 0.9.1-1 +- Updated to 0.9.1 +- Dropped the SMP build patch +- Added desktop-database scriptlets +- Re-enabled parallel make +- Updated the License tag +- Added intltool to BuildRequires, removed explicit gettext + +* Mon Oct 26 2009 Dennis Gilmore - 0.8-10 +- ExcludeArch sparc64 + * Fri Jul 24 2009 Fedora Release Engineering - 0.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 19 May 2008 19:04:29 -0000 1.2 +++ sources 1 Nov 2009 17:29:49 -0000 1.3 @@ -1 +1 @@ -9590389ba91f9cfd94b6b36454dc2420 gnome-subtitles-0.8.tar.gz +1c5f01aaf14dbd91581b286bf92f08d7 gnome-subtitles-0.9.1.tar.gz --- gnome-subtitles-0.8-smp.patch DELETED --- From pkgdb at fedoraproject.org Sun Nov 1 17:34:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 17:34:22 +0000 Subject: [pkgdb] sublib ownership updated Message-ID: <20091101173422.330E610F806@bastion2.fedora.phx.redhat.com> Package sublib in Fedora devel was orphaned by belegdol To make changes to this package see: /pkgdb/packages/name/sublib From pkgdb at fedoraproject.org Sun Nov 1 17:34:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 17:34:22 +0000 Subject: [pkgdb] sublib (un)retirement Message-ID: <20091101173422.499C010F872@bastion2.fedora.phx.redhat.com> Package sublib in Fedora devel has been retired by belegdol To make changes to this package see: /pkgdb/packages/name/sublib From pkgdb at fedoraproject.org Sun Nov 1 17:34:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 17:34:26 +0000 Subject: [pkgdb] sublib ownership updated Message-ID: <20091101173426.98FD210F806@bastion2.fedora.phx.redhat.com> Package sublib in Fedora 10 was orphaned by belegdol To make changes to this package see: /pkgdb/packages/name/sublib From pkgdb at fedoraproject.org Sun Nov 1 17:34:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 17:34:26 +0000 Subject: [pkgdb] sublib (un)retirement Message-ID: <20091101173426.B44A910F879@bastion2.fedora.phx.redhat.com> Package sublib in Fedora 10 has been retired by belegdol To make changes to this package see: /pkgdb/packages/name/sublib From pkgdb at fedoraproject.org Sun Nov 1 17:34:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 17:34:28 +0000 Subject: [pkgdb] sublib ownership updated Message-ID: <20091101173428.E69BC10F87B@bastion2.fedora.phx.redhat.com> Package sublib in Fedora 11 was orphaned by belegdol To make changes to this package see: /pkgdb/packages/name/sublib From pkgdb at fedoraproject.org Sun Nov 1 17:34:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 17:34:28 +0000 Subject: [pkgdb] sublib (un)retirement Message-ID: <20091101173428.EB7CA10F882@bastion2.fedora.phx.redhat.com> Package sublib in Fedora 11 has been retired by belegdol To make changes to this package see: /pkgdb/packages/name/sublib From pkgdb at fedoraproject.org Sun Nov 1 17:34:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 17:34:31 +0000 Subject: [pkgdb] sublib ownership updated Message-ID: <20091101173431.B5ACF10F806@bastion2.fedora.phx.redhat.com> Package sublib in Fedora 12 was orphaned by belegdol To make changes to this package see: /pkgdb/packages/name/sublib From pkgdb at fedoraproject.org Sun Nov 1 17:34:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 17:34:31 +0000 Subject: [pkgdb] sublib (un)retirement Message-ID: <20091101173431.BC1A410F872@bastion2.fedora.phx.redhat.com> Package sublib in Fedora 12 has been retired by belegdol To make changes to this package see: /pkgdb/packages/name/sublib From slankes at fedoraproject.org Sun Nov 1 17:36:46 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Sun, 1 Nov 2009 17:36:46 +0000 (UTC) Subject: rpms/tmux/devel import.log, NONE, 1.1 tmux-1.0-fixmanpagedir.patch, NONE, 1.1 tmux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101173646.F375111C00EE@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/tmux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32725/devel Modified Files: .cvsignore sources Added Files: import.log tmux-1.0-fixmanpagedir.patch tmux.spec Log Message: Initial import --- NEW FILE import.log --- tmux-1_0-1_fc12:HEAD:tmux-1.0-1.fc12.src.rpm:1257096939 tmux-1.0-fixmanpagedir.patch: GNUmakefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- NEW FILE tmux-1.0-fixmanpagedir.patch --- diff --git a/GNUmakefile b/GNUmakefile index 5528a9f..96e7088 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -31,6 +31,7 @@ endif endif PREFIX?= /usr/local +MANDIR?= ${PREFIX}/man INSTALLDIR= install -d INSTALLBIN= install -g bin -o root -m 555 INSTALLMAN= install -g bin -o root -m 444 @@ -59,7 +60,7 @@ clean-all: clean clean-depend install: all $(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin $(INSTALLBIN) tmux $(DESTDIR)$(PREFIX)/bin/tmux - $(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1 - $(INSTALLMAN) tmux.1 $(DESTDIR)$(PREFIX)/man/man1/tmux.1 + $(INSTALLDIR) $(DESTDIR)$(MANDIR)/man1 + $(INSTALLMAN) tmux.1 $(DESTDIR)$(MANDIR)/man1/tmux.1 -include .depend --- NEW FILE tmux.spec --- Name: tmux Version: 1.0 Release: 1%{?dist} Summary: A terminal multiplexer Group: Applications/System # Most of the source is ISC licensed; some of the files in compat/ are 2 and # 3 clause BSD licensed. License: ISC and BSD URL: http://sourceforge.net/projects/tmux Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # This first patch creates MANDIR in the GNUmakefile. This has been sent # upstream via email but upstream replied and said would not change. Patch0: tmux-1.0-fixmanpagedir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description tmux is a "terminal multiplexer." It enables a number of terminals (or windows) to be accessed and controlled from a single terminal. tmux is intended to be a simple, modern, BSD-licensed alternative to programs such as GNU Screen. %prep %setup -q %patch0 -p1 -b .fixmanpagedir %build %configure make %{?_smp_mflags} LDFLAGS="%{optflags}" %install rm -rf %{buildroot} make install PREFIX=%{_prefix} MANDIR=%{_mandir} DESTDIR=%{buildroot} INSTALLBIN="install -p -m 755" INSTALLMAN="install -p -m 644" %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc CHANGES FAQ NOTES TODO examples/ %{_bindir}/tmux %{_mandir}/man1/tmux.1.gz %changelog * Sat Oct 24 2009 Sven Lankes 1.0-1 - New upstream release * Mon Jul 13 2009 Chess Griffin 0.9-1 - Update to version 0.9. - Remove sed invocation as this was adopted upstream. - Remove optflags patch since upstream source now uses ./configure and detects the flags when passed to make. * Tue Jun 23 2009 Chess Griffin 0.8-5 - Note that souce is mostly ISC licensed with some 2 and 3 clause BSD in compat/. - Remove fixiquote.patch and instead use a sed invocation in setup. * Mon Jun 22 2009 Chess Griffin 0.8-4 - Add optimization flags by patching GNUmakefile and passing LDFLAGS to make command. - Use consistent macro format. - Change examples/* to examples/ and add TODO to docs. * Sun Jun 21 2009 Chess Griffin 0.8-3 - Remove fixperms.patch and instead pass them at make install stage. * Sat Jun 20 2009 Chess Griffin 0.8-2 - Fix Source0 URL to point to correct upstream source. - Modify fixperms.patch to set 644 permissions on the tmux.1.gz man page. - Remove wildcards from 'files' section and replace with specific paths and filenames. * Mon Jun 15 2009 Chess Griffin 0.8-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tmux/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:41:30 -0000 1.1 +++ .cvsignore 1 Nov 2009 17:36:45 -0000 1.2 @@ -0,0 +1 @@ +tmux-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tmux/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:41:30 -0000 1.1 +++ sources 1 Nov 2009 17:36:46 -0000 1.2 @@ -0,0 +1 @@ +716b12d9ea052f57d917bf2869d419df tmux-1.0.tar.gz From belegdol at fedoraproject.org Sun Nov 1 17:40:51 2009 From: belegdol at fedoraproject.org (belegdol) Date: Sun, 1 Nov 2009 17:40:51 +0000 (UTC) Subject: rpms/gnome-subtitles/F-10 .cvsignore, 1.2, 1.3 gnome-subtitles.spec, 1.6, 1.7 sources, 1.2, 1.3 gnome-subtitles-0.8-smp.patch, 1.1, NONE Message-ID: <20091101174051.0F77711C0418@cvs1.fedora.phx.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/gnome-subtitles/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1467 Modified Files: .cvsignore gnome-subtitles.spec sources Removed Files: gnome-subtitles-0.8-smp.patch Log Message: * Sun Nov 01 2009 Julian Sikorski - 0.9.1-1 - Updated to 0.9.1 - Dropped the SMP build patch - Added desktop-database scriptlets - Re-enabled parallel make - Updated the License tag - Added intltool to BuildRequires, removed explicit gettext Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 19 May 2008 19:04:29 -0000 1.2 +++ .cvsignore 1 Nov 2009 17:40:50 -0000 1.3 @@ -1 +1 @@ -gnome-subtitles-0.8.tar.gz +gnome-subtitles-0.9.1.tar.gz Index: gnome-subtitles.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-10/gnome-subtitles.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- gnome-subtitles.spec 9 Jan 2009 13:14:21 -0000 1.6 +++ gnome-subtitles.spec 1 Nov 2009 17:40:50 -0000 1.7 @@ -1,36 +1,40 @@ Name: gnome-subtitles -Version: 0.8 -Release: 6%{?dist}.1 +Version: 0.9.1 +Release: 1%{?dist} Summary: Subtitle editor for Gnome Group: Applications/Multimedia -License: GPLv2+ +#Files under src/External/NCharDet are MPLv1.1 or GPLv2+ or LGPLv2+ +License: GPLv2+ and (MPLv1.1 or GPLv2+ or LGPLv2+) URL: http://gnome-subtitles.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: gnome-subtitles-0.8-smp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: gettext BuildRequires: gnome-doc-utils BuildRequires: gnome-sharp-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk2-devel BuildRequires: gtk-sharp2-devel +BuildRequires: intltool BuildRequires: mono-devel BuildRequires: perl(XML::Parser) BuildRequires: scrollkeeper -BuildRequires: sublib-devel -Requires(pre): GConf2 +Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 Requires(post): scrollkeeper Requires(postun): scrollkeeper -ExcludeArch: ppc64 +# No mono available here. +ExcludeArch: sparc64 + +#sublib is now merged with gnome-subtitles +Obsoletes: sublib < 0.9-7 +Obsoletes: sublib-devel < 0.9-7 %description Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports the @@ -39,14 +43,12 @@ translation and synchronization. %prep %setup -q -%patch0 -p0 -b .smp %build %configure --disable-schemas-install \ --disable-scrollkeeper -# %{__make} %{?_smp_mflags} -%{__make} +%{__make} %{?_smp_mflags} %install @@ -78,6 +80,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas > /dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +update-desktop-database &> /dev/null || : %preun @@ -90,11 +93,12 @@ fi %postun scrollkeeper-update -q || : +update-desktop-database &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING CREDITS NEWS README +%doc AUTHORS ChangeLog COPYING NEWS README %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas %{_bindir}/gnome-subtitles %{_libdir}/gnome-subtitles @@ -107,8 +111,25 @@ scrollkeeper-update -q || : %changelog -* Fri Jan 9 2009 Julian Sikorski - 0.8-6.fc10.1 -- Rebuilt +* Sun Nov 01 2009 Julian Sikorski - 0.9.1-1 +- Updated to 0.9.1 +- Dropped the SMP build patch +- Added desktop-database scriptlets +- Re-enabled parallel make +- Updated the License tag +- Added intltool to BuildRequires, removed explicit gettext + +* Mon Oct 26 2009 Dennis Gilmore - 0.8-10 +- ExcludeArch sparc64 + +* Fri Jul 24 2009 Fedora Release Engineering - 0.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri May 29 2009 Xavier lamien - 0.8-8 +- Build arch ppc64. + +* Tue Feb 24 2009 Fedora Release Engineering - 0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Oct 27 2008 Tom "spot" Callaway - 0.8-6 - don't use smp_mflags Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 19 May 2008 19:04:29 -0000 1.2 +++ sources 1 Nov 2009 17:40:50 -0000 1.3 @@ -1 +1 @@ -9590389ba91f9cfd94b6b36454dc2420 gnome-subtitles-0.8.tar.gz +1c5f01aaf14dbd91581b286bf92f08d7 gnome-subtitles-0.9.1.tar.gz --- gnome-subtitles-0.8-smp.patch DELETED --- From cwickert at fedoraproject.org Sun Nov 1 17:44:24 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Nov 2009 17:44:24 +0000 (UTC) Subject: rpms/leafpad/devel .cvsignore, 1.12, 1.13 leafpad.spec, 1.28, 1.29 sources, 1.12, 1.13 Message-ID: <20091101174424.E78B111C00EE@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/leafpad/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2541 Modified Files: .cvsignore leafpad.spec sources Log Message: * Sun Nov 01 2009 Christoph Wickert - 0.8.17-1 - Update to 0.8.17 - Drop unnecessary BuildRequires for libgnomeprintui22-devel - Update icon-cache scriptlets Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/leafpad/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 10 Feb 2008 15:16:04 -0000 1.12 +++ .cvsignore 1 Nov 2009 17:44:22 -0000 1.13 @@ -1 +1 @@ -leafpad-0.8.13.tar.gz +leafpad-0.8.17.tar.gz Index: leafpad.spec =================================================================== RCS file: /cvs/pkgs/rpms/leafpad/devel/leafpad.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- leafpad.spec 25 Jul 2009 05:03:46 -0000 1.28 +++ leafpad.spec 1 Nov 2009 17:44:23 -0000 1.29 @@ -1,6 +1,6 @@ Name: leafpad -Version: 0.8.13 -Release: 3%{?dist} +Version: 0.8.17 +Release: 1%{?dist} Summary: GTK+ based simple text editor @@ -11,7 +11,7 @@ Source0: http://savannah.nongnu.o BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.4 desktop-file-utils libgnomeprintui22-devel -BuildRequires: gettext +BuildRequires: gettext Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -29,6 +29,7 @@ make %{?_smp_mflags} cat>>data/leafpad.desktop< /dev/null || : -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -63,6 +66,11 @@ touch --no-create %{_datadir}/icons/hico %{_datadir}/pixmaps/leafpad.* %changelog +* Sun Nov 01 2009 Christoph Wickert - 0.8.17-1 +- Update to 0.8.17 +- Drop unnecessary BuildRequires for libgnomeprintui22-devel +- Update icon-cache scriptlets + * Fri Jul 24 2009 Fedora Release Engineering - 0.8.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/leafpad/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 10 Feb 2008 15:16:04 -0000 1.12 +++ sources 1 Nov 2009 17:44:23 -0000 1.13 @@ -1 +1 @@ -b946964501b984e975025d510cfa39e9 leafpad-0.8.13.tar.gz +d39acdf4d31de309d484511bdc9f5924 leafpad-0.8.17.tar.gz From rombobeorn at fedoraproject.org Sun Nov 1 17:46:26 2009 From: rombobeorn at fedoraproject.org (=?utf-8?q?Bj=C3=B6rn_Persson?=) Date: Sun, 1 Nov 2009 17:46:26 +0000 (UTC) Subject: rpms/PragmARC/F-11 PragmARC.spec, NONE, 1.1 build_pragmarc.gpr, NONE, 1.1 pragmarc.gpr, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20091101174626.C191C11C00EE@cvs1.fedora.phx.redhat.com> Author: rombobeorn Update of /cvs/pkgs/rpms/PragmARC/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1342/F-11 Modified Files: sources Added Files: PragmARC.spec build_pragmarc.gpr pragmarc.gpr Log Message: Initial import to F-11 and F-12 branches (#509159). --- NEW FILE PragmARC.spec --- Name: PragmARC Version: 20060427 Release: 5%{?dist} Summary: PragmAda Reusable Components, a component library for Ada Summary(sv): PragmAda Reusable Components, ett komponentbibliotek f?r ada Group: System Environment/Libraries License: GPLv2+ with exceptions URL: http://pragmada.x10hosting.com/pragmarc.htm Source1: http://pragmada.x10hosting.com/pragmarc.zip Source2: build_pragmarc.gpr Source3: pragmarc.gpr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat fedora-gnat-project-common dos2unix chrpath %description The PragmAda Reusable Components (PragmARCs) is a library of containers, algorithms and utility components for Ada, ranging from the basic-but-essential to the high-level. %description -l sv PragmAda Reusable Components (PragmARC) ?r ett bibliotek med beh?llare, algoritmer och nyttiga komponenter f?r ada. Det inneh?ller s?v?l grundl?ggande byggstenar som h?gniv?komponenter. %package devel Summary: Development files for %{name} Summary(sv): Filer f?r programmering med %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} fedora-gnat-project-common %description devel The %{name}-devel package contains source code and linking information for developing applications that use %{name}. %description devel -l sv Paketet %{name}-devel inneh?ller k?llkod och l?nkningsinformation som beh?vs f?r att utveckla program som anv?nder %{name}. %prep %setup -c -T unzip %{SOURCE1} cp -p %{SOURCE2} pragmarc.gpr %build # Prepare build target directories. mkdir --parents build_target%{_includedir}/pragmarc build_target%{_libdir}/pragmarc # Delete files that won't be used. rm compile_all.adb assertion_handler.adb # Compile the library. gnatmake -P pragmarc.gpr %{GNAT_optflags} -XPragmARC_Build_Target=build_target # Remove the unnecessary runpath that Gnatmake added. chrpath --delete build_target%{_libdir}/libpragmarc.so.%{version} # Convert line breaks. dos2unix --keepdate license.txt readme.txt arc_list.txt design.txt Test/* %install rm -rf %{buildroot} mv build_target %{buildroot} # Add the project file for projects that use this library. mkdir --parents %{buildroot}%{_GNAT_project_dir} cp -p %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc license.txt gpl.txt %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc readme.txt arc_list.txt design.txt Test %{_includedir}/* %{_libdir}/*.so %{_libdir}/pragmarc %{_GNAT_project_dir}/* %changelog * Fri Oct 30 2009 Bj?rn Persson - 20060427-5 - Removed a symlink correction that isn't needed in Fedora 11 and later. * Wed Aug 05 2009 Bj?rn Persson - 20060427-4 - Updated the URLs because the PragmAda site moved. * Thu Jul 23 2009 Bj?rn Persson - 20060427-3 - Added a BuildRoot tag even though it's unnecessary. * Thu Jul 02 2009 Bj?rn Persson - 20060427-2 - updated to require fedora-gnat-project-common * Sun Jun 28 2009 Bj?rn Persson - 20060427-1 - ready to be submitted for review --- NEW FILE build_pragmarc.gpr --- -- This project file works together with the RPM spec file to compile the -- PragmARCs into an RPM package. -- Copyright 2009 B. Persson, Bjorn at Rombobeorn.se -- -- This is free software; you can redistribute it and/or modify it under -- terms of the GNU General Public License as published by the Free Software -- Foundation; either version 2, or (at your option) any later version. with "common"; project PragmARC is Version := external("RPM_PACKAGE_VERSION"); Build_Target := external("PragmARC_Build_Target"); for Library_Name use "pragmarc"; for Library_Kind use "relocatable"; for Library_Version use "libpragmarc.so." & Version; for Library_Src_Dir use Build_Target & "/usr/include/pragmarc"; for Library_Dir use Build_Target & "/usr/" & Common.Lib; for Library_ALI_Dir use Build_Target & "/usr/" & Common.Lib & "/pragmarc"; for Library_Interface use ("PragmARC", "PragmARC.Ansi_Tty_Control", "PragmARC.Assertion_Handler", "PragmARC.Assignment", "PragmARC.Bag_Unbounded", "PragmARC.Bag_Unbounded_Unprotected", "PragmARC.Binary_Searcher", "PragmARC.Binary_Semaphore_Handler", "PragmARC.Character_Regular_Expression_Matcher", "PragmARC.Complex", "PragmARC.Date_Handler", "PragmARC.Deck_Handler", "PragmARC.Forwarder", "PragmARC.Genetic_Algorithm", "PragmARC.Get_Line", "PragmARC.Hash_Fast_Variable_Length", "PragmARC.Images", "PragmARC.Images.Image", "PragmARC.Least_Squares_Fitting", "PragmARC.Linear_Equation_Solver", "PragmARC.List_Bounded", "PragmARC.List_Bounded_Unprotected", "PragmARC.List_Unbounded", "PragmARC.List_Unbounded_Unprotected", "PragmARC.Math", "PragmARC.Math.Integer_Functions", "PragmARC.Math.Functions", "PragmARC.Matrix_Math", "PragmARC.Menu_Handler", "PragmARC.Min_Max", "PragmARC.Mixed_Case", "PragmARC.Monitor_Handler", "PragmARC.Postfix_Calculator", "PragmARC.Protected_Option", "PragmARC.Queue_Bounded", "PragmARC.Queue_Bounded_Blocking", "PragmARC.Queue_Bounded_Unprotected", "PragmARC.Queue_Unbounded", "PragmARC.Queue_Unbounded_Blocking", "PragmARC.Queue_Unbounded_Unprotected", "PragmARC.Quick_Searcher", "PragmARC.Reflection", "PragmARC.Regular_Expression_Matcher", "PragmARC.REM_NN_Wrapper", "PragmARC.Safe_Pointers", "PragmARC.Safe_Suspension_Objects", "PragmARC.Safe_Semaphore_Handler", "PragmARC.Set_Discrete", "PragmARC.Skip_List_Unbounded", "PragmARC.Skip_List_Unbounded.Put", "PragmARC.Sort_Heap", "PragmARC.Sort_Insertion", "PragmARC.Sort_Quick_In_Place", "PragmARC.Sort_Radix", "PragmARC.Stack_Unbounded", "PragmARC.Stack_Unbounded_Unprotected", "PragmARC.Three_Way", "PragmARC.Transporter_Handler", "PragmARC.Universal_Random", "PragmARC.Us_Card", "PragmARC.Us_Deck", "PragmARC.Word_Input", "PragmARC.Wrapping"); package Builder is for Default_Switches ("Ada") use ("-gnato", "-gnat95"); end Builder; end PragmARC; --- NEW FILE pragmarc.gpr --- -- Projects that use the PragmAda Reusable Components should import this file. -- Copyright 2009 B. Persson, Bjorn at Rombobeorn.se -- -- This is free software; you can redistribute it and/or modify it under -- terms of the GNU General Public License as published by the Free Software -- Foundation; either version 2, or (at your option) any later version. with "common"; project PragmARC is for Library_Name use "pragmarc"; for Source_Dirs use ("/usr/include/pragmarc"); for Library_Dir use "/usr/" & Common.Lib; for Library_ALI_Dir use "/usr/" & Common.Lib & "/pragmarc"; for Externally_Built use "true"; end PragmARC; Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PragmARC/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:54:48 -0000 1.1 +++ sources 1 Nov 2009 17:46:26 -0000 1.2 @@ -0,0 +1 @@ +40bd5bc9b5c59eb7c174b2a2e5324eeb pragmarc.zip From rombobeorn at fedoraproject.org Sun Nov 1 17:46:28 2009 From: rombobeorn at fedoraproject.org (=?utf-8?q?Bj=C3=B6rn_Persson?=) Date: Sun, 1 Nov 2009 17:46:28 +0000 (UTC) Subject: rpms/PragmARC/F-12 PragmARC.spec, NONE, 1.1 build_pragmarc.gpr, NONE, 1.1 pragmarc.gpr, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <20091101174628.4725F11C00EE@cvs1.fedora.phx.redhat.com> Author: rombobeorn Update of /cvs/pkgs/rpms/PragmARC/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1342/F-12 Modified Files: sources Added Files: PragmARC.spec build_pragmarc.gpr pragmarc.gpr Log Message: Initial import to F-11 and F-12 branches (#509159). --- NEW FILE PragmARC.spec --- Name: PragmARC Version: 20060427 Release: 5%{?dist} Summary: PragmAda Reusable Components, a component library for Ada Summary(sv): PragmAda Reusable Components, ett komponentbibliotek f?r ada Group: System Environment/Libraries License: GPLv2+ with exceptions URL: http://pragmada.x10hosting.com/pragmarc.htm Source1: http://pragmada.x10hosting.com/pragmarc.zip Source2: build_pragmarc.gpr Source3: pragmarc.gpr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat fedora-gnat-project-common dos2unix chrpath %description The PragmAda Reusable Components (PragmARCs) is a library of containers, algorithms and utility components for Ada, ranging from the basic-but-essential to the high-level. %description -l sv PragmAda Reusable Components (PragmARC) ?r ett bibliotek med beh?llare, algoritmer och nyttiga komponenter f?r ada. Det inneh?ller s?v?l grundl?ggande byggstenar som h?gniv?komponenter. %package devel Summary: Development files for %{name} Summary(sv): Filer f?r programmering med %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} fedora-gnat-project-common %description devel The %{name}-devel package contains source code and linking information for developing applications that use %{name}. %description devel -l sv Paketet %{name}-devel inneh?ller k?llkod och l?nkningsinformation som beh?vs f?r att utveckla program som anv?nder %{name}. %prep %setup -c -T unzip %{SOURCE1} cp -p %{SOURCE2} pragmarc.gpr %build # Prepare build target directories. mkdir --parents build_target%{_includedir}/pragmarc build_target%{_libdir}/pragmarc # Delete files that won't be used. rm compile_all.adb assertion_handler.adb # Compile the library. gnatmake -P pragmarc.gpr %{GNAT_optflags} -XPragmARC_Build_Target=build_target # Remove the unnecessary runpath that Gnatmake added. chrpath --delete build_target%{_libdir}/libpragmarc.so.%{version} # Convert line breaks. dos2unix --keepdate license.txt readme.txt arc_list.txt design.txt Test/* %install rm -rf %{buildroot} mv build_target %{buildroot} # Add the project file for projects that use this library. mkdir --parents %{buildroot}%{_GNAT_project_dir} cp -p %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/ %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc license.txt gpl.txt %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc readme.txt arc_list.txt design.txt Test %{_includedir}/* %{_libdir}/*.so %{_libdir}/pragmarc %{_GNAT_project_dir}/* %changelog * Fri Oct 30 2009 Bj?rn Persson - 20060427-5 - Removed a symlink correction that isn't needed in Fedora 11 and later. * Wed Aug 05 2009 Bj?rn Persson - 20060427-4 - Updated the URLs because the PragmAda site moved. * Thu Jul 23 2009 Bj?rn Persson - 20060427-3 - Added a BuildRoot tag even though it's unnecessary. * Thu Jul 02 2009 Bj?rn Persson - 20060427-2 - updated to require fedora-gnat-project-common * Sun Jun 28 2009 Bj?rn Persson - 20060427-1 - ready to be submitted for review --- NEW FILE build_pragmarc.gpr --- -- This project file works together with the RPM spec file to compile the -- PragmARCs into an RPM package. -- Copyright 2009 B. Persson, Bjorn at Rombobeorn.se -- -- This is free software; you can redistribute it and/or modify it under -- terms of the GNU General Public License as published by the Free Software -- Foundation; either version 2, or (at your option) any later version. with "common"; project PragmARC is Version := external("RPM_PACKAGE_VERSION"); Build_Target := external("PragmARC_Build_Target"); for Library_Name use "pragmarc"; for Library_Kind use "relocatable"; for Library_Version use "libpragmarc.so." & Version; for Library_Src_Dir use Build_Target & "/usr/include/pragmarc"; for Library_Dir use Build_Target & "/usr/" & Common.Lib; for Library_ALI_Dir use Build_Target & "/usr/" & Common.Lib & "/pragmarc"; for Library_Interface use ("PragmARC", "PragmARC.Ansi_Tty_Control", "PragmARC.Assertion_Handler", "PragmARC.Assignment", "PragmARC.Bag_Unbounded", "PragmARC.Bag_Unbounded_Unprotected", "PragmARC.Binary_Searcher", "PragmARC.Binary_Semaphore_Handler", "PragmARC.Character_Regular_Expression_Matcher", "PragmARC.Complex", "PragmARC.Date_Handler", "PragmARC.Deck_Handler", "PragmARC.Forwarder", "PragmARC.Genetic_Algorithm", "PragmARC.Get_Line", "PragmARC.Hash_Fast_Variable_Length", "PragmARC.Images", "PragmARC.Images.Image", "PragmARC.Least_Squares_Fitting", "PragmARC.Linear_Equation_Solver", "PragmARC.List_Bounded", "PragmARC.List_Bounded_Unprotected", "PragmARC.List_Unbounded", "PragmARC.List_Unbounded_Unprotected", "PragmARC.Math", "PragmARC.Math.Integer_Functions", "PragmARC.Math.Functions", "PragmARC.Matrix_Math", "PragmARC.Menu_Handler", "PragmARC.Min_Max", "PragmARC.Mixed_Case", "PragmARC.Monitor_Handler", "PragmARC.Postfix_Calculator", "PragmARC.Protected_Option", "PragmARC.Queue_Bounded", "PragmARC.Queue_Bounded_Blocking", "PragmARC.Queue_Bounded_Unprotected", "PragmARC.Queue_Unbounded", "PragmARC.Queue_Unbounded_Blocking", "PragmARC.Queue_Unbounded_Unprotected", "PragmARC.Quick_Searcher", "PragmARC.Reflection", "PragmARC.Regular_Expression_Matcher", "PragmARC.REM_NN_Wrapper", "PragmARC.Safe_Pointers", "PragmARC.Safe_Suspension_Objects", "PragmARC.Safe_Semaphore_Handler", "PragmARC.Set_Discrete", "PragmARC.Skip_List_Unbounded", "PragmARC.Skip_List_Unbounded.Put", "PragmARC.Sort_Heap", "PragmARC.Sort_Insertion", "PragmARC.Sort_Quick_In_Place", "PragmARC.Sort_Radix", "PragmARC.Stack_Unbounded", "PragmARC.Stack_Unbounded_Unprotected", "PragmARC.Three_Way", "PragmARC.Transporter_Handler", "PragmARC.Universal_Random", "PragmARC.Us_Card", "PragmARC.Us_Deck", "PragmARC.Word_Input", "PragmARC.Wrapping"); package Builder is for Default_Switches ("Ada") use ("-gnato", "-gnat95"); end Builder; end PragmARC; --- NEW FILE pragmarc.gpr --- -- Projects that use the PragmAda Reusable Components should import this file. -- Copyright 2009 B. Persson, Bjorn at Rombobeorn.se -- -- This is free software; you can redistribute it and/or modify it under -- terms of the GNU General Public License as published by the Free Software -- Foundation; either version 2, or (at your option) any later version. with "common"; project PragmARC is for Library_Name use "pragmarc"; for Source_Dirs use ("/usr/include/pragmarc"); for Library_Dir use "/usr/" & Common.Lib; for Library_ALI_Dir use "/usr/" & Common.Lib & "/pragmarc"; for Externally_Built use "true"; end PragmARC; Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/PragmARC/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:54:48 -0000 1.1 +++ sources 1 Nov 2009 17:46:27 -0000 1.2 @@ -0,0 +1 @@ +40bd5bc9b5c59eb7c174b2a2e5324eeb pragmarc.zip From cwickert at fedoraproject.org Sun Nov 1 17:51:29 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Sun, 1 Nov 2009 17:51:29 +0000 (UTC) Subject: rpms/leafpad/F-12 .cvsignore, 1.12, 1.13 leafpad.spec, 1.28, 1.29 sources, 1.12, 1.13 Message-ID: <20091101175129.AF52C11C02BC@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/leafpad/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5143 Modified Files: .cvsignore leafpad.spec sources Log Message: * Sun Nov 01 2009 Christoph Wickert - 0.8.17-1 - Update to 0.8.17 - Drop unnecessary BuildRequires for libgnomeprintui22-devel - Update icon-cache scriptlets Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/leafpad/F-12/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 10 Feb 2008 15:16:04 -0000 1.12 +++ .cvsignore 1 Nov 2009 17:51:28 -0000 1.13 @@ -1 +1 @@ -leafpad-0.8.13.tar.gz +leafpad-0.8.17.tar.gz Index: leafpad.spec =================================================================== RCS file: /cvs/pkgs/rpms/leafpad/F-12/leafpad.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- leafpad.spec 25 Jul 2009 05:03:46 -0000 1.28 +++ leafpad.spec 1 Nov 2009 17:51:28 -0000 1.29 @@ -1,6 +1,6 @@ Name: leafpad -Version: 0.8.13 -Release: 3%{?dist} +Version: 0.8.17 +Release: 1%{?dist} Summary: GTK+ based simple text editor @@ -11,7 +11,7 @@ Source0: http://savannah.nongnu.o BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.4 desktop-file-utils libgnomeprintui22-devel -BuildRequires: gettext +BuildRequires: gettext Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -29,6 +29,7 @@ make %{?_smp_mflags} cat>>data/leafpad.desktop< /dev/null || : -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -63,6 +66,11 @@ touch --no-create %{_datadir}/icons/hico %{_datadir}/pixmaps/leafpad.* %changelog +* Sun Nov 01 2009 Christoph Wickert - 0.8.17-1 +- Update to 0.8.17 +- Drop unnecessary BuildRequires for libgnomeprintui22-devel +- Update icon-cache scriptlets + * Fri Jul 24 2009 Fedora Release Engineering - 0.8.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/leafpad/F-12/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 10 Feb 2008 15:16:04 -0000 1.12 +++ sources 1 Nov 2009 17:51:28 -0000 1.13 @@ -1 +1 @@ -b946964501b984e975025d510cfa39e9 leafpad-0.8.13.tar.gz +d39acdf4d31de309d484511bdc9f5924 leafpad-0.8.17.tar.gz From belegdol at fedoraproject.org Sun Nov 1 17:51:52 2009 From: belegdol at fedoraproject.org (belegdol) Date: Sun, 1 Nov 2009 17:51:52 +0000 (UTC) Subject: rpms/gnome-subtitles/F-10 gnome-subtitles.spec,1.7,1.8 Message-ID: <20091101175152.6270911C00EE@cvs1.fedora.phx.redhat.com> Author: belegdol Update of /cvs/pkgs/rpms/gnome-subtitles/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5341 Modified Files: gnome-subtitles.spec Log Message: ExcludeArch: ppc64 Index: gnome-subtitles.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-10/gnome-subtitles.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- gnome-subtitles.spec 1 Nov 2009 17:40:50 -0000 1.7 +++ gnome-subtitles.spec 1 Nov 2009 17:51:52 -0000 1.8 @@ -30,7 +30,7 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper # No mono available here. -ExcludeArch: sparc64 +ExcludeArch: ppc64 sparc64 #sublib is now merged with gnome-subtitles Obsoletes: sublib < 0.9-7 From hpejakle at fedoraproject.org Sun Nov 1 18:14:20 2009 From: hpejakle at fedoraproject.org (Jan Klepek) Date: Sun, 1 Nov 2009 18:14:20 +0000 (UTC) Subject: rpms/rubygem-ditz/F-10 rubygem-ditz.spec,1.1,1.2 Message-ID: <20091101181420.603DE11C02A5@cvs1.fedora.phx.redhat.com> Author: hpejakle Update of /cvs/pkgs/rpms/rubygem-ditz/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10998/F-10 Modified Files: rubygem-ditz.spec Log Message: fixed #532244, redundant ri doc for trollop removed Index: rubygem-ditz.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-ditz/F-10/rubygem-ditz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-ditz.spec 7 Oct 2009 15:18:02 -0000 1.1 +++ rubygem-ditz.spec 1 Nov 2009 18:14:18 -0000 1.2 @@ -5,7 +5,7 @@ Summary: A command-line issue tracker Name: rubygem-%{gemname} Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Productivity License: GPLv3+ with exceptions URL: http://ditz.rubyforge.org/ @@ -43,6 +43,7 @@ mkdir -p %{buildroot}/%{_bindir} cd %{buildroot}/%{_bindir} ln -s ../../%{gemdir}/bin/ditz ditz rm %{buildroot}/%{geminstdir}/lib/trollop.rb +rm -rf %{buildroot}/%{gemdir}/doc/%{gemname}-%{version}/ri/Trollop mkdir -p %{buildroot}/%{_mandir}/man1 cd %{buildroot}/%{_mandir}/man1 gzip %{buildroot}/%{geminstdir}/man/ditz.1 @@ -76,6 +77,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Sun Nov 01 2009 jan.klepek at hp.com - 0.5-5 +- fixed #532244, redundant ri doc for trollop removed + * Sun Oct 04 2009 Jan Klepek - 0.5-4 - moved more files into %%doc From hpejakle at fedoraproject.org Sun Nov 1 18:14:20 2009 From: hpejakle at fedoraproject.org (Jan Klepek) Date: Sun, 1 Nov 2009 18:14:20 +0000 (UTC) Subject: rpms/rubygem-ditz/devel rubygem-ditz.spec,1.1,1.2 Message-ID: <20091101181420.67F8F11C02C8@cvs1.fedora.phx.redhat.com> Author: hpejakle Update of /cvs/pkgs/rpms/rubygem-ditz/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10998/devel Modified Files: rubygem-ditz.spec Log Message: fixed #532244, redundant ri doc for trollop removed Index: rubygem-ditz.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-ditz/devel/rubygem-ditz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-ditz.spec 7 Oct 2009 15:13:46 -0000 1.1 +++ rubygem-ditz.spec 1 Nov 2009 18:14:19 -0000 1.2 @@ -5,7 +5,7 @@ Summary: A command-line issue tracker Name: rubygem-%{gemname} Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Productivity License: GPLv3+ with exceptions URL: http://ditz.rubyforge.org/ @@ -43,6 +43,7 @@ mkdir -p %{buildroot}/%{_bindir} cd %{buildroot}/%{_bindir} ln -s ../../%{gemdir}/bin/ditz ditz rm %{buildroot}/%{geminstdir}/lib/trollop.rb +rm -rf %{buildroot}/%{gemdir}/doc/%{gemname}-%{version}/ri/Trollop mkdir -p %{buildroot}/%{_mandir}/man1 cd %{buildroot}/%{_mandir}/man1 gzip %{buildroot}/%{geminstdir}/man/ditz.1 @@ -76,6 +77,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Sun Nov 01 2009 jan.klepek at hp.com - 0.5-5 +- fixed #532244, redundant ri doc for trollop removed + * Sun Oct 04 2009 Jan Klepek - 0.5-4 - moved more files into %%doc From hpejakle at fedoraproject.org Sun Nov 1 18:14:20 2009 From: hpejakle at fedoraproject.org (Jan Klepek) Date: Sun, 1 Nov 2009 18:14:20 +0000 (UTC) Subject: rpms/rubygem-ditz/F-12 rubygem-ditz.spec,1.1,1.2 Message-ID: <20091101181420.6469611C02BA@cvs1.fedora.phx.redhat.com> Author: hpejakle Update of /cvs/pkgs/rpms/rubygem-ditz/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10998/F-12 Modified Files: rubygem-ditz.spec Log Message: fixed #532244, redundant ri doc for trollop removed Index: rubygem-ditz.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-ditz/F-12/rubygem-ditz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-ditz.spec 7 Oct 2009 15:20:50 -0000 1.1 +++ rubygem-ditz.spec 1 Nov 2009 18:14:19 -0000 1.2 @@ -5,7 +5,7 @@ Summary: A command-line issue tracker Name: rubygem-%{gemname} Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Productivity License: GPLv3+ with exceptions URL: http://ditz.rubyforge.org/ @@ -43,6 +43,7 @@ mkdir -p %{buildroot}/%{_bindir} cd %{buildroot}/%{_bindir} ln -s ../../%{gemdir}/bin/ditz ditz rm %{buildroot}/%{geminstdir}/lib/trollop.rb +rm -rf %{buildroot}/%{gemdir}/doc/%{gemname}-%{version}/ri/Trollop mkdir -p %{buildroot}/%{_mandir}/man1 cd %{buildroot}/%{_mandir}/man1 gzip %{buildroot}/%{geminstdir}/man/ditz.1 @@ -76,6 +77,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Sun Nov 01 2009 jan.klepek at hp.com - 0.5-5 +- fixed #532244, redundant ri doc for trollop removed + * Sun Oct 04 2009 Jan Klepek - 0.5-4 - moved more files into %%doc From hpejakle at fedoraproject.org Sun Nov 1 18:14:20 2009 From: hpejakle at fedoraproject.org (Jan Klepek) Date: Sun, 1 Nov 2009 18:14:20 +0000 (UTC) Subject: rpms/rubygem-ditz/F-11 rubygem-ditz.spec,1.1,1.2 Message-ID: <20091101181420.5D11611C00EE@cvs1.fedora.phx.redhat.com> Author: hpejakle Update of /cvs/pkgs/rpms/rubygem-ditz/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10998/F-11 Modified Files: rubygem-ditz.spec Log Message: fixed #532244, redundant ri doc for trollop removed Index: rubygem-ditz.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-ditz/F-11/rubygem-ditz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-ditz.spec 7 Oct 2009 15:22:45 -0000 1.1 +++ rubygem-ditz.spec 1 Nov 2009 18:14:19 -0000 1.2 @@ -5,7 +5,7 @@ Summary: A command-line issue tracker Name: rubygem-%{gemname} Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Productivity License: GPLv3+ with exceptions URL: http://ditz.rubyforge.org/ @@ -43,6 +43,7 @@ mkdir -p %{buildroot}/%{_bindir} cd %{buildroot}/%{_bindir} ln -s ../../%{gemdir}/bin/ditz ditz rm %{buildroot}/%{geminstdir}/lib/trollop.rb +rm -rf %{buildroot}/%{gemdir}/doc/%{gemname}-%{version}/ri/Trollop mkdir -p %{buildroot}/%{_mandir}/man1 cd %{buildroot}/%{_mandir}/man1 gzip %{buildroot}/%{geminstdir}/man/ditz.1 @@ -76,6 +77,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Sun Nov 01 2009 jan.klepek at hp.com - 0.5-5 +- fixed #532244, redundant ri doc for trollop removed + * Sun Oct 04 2009 Jan Klepek - 0.5-4 - moved more files into %%doc From pkgdb at fedoraproject.org Sun Nov 1 18:14:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 18:14:43 +0000 Subject: [pkgdb] rubygem-nokogiri had acl change status Message-ID: <20091101181443.CABD110F880@bastion2.fedora.phx.redhat.com> mtasaka has set the watchbugzilla acl on rubygem-nokogiri (Fedora devel) to Approved for kanarip To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 18:14:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 18:14:44 +0000 Subject: [pkgdb] rubygem-nokogiri had acl change status Message-ID: <20091101181444.9A2C210F887@bastion2.fedora.phx.redhat.com> mtasaka has set the watchcommits acl on rubygem-nokogiri (Fedora devel) to Approved for kanarip To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 18:14:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 18:14:47 +0000 Subject: [pkgdb] rubygem-nokogiri had acl change status Message-ID: <20091101181447.8A7E710F806@bastion2.fedora.phx.redhat.com> mtasaka has set the commit acl on rubygem-nokogiri (Fedora devel) to Approved for kanarip To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 18:14:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 18:14:59 +0000 Subject: [pkgdb] rubygem-nokogiri had acl change status Message-ID: <20091101181500.1786B10F874@bastion2.fedora.phx.redhat.com> mtasaka has set the watchbugzilla acl on rubygem-nokogiri (Fedora 11) to Approved for kanarip To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 18:15:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 18:15:01 +0000 Subject: [pkgdb] rubygem-nokogiri had acl change status Message-ID: <20091101181501.22CD910F87D@bastion2.fedora.phx.redhat.com> mtasaka has set the watchcommits acl on rubygem-nokogiri (Fedora 11) to Approved for kanarip To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 18:15:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 18:15:03 +0000 Subject: [pkgdb] rubygem-nokogiri had acl change status Message-ID: <20091101181503.40D6610F883@bastion2.fedora.phx.redhat.com> mtasaka has set the commit acl on rubygem-nokogiri (Fedora 11) to Approved for kanarip To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 18:15:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 18:15:07 +0000 Subject: [pkgdb] rubygem-nokogiri had acl change status Message-ID: <20091101181507.924D010F87B@bastion2.fedora.phx.redhat.com> mtasaka has set the commit acl on rubygem-nokogiri (Fedora 12) to Approved for kanarip To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 18:15:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 18:15:15 +0000 Subject: [pkgdb] rubygem-nokogiri had acl change status Message-ID: <20091101181515.8257510F87B@bastion2.fedora.phx.redhat.com> mtasaka has set the watchcommits acl on rubygem-nokogiri (Fedora 12) to Approved for kanarip To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From pkgdb at fedoraproject.org Sun Nov 1 18:15:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Sun, 01 Nov 2009 18:15:18 +0000 Subject: [pkgdb] rubygem-nokogiri had acl change status Message-ID: <20091101181518.9105710F87F@bastion2.fedora.phx.redhat.com> mtasaka has set the watchbugzilla acl on rubygem-nokogiri (Fedora 12) to Approved for kanarip To make changes to this package see: /pkgdb/packages/name/rubygem-nokogiri From hpejakle at fedoraproject.org Sun Nov 1 18:18:57 2009 From: hpejakle at fedoraproject.org (Jan Klepek) Date: Sun, 1 Nov 2009 18:18:57 +0000 (UTC) Subject: rpms/rubygem-ditz/EL-5 rubygem-ditz.spec,1.1,1.2 Message-ID: <20091101181857.AF5AC11C00EE@cvs1.fedora.phx.redhat.com> Author: hpejakle Update of /cvs/pkgs/rpms/rubygem-ditz/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13020/EL-5 Modified Files: rubygem-ditz.spec Log Message: fixed #532244, redundant ri doc for trollop removed Index: rubygem-ditz.spec =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-ditz/EL-5/rubygem-ditz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- rubygem-ditz.spec 7 Oct 2009 15:16:45 -0000 1.1 +++ rubygem-ditz.spec 1 Nov 2009 18:18:55 -0000 1.2 @@ -5,7 +5,7 @@ Summary: A command-line issue tracker Name: rubygem-%{gemname} Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Productivity License: GPLv3+ with exceptions URL: http://ditz.rubyforge.org/ @@ -43,6 +43,7 @@ mkdir -p %{buildroot}/%{_bindir} cd %{buildroot}/%{_bindir} ln -s ../../%{gemdir}/bin/ditz ditz rm %{buildroot}/%{geminstdir}/lib/trollop.rb +rm -rf %{buildroot}/%{gemdir}/doc/%{gemname}-%{version}/ri/Trollop mkdir -p %{buildroot}/%{_mandir}/man1 cd %{buildroot}/%{_mandir}/man1 gzip %{buildroot}/%{geminstdir}/man/ditz.1 @@ -76,6 +77,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Sun Nov 01 2009 jan.klepek at hp.com - 0.5-5 +- fixed #532244, redundant ri doc for trollop removed + * Sun Oct 04 2009 Jan Klepek - 0.5-4 - moved more files into %%doc From slankes at fedoraproject.org Sun Nov 1 18:46:34 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Sun, 1 Nov 2009 18:46:34 +0000 (UTC) Subject: rpms/tmux/devel tmux-1.0-02_fix_wrong_location.diff, NONE, 1.1 tmux-1.0-03_proper_socket_handling.diff, NONE, 1.1 tmux-1.0-04_dropping_unnecessary_privileges.diff, NONE, 1.1 tmux-1.0-06_hardening_write_return.diff, NONE, 1.1 tmux.spec, 1.1, 1.2 tmux-1.0-fixmanpagedir.patch, 1.1, NONE Message-ID: <20091101184635.202D411C00EE@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/tmux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19858 Modified Files: tmux.spec Added Files: tmux-1.0-02_fix_wrong_location.diff tmux-1.0-03_proper_socket_handling.diff tmux-1.0-04_dropping_unnecessary_privileges.diff tmux-1.0-06_hardening_write_return.diff Removed Files: tmux-1.0-fixmanpagedir.patch Log Message: * Sun Nov 01 2009 Sven Lankes 1.0-2 - Add debian patches - Add tmux group for improved socket handling tmux-1.0-02_fix_wrong_location.diff: GNUmakefile | 8 ++++---- Makefile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE tmux-1.0-02_fix_wrong_location.diff --- # correct directory /usr/local --- a/GNUmakefile +++ b/GNUmakefile @@ -8,7 +8,7 @@ CC?= gcc CFLAGS+= -DBUILD="\"$(VERSION)\"" -LDFLAGS+= -L/usr/local/lib +LDFLAGS+= -L/usr/lib LIBS+= ifdef FDEBUG @@ -30,7 +30,7 @@ endif endif -PREFIX?= /usr/local +PREFIX?= /usr/ INSTALLDIR= install -d INSTALLBIN= install -g bin -o root -m 555 INSTALLMAN= install -g bin -o root -m 444 @@ -59,7 +59,7 @@ install: all $(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin $(INSTALLBIN) tmux $(DESTDIR)$(PREFIX)/bin/tmux - $(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1 - $(INSTALLMAN) tmux.1 $(DESTDIR)$(PREFIX)/man/man1/tmux.1 + $(INSTALLDIR) $(DESTDIR)$(PREFIX)share/man/man1 + $(INSTALLMAN) tmux.1 $(DESTDIR)$(PREFIX)share/man/man1/tmux.1 -include .depend --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ CC?= cc CFLAGS+= -DBUILD="\"$(VERSION)\"" -LDFLAGS+= -L/usr/local/lib +LDFLAGS+= -L/usr/lib LIBS+= .ifdef FDEBUG @@ -32,7 +32,7 @@ .endif .endif -PREFIX?= /usr/local +PREFIX?= /usr INSTALLDIR= install -d INSTALLBIN= install -g bin -o root -m 555 INSTALLMAN= install -g bin -o root -m 444 @@ -64,5 +64,5 @@ install: all ${INSTALLDIR} ${DESTDIR}${PREFIX}/bin ${INSTALLBIN} tmux ${DESTDIR}${PREFIX}/bin/ - ${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1 - ${INSTALLMAN} tmux.1 ${DESTDIR}${PREFIX}/man/man1/ + ${INSTALLDIR} ${DESTDIR}${PREFIX}/share/man/man1 + ${INSTALLMAN} tmux.1 ${DESTDIR}${PREFIX}/share/man/man1/ tmux-1.0-03_proper_socket_handling.diff: GNUmakefile | 2 +- Makefile | 2 +- compat.h | 2 +- tmux.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE tmux-1.0-03_proper_socket_handling.diff --- # setting /usr/bin/tmux with sgid and proper location of socket --- a/GNUmakefile +++ b/GNUmakefile @@ -32,7 +32,7 @@ PREFIX?= /usr/ INSTALLDIR= install -d -INSTALLBIN= install -g bin -o root -m 555 +INSTALLBIN= install -g utmp -o root -m 2755 INSTALLMAN= install -g bin -o root -m 444 SRCS= $(shell echo *.c|sed 's|osdep-[a-z0-9]*.c||g') --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ PREFIX?= /usr INSTALLDIR= install -d -INSTALLBIN= install -g bin -o root -m 555 +INSTALLBIN= install -g utmp -o root -m 2755 INSTALLMAN= install -g bin -o root -m 444 SRCS!= echo *.c|sed 's|osdep-[a-z0-9]*.c||g' --- a/compat.h +++ b/compat.h @@ -25,7 +25,7 @@ #ifndef HAVE_PATHS_H #define _PATH_BSHELL "/bin/sh" -#define _PATH_TMP "/tmp/" +#define _PATH_VARRUN "/var/run/" #define _PATH_DEVNULL "/dev/null" #define _PATH_TTY "/dev/tty" #define _PATH_DEV "/dev/" --- a/tmux.c +++ b/tmux.c @@ -239,7 +239,7 @@ u_int uid; uid = getuid(); - xsnprintf(base, MAXPATHLEN, "%s/tmux-%d", _PATH_TMP, uid); + xsnprintf(base, MAXPATHLEN, "%s/%s/%s-%d", _PATH_VARRUN, __progname, __progname, uid); if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST) return (NULL); tmux-1.0-04_dropping_unnecessary_privileges.diff: tmux.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- NEW FILE tmux-1.0-04_dropping_unnecessary_privileges.diff --- # using setresgid() for safely dropping utmp group membership. --- a/tmux.c +++ b/tmux.c @@ -236,9 +236,11 @@ { char base[MAXPATHLEN], *path; struct stat sb; - u_int uid; + u_int uid,gid; uid = getuid(); + gid = getgid(); + xsnprintf(base, MAXPATHLEN, "%s/%s/%s-%d", _PATH_VARRUN, __progname, __progname, uid); if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST) @@ -254,6 +256,9 @@ errno = EACCES; return (NULL); } + /* drop unnecessary privileges */ + if (setresgid(gid, gid, gid) != 0) + return (NULL); xasprintf(&path, "%s/%s", base, label); return (path); tmux-1.0-06_hardening_write_return.diff: tty.c | 12 ++++++++---- window.c | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) --- NEW FILE tmux-1.0-06_hardening_write_return.diff --- # Harden write and chdir because of ignored return value --- a/tty.c +++ b/tty.c @@ -336,7 +336,8 @@ void tty_raw(struct tty *tty, const char *s) { - write(tty->fd, s, strlen(s)); + if (write(tty->fd, s, strlen(s)) == -1) + fatal("write failed"); } void @@ -369,7 +370,8 @@ buffer_write(tty->out, s, strlen(s)); if (tty->log_fd != -1) - write(tty->log_fd, s, strlen(s)); + if (write(tty->log_fd, s, strlen(s)) == -1) + fatal("write failed"); } void @@ -394,7 +396,8 @@ } if (tty->log_fd != -1) - write(tty->log_fd, &ch, 1); + if (write(tty->log_fd, &ch, 1) == -1) + fatal("write failed"); } void @@ -407,7 +410,8 @@ break; buffer_write8(tty->out, gu->data[i]); if (tty->log_fd != -1) - write(tty->log_fd, &gu->data[i], 1); + if (write(tty->log_fd, &gu->data[i], 1) == -1) + fatal("write failed"); } width = utf8_width(gu->data); --- a/window.c +++ b/window.c @@ -490,7 +490,9 @@ return (-1); case 0: if (chdir(wp->cwd) != 0) - chdir("/"); + if (chdir("/") <0 ) + fatal("chdir failed"); + if (tcgetattr(STDIN_FILENO, &tio2) != 0) fatal("tcgetattr failed"); Index: tmux.spec =================================================================== RCS file: /cvs/pkgs/rpms/tmux/devel/tmux.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- tmux.spec 1 Nov 2009 17:36:46 -0000 1.1 +++ tmux.spec 1 Nov 2009 18:46:32 -0000 1.2 @@ -1,6 +1,6 @@ Name: tmux Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A terminal multiplexer Group: Applications/System @@ -8,10 +8,15 @@ Group: Applications/System # 3 clause BSD licensed. License: ISC and BSD URL: http://sourceforge.net/projects/tmux +Requires(pre): /usr/sbin/groupadd +Requires(preun): /usr/sbin/groupdel Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # This first patch creates MANDIR in the GNUmakefile. This has been sent # upstream via email but upstream replied and said would not change. -Patch0: tmux-1.0-fixmanpagedir.patch +Patch0: tmux-1.0-02_fix_wrong_location.diff +Patch1: tmux-1.0-03_proper_socket_handling.diff +Patch2: tmux-1.0-04_dropping_unnecessary_privileges.diff +Patch3: tmux-1.0-06_hardening_write_return.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -24,7 +29,10 @@ as GNU Screen. %prep %setup -q -%patch0 -p1 -b .fixmanpagedir +%patch0 -p1 -b .location +%patch1 -p1 -b .sockethandling +%patch2 -p1 -b .dropprivs +%patch3 -p1 -b .writehard %build %configure @@ -32,18 +40,32 @@ make %{?_smp_mflags} LDFLAGS="%{optflags %install rm -rf %{buildroot} -make install PREFIX=%{_prefix} MANDIR=%{_mandir} DESTDIR=%{buildroot} INSTALLBIN="install -p -m 755" INSTALLMAN="install -p -m 644" +make install DESTDIR=%{buildroot} INSTALLBIN="install -p -m 755" INSTALLMAN="install -p -m 644" + +# Create the socket dir +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name} %clean rm -rf %{buildroot} +%pre +%{_sbindir}/groupadd -r tmux &>/dev/null || : + +%postun +%{_sbindir}/groupdel tmux || : + %files %defattr(-,root,root,-) %doc CHANGES FAQ NOTES TODO examples/ -%{_bindir}/tmux -%{_mandir}/man1/tmux.1.gz +%attr(2755,root,tmux) %{_bindir}/tmux +%{_mandir}/man1/tmux.1.* +%attr(775,root,tmux) %{_localstatedir}/run/tmux %changelog +* Sun Nov 01 2009 Sven Lankes 1.0-2 +- Add debian patches +- Add tmux group for improved socket handling + * Sat Oct 24 2009 Sven Lankes 1.0-1 - New upstream release --- tmux-1.0-fixmanpagedir.patch DELETED --- From jcollie at fedoraproject.org Sun Nov 1 19:02:12 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Sun, 1 Nov 2009 19:02:12 +0000 (UTC) Subject: rpms/python-lxml/F-12 .cvsignore, 1.27, 1.28 python-lxml.spec, 1.37, 1.38 sources, 1.27, 1.28 Message-ID: <20091101190212.7A64211C02BC@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-lxml/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24207 Modified Files: .cvsignore python-lxml.spec sources Log Message: * Fri Oct 30 2009 Jeffrey C. Ollie - 2.2.3-1 - 2.2.3 (2009-10-30) - Bugs fixed - - * The resolve_entities option did not work in the incremental feed - parser. - * Looking up and deleting attributes without a namespace could hit a - namespaced attribute of the same name instead. - * Late errors during calls to SubElement() (e.g. attribute related - ones) could leave a partially initialised element in the tree. - * Modifying trees that contain parsed entity references could result - in an infinite loop. - * ObjectifiedElement.__setattr__ created an empty-string child element - when the attribute value was rejected as a non-unicode/non-ascii - string - * Syntax errors in lxml.cssselect could result in misleading error - messages. - * Invalid syntax in CSS expressions could lead to an infinite loop in - the parser of lxml.cssselect. - * CSS special character escapes were not properly handled in - lxml.cssselect. - * CSS Unicode escapes were not properly decoded in lxml.cssselect. - * Select options in HTML forms that had no explicit value attribute - were not handled correctly. The HTML standard dictates that their - value is defined by their text content. This is now supported by - lxml.html. - * XPath raised a TypeError when finding CDATA sections. This is now - fully supported. - * Calling help(lxml.objectify) didn't work at the prompt. - * The ElementMaker in lxml.objectify no longer defines the default - namespaces when annotation is disabled. - * Feed parser failed to honour the 'recover' option on parse errors. - * Diverting the error logging to Python's logging system was broken. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-12/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- .cvsignore 21 Jun 2009 13:23:43 -0000 1.27 +++ .cvsignore 1 Nov 2009 19:02:10 -0000 1.28 @@ -1 +1 @@ -lxml-2.2.2.tar.gz +lxml-2.2.3.tar.gz Index: python-lxml.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-12/python-lxml.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- python-lxml.spec 26 Jul 2009 20:36:26 -0000 1.37 +++ python-lxml.spec 1 Nov 2009 19:02:10 -0000 1.38 @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.2.2 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt Group: Development/Libraries @@ -49,6 +49,40 @@ rm -rf %{buildroot} %{python_sitearch}/* %changelog +* Fri Oct 30 2009 Jeffrey C. Ollie - 2.2.3-1 +- 2.2.3 (2009-10-30) +- Bugs fixed +- +- * The resolve_entities option did not work in the incremental feed +- parser. +- * Looking up and deleting attributes without a namespace could hit a +- namespaced attribute of the same name instead. +- * Late errors during calls to SubElement() (e.g. attribute related +- ones) could leave a partially initialised element in the tree. +- * Modifying trees that contain parsed entity references could result +- in an infinite loop. +- * ObjectifiedElement.__setattr__ created an empty-string child element +- when the attribute value was rejected as a non-unicode/non-ascii +- string +- * Syntax errors in lxml.cssselect could result in misleading error +- messages. +- * Invalid syntax in CSS expressions could lead to an infinite loop in +- the parser of lxml.cssselect. +- * CSS special character escapes were not properly handled in +- lxml.cssselect. +- * CSS Unicode escapes were not properly decoded in lxml.cssselect. +- * Select options in HTML forms that had no explicit value attribute +- were not handled correctly. The HTML standard dictates that their +- value is defined by their text content. This is now supported by +- lxml.html. +- * XPath raised a TypeError when finding CDATA sections. This is now +- fully supported. +- * Calling help(lxml.objectify) didn't work at the prompt. +- * The ElementMaker in lxml.objectify no longer defines the default +- namespaces when annotation is disabled. +- * Feed parser failed to honour the 'recover' option on parse errors. +- * Diverting the error logging to Python's logging system was broken. + * Sun Jul 26 2009 Fedora Release Engineering - 2.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-lxml/F-12/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- sources 21 Jun 2009 13:23:43 -0000 1.27 +++ sources 1 Nov 2009 19:02:10 -0000 1.28 @@ -1 +1 @@ -2f2fcb6aae51b5b417a3c0a6b256ec56 lxml-2.2.2.tar.gz +0b3fcd56909273b3db864133475449dc lxml-2.2.3.tar.gz From nim at fedoraproject.org Sun Nov 1 19:18:37 2009 From: nim at fedoraproject.org (nim) Date: Sun, 1 Nov 2009 19:18:37 +0000 (UTC) Subject: rpms/fontpackages/devel .cvsignore, 1.20, 1.21 fontpackages.spec, 1.26, 1.27 import.log, 1.22, 1.23 sources, 1.20, 1.21 Message-ID: <20091101191837.BEFAC11C00EE@cvs1.fedora.phx.redhat.com> Author: nim Update of /cvs/extras/rpms/fontpackages/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28282/devel Modified Files: .cvsignore fontpackages.spec import.log sources Log Message: 1.31 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- .cvsignore 29 Oct 2009 19:03:59 -0000 1.20 +++ .cvsignore 1 Nov 2009 19:18:36 -0000 1.21 @@ -1 +1 @@ -fontpackages-1.30.tar.xz +fontpackages-1.31.tar.xz Index: fontpackages.spec =================================================================== RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- fontpackages.spec 29 Oct 2009 19:04:00 -0000 1.26 +++ fontpackages.spec 1 Nov 2009 19:18:36 -0000 1.27 @@ -3,7 +3,7 @@ %global rpmmacrodir %{_sysconfdir}/rpm/ Name: fontpackages -Version: 1.30 +Version: 1.31 Release: 1%{?dist} Summary: Common directory and macro definitions used by font packages @@ -36,7 +36,7 @@ including the correct permissions for th Summary: Templates and macros used to create font packages Requires: rpmdevtools, %{name}-filesystem = %{version}-%{release} -Requires: fontconfig, rpmlint +Requires: fontconfig %description devel This package contains spec templates, rpm macros and other materials used to @@ -46,7 +46,7 @@ create font packages. %package tools Summary: Tools used to check fonts and font packages -Requires: fontforge, fontconfig, mutt +Requires: fontforge, fontconfig, mutt, rpmlint %description tools This package contains tools used to check fonts and font packages @@ -112,6 +112,10 @@ rm -fr %{buildroot} %attr(0755,root,root) %{_bindir}/* %changelog +* Sat Nov 1 2009 Nicolas Mailhot +- 1.31-1 +? Rework repo-font-audit messages based on packager feedback + * Thu Oct 29 2009 Nicolas Mailhot - 1.30-1 ? Bugfix release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- import.log 29 Oct 2009 19:04:00 -0000 1.22 +++ import.log 1 Nov 2009 19:18:36 -0000 1.23 @@ -20,3 +20,4 @@ fontpackages-1_27-1_fc12:HEAD:fontpackag fontpackages-1_28-1_fc13:HEAD:fontpackages-1.28-1.fc13.src.rpm:1255987394 fontpackages-1_29-1_fc13:HEAD:fontpackages-1.29-1.fc13.src.rpm:1256683739 fontpackages-1_30-1_fc13:HEAD:fontpackages-1.30-1.fc13.src.rpm:1256843017 +fontpackages-1_31-1_fc13:HEAD:fontpackages-1.31-1.fc13.src.rpm:1257103069 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- sources 29 Oct 2009 19:04:00 -0000 1.20 +++ sources 1 Nov 2009 19:18:36 -0000 1.21 @@ -1 +1 @@ -b480c95f0072225764f6c9d6170806f8 fontpackages-1.30.tar.xz +080c47e9ac4becd48ccd394821a7b383 fontpackages-1.31.tar.xz From nim at fedoraproject.org Sun Nov 1 19:19:54 2009 From: nim at fedoraproject.org (nim) Date: Sun, 1 Nov 2009 19:19:54 +0000 (UTC) Subject: rpms/fontpackages/F-12 .cvsignore, 1.20, 1.21 fontpackages.spec, 1.26, 1.27 import.log, 1.22, 1.23 sources, 1.20, 1.21 Message-ID: <20091101191954.95C9E11C00EE@cvs1.fedora.phx.redhat.com> Author: nim Update of /cvs/extras/rpms/fontpackages/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28777/F-12 Modified Files: .cvsignore fontpackages.spec import.log sources Log Message: 1.31 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-12/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- .cvsignore 29 Oct 2009 19:05:39 -0000 1.20 +++ .cvsignore 1 Nov 2009 19:19:52 -0000 1.21 @@ -1 +1 @@ -fontpackages-1.30.tar.xz +fontpackages-1.31.tar.xz Index: fontpackages.spec =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-12/fontpackages.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- fontpackages.spec 29 Oct 2009 19:05:39 -0000 1.26 +++ fontpackages.spec 1 Nov 2009 19:19:53 -0000 1.27 @@ -3,7 +3,7 @@ %global rpmmacrodir %{_sysconfdir}/rpm/ Name: fontpackages -Version: 1.30 +Version: 1.31 Release: 1%{?dist} Summary: Common directory and macro definitions used by font packages @@ -36,7 +36,7 @@ including the correct permissions for th Summary: Templates and macros used to create font packages Requires: rpmdevtools, %{name}-filesystem = %{version}-%{release} -Requires: fontconfig, rpmlint +Requires: fontconfig %description devel This package contains spec templates, rpm macros and other materials used to @@ -46,7 +46,7 @@ create font packages. %package tools Summary: Tools used to check fonts and font packages -Requires: fontforge, fontconfig, mutt +Requires: fontforge, fontconfig, mutt, rpmlint %description tools This package contains tools used to check fonts and font packages @@ -112,6 +112,10 @@ rm -fr %{buildroot} %attr(0755,root,root) %{_bindir}/* %changelog +* Sat Nov 1 2009 Nicolas Mailhot +- 1.31-1 +? Rework repo-font-audit messages based on packager feedback + * Thu Oct 29 2009 Nicolas Mailhot - 1.30-1 ? Bugfix release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-12/import.log,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- import.log 29 Oct 2009 19:05:39 -0000 1.22 +++ import.log 1 Nov 2009 19:19:54 -0000 1.23 @@ -20,3 +20,4 @@ fontpackages-1_27-1_fc12:HEAD:fontpackag fontpackages-1_28-1_fc13:F-12:fontpackages-1.28-1.fc13.src.rpm:1255987476 fontpackages-1_29-1_fc13:F-12:fontpackages-1.29-1.fc13.src.rpm:1256683797 fontpackages-1_30-1_fc13:F-12:fontpackages-1.30-1.fc13.src.rpm:1256843115 +fontpackages-1_31-1_fc13:F-12:fontpackages-1.31-1.fc13.src.rpm:1257103098 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-12/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- sources 29 Oct 2009 19:05:39 -0000 1.20 +++ sources 1 Nov 2009 19:19:54 -0000 1.21 @@ -1 +1 @@ -b480c95f0072225764f6c9d6170806f8 fontpackages-1.30.tar.xz +080c47e9ac4becd48ccd394821a7b383 fontpackages-1.31.tar.xz From kashyapc at fedoraproject.org Sun Nov 1 19:25:59 2009 From: kashyapc at fedoraproject.org (kashyap chamarthy) Date: Sun, 1 Nov 2009 19:25:59 +0000 (UTC) Subject: rpms/intrace/devel import.log, NONE, 1.1 intrace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091101192559.EBBE411C00EE@cvs1.fedora.phx.redhat.com> Author: kashyapc Update of /cvs/pkgs/rpms/intrace/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30844/devel Modified Files: .cvsignore sources Added Files: import.log intrace.spec Log Message: initial commit --- NEW FILE import.log --- intrace-1_4_3-2_fc12:HEAD:intrace-1.4.3-2.fc12.src.rpm:1257103308 --- NEW FILE intrace.spec --- Name: intrace Version: 1.4.3 Release: 2%{?dist} Summary: Traceroute-like application for network reconnaisance Group: Applications/Internet License: GPLv2+ URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description InTrace is a traceroute-like application that enables users to enumerate IP hops exploiting existing TCP connections, both initiated from local network (local system) or from remote hosts. It could be useful for network reconnaissance and firewall bypassing %prep %setup -q -n %{name}-%{version} sed -i 's|-O3|%{optflags}|g' Makefile %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir}/ install -p %{name} $RPM_BUILD_ROOT/%{_bindir}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README LICENSE.GPLv2 LICENSE.GPLv3 %{_bindir}/%{name} %changelog * Tue Oct 27 2009 Kashyap Chamarthy - 1.4.3-2 - Add Fedora optflags for compilation * Wed Sep 30 2009 Kashyap Chamarthy - 1.4.3-1 - New upstream version with License text in source files and rewritten sender.c - See comments #8 and #9 in https://bugzilla.redhat.com/show_bug.cgi?id=524386 * Sat Sep 19 2009 Kashyap Chamarthy - 1.4.2-2 - Changes made to spec as per comment in Bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=524386#c2 * Sat Sep 19 2009 Kashyap Chamarthy - 1.4.2-1 - Initial spec file Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/intrace/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:46:46 -0000 1.1 +++ .cvsignore 1 Nov 2009 19:25:59 -0000 1.2 @@ -0,0 +1 @@ +intrace-1.4.3.tgz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/intrace/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:46:46 -0000 1.1 +++ sources 1 Nov 2009 19:25:59 -0000 1.2 @@ -0,0 +1 @@ +7cc6e6b2678c45549c5de8c98968bf18 intrace-1.4.3.tgz From s4504kr at fedoraproject.org Sun Nov 1 19:29:08 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Sun, 1 Nov 2009 19:29:08 +0000 (UTC) Subject: rpms/stellarium/devel stellarium.spec,1.61,1.62 Message-ID: <20091101192909.AF1BB11C00EE@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32030 Modified Files: stellarium.spec Log Message: Remove symlink to font files Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- stellarium.spec 24 Sep 2009 20:43:01 -0000 1.61 +++ stellarium.spec 1 Nov 2009 19:29:08 -0000 1.62 @@ -2,7 +2,7 @@ Name: stellarium Version: 0.10.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -81,10 +81,6 @@ cp %{SOURCE2} $RPM_BUILD_DIR/stellarium- ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper -( cd $RPM_BUILD_ROOT%{_datadir}/stellarium/data; - ln -sf ../../fonts/dejavu/DejaVuSans.ttf DejaVuSans.ttf; - ln -sf ../../fonts/dejavu/DejaVuSansMono.ttf DeJaVuSansMono.ttf; ) - %find_lang %{name} %find_lang %{name}-skycultures cat %{name}-skycultures.lang >>%{name}.lang @@ -107,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING stellarium_user_guide-%{guidever}.pdf %changelog +* Sun Nov 1 2009 Jochen Schmitt 0.10.2-6 +- Remove symlink to font files + * Thu Sep 24 2009 Jochen Schmitt 0.10.2-5 - Updated program documentation (#525302) From kashyapc at fedoraproject.org Sun Nov 1 19:48:47 2009 From: kashyapc at fedoraproject.org (kashyap chamarthy) Date: Sun, 1 Nov 2009 19:48:47 +0000 (UTC) Subject: rpms/intrace/F-12 intrace.spec,NONE,1.1 sources,1.1,1.2 Message-ID: <20091101194847.8923A11C00EE@cvs1.fedora.phx.redhat.com> Author: kashyapc Update of /cvs/pkgs/rpms/intrace/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4407 Modified Files: sources Added Files: intrace.spec Log Message: initial commit --- NEW FILE intrace.spec --- Name: intrace Version: 1.4.3 Release: 2%{?dist} Summary: Traceroute-like application for network reconnaisance Group: Applications/Internet License: GPLv2+ URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description InTrace is a traceroute-like application that enables users to enumerate IP hops exploiting existing TCP connections, both initiated from local network (local system) or from remote hosts. It could be useful for network reconnaissance and firewall bypassing %prep %setup -q -n %{name}-%{version} sed -i 's|-O3|%{optflags}|g' Makefile %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir}/ install -p %{name} $RPM_BUILD_ROOT/%{_bindir}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README LICENSE.GPLv2 LICENSE.GPLv3 %{_bindir}/%{name} %changelog * Tue Oct 27 2009 Kashyap Chamarthy - 1.4.3-2 - Add Fedora optflags for compilation * Wed Sep 30 2009 Kashyap Chamarthy - 1.4.3-1 - New upstream version with License text in source files and rewritten sender.c - See comments #8 and #9 in https://bugzilla.redhat.com/show_bug.cgi?id=524386 * Sat Sep 19 2009 Kashyap Chamarthy - 1.4.2-2 - Changes made to spec as per comment in Bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=524386#c2 * Sat Sep 19 2009 Kashyap Chamarthy - 1.4.2-1 - Initial spec file Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/intrace/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:46:46 -0000 1.1 +++ sources 1 Nov 2009 19:48:46 -0000 1.2 @@ -0,0 +1 @@ +7cc6e6b2678c45549c5de8c98968bf18 intrace-1.4.3.tgz From mclasen at fedoraproject.org Sun Nov 1 19:48:54 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Sun, 1 Nov 2009 19:48:54 +0000 (UTC) Subject: rpms/nautilus-actions/F-12 .cvsignore, 1.11, 1.12 nautilus-actions.spec, 1.27, 1.28 sources, 1.11, 1.12 Message-ID: <20091101194854.D9A2E11C00EE@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/nautilus-actions/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3802 Modified Files: .cvsignore nautilus-actions.spec sources Log Message: 1.12.2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-actions/F-12/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 13 Aug 2009 04:52:55 -0000 1.11 +++ .cvsignore 1 Nov 2009 19:48:53 -0000 1.12 @@ -1 +1 @@ -nautilus-actions-1.12.0.tar.gz +nautilus-actions-1.12.2.tar.bz2 Index: nautilus-actions.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-actions/F-12/nautilus-actions.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- nautilus-actions.spec 14 Aug 2009 01:30:35 -0000 1.27 +++ nautilus-actions.spec 1 Nov 2009 19:48:53 -0000 1.28 @@ -1,11 +1,11 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions -Version: 1.12.0 +Version: 1.12.2 Release: 1%{?dist} Group: User Interface/Desktops License: GPLv2+ URL: http://www.grumz.net/node/8 -Source0: http://download.gnome.org/sources/%{name}/1.12/%{name}-%{version}.tar.gz +Source0: http://download.gnome.org/sources/%{name}/1.12/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel, libglade2-devel, nautilus-devel BuildRequires: libuuid-devel, unique-devel, gettext, perl(XML::Parser) @@ -69,6 +69,10 @@ gtk-update-icon-cache %{_datadir}/icons/ %{_datadir}/applications/fedora-nact.desktop %changelog +* Sun Nov 1 2009 Matthias Clasen - 1.12.2-1 +- Update to 1.12.2 +- Makes nautilus-actions-config-tool start again + * Wed Aug 12 2009 Deji Akingunola - 1.12.0-1 - Update to 1.12.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-actions/F-12/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 13 Aug 2009 04:52:55 -0000 1.11 +++ sources 1 Nov 2009 19:48:53 -0000 1.12 @@ -1 +1 @@ -901f0c75419d9b7ca2a18ac4ed695323 nautilus-actions-1.12.0.tar.gz +aaec0ad0feae67c8e876edc105558b4e nautilus-actions-1.12.2.tar.bz2 From slankes at fedoraproject.org Sun Nov 1 19:53:17 2009 From: slankes at fedoraproject.org (Sven Lankes) Date: Sun, 1 Nov 2009 19:53:17 +0000 (UTC) Subject: rpms/tmux/devel tmux.spec,1.2,1.3 Message-ID: <20091101195318.01A1411C02A2@cvs1.fedora.phx.redhat.com> Author: slankes Update of /cvs/pkgs/rpms/tmux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5768 Modified Files: tmux.spec Log Message: Adjust group handling to match the guidelines Index: tmux.spec =================================================================== RCS file: /cvs/pkgs/rpms/tmux/devel/tmux.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- tmux.spec 1 Nov 2009 18:46:32 -0000 1.2 +++ tmux.spec 1 Nov 2009 19:53:17 -0000 1.3 @@ -8,8 +8,7 @@ Group: Applications/System # 3 clause BSD licensed. License: ISC and BSD URL: http://sourceforge.net/projects/tmux -Requires(pre): /usr/sbin/groupadd -Requires(preun): /usr/sbin/groupdel +Requires(pre): shadow-utils Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # This first patch creates MANDIR in the GNUmakefile. This has been sent # upstream via email but upstream replied and said would not change. @@ -49,10 +48,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir rm -rf %{buildroot} %pre -%{_sbindir}/groupadd -r tmux &>/dev/null || : - -%postun -%{_sbindir}/groupdel tmux || : +getent group tmux >/dev/null || groupadd -r tmux %files %defattr(-,root,root,-) From s4504kr at fedoraproject.org Sun Nov 1 19:54:35 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Sun, 1 Nov 2009 19:54:35 +0000 (UTC) Subject: rpms/stellarium/F-12 stellarium.spec,1.61,1.62 Message-ID: <20091101195435.24E6411C0337@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6144 Modified Files: stellarium.spec Log Message: Remove symlink to font files Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/F-12/stellarium.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- stellarium.spec 24 Sep 2009 20:43:01 -0000 1.61 +++ stellarium.spec 1 Nov 2009 19:54:34 -0000 1.62 @@ -2,7 +2,7 @@ Name: stellarium Version: 0.10.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -81,10 +81,6 @@ cp %{SOURCE2} $RPM_BUILD_DIR/stellarium- ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper -( cd $RPM_BUILD_ROOT%{_datadir}/stellarium/data; - ln -sf ../../fonts/dejavu/DejaVuSans.ttf DejaVuSans.ttf; - ln -sf ../../fonts/dejavu/DejaVuSansMono.ttf DeJaVuSansMono.ttf; ) - %find_lang %{name} %find_lang %{name}-skycultures cat %{name}-skycultures.lang >>%{name}.lang @@ -107,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING stellarium_user_guide-%{guidever}.pdf %changelog +* Sun Nov 1 2009 Jochen Schmitt 0.10.2-6 +- Remove symlink to font files + * Thu Sep 24 2009 Jochen Schmitt 0.10.2-5 - Updated program documentation (#525302) From s4504kr at fedoraproject.org Sun Nov 1 19:56:27 2009 From: s4504kr at fedoraproject.org (Jochen Schmitt) Date: Sun, 1 Nov 2009 19:56:27 +0000 (UTC) Subject: rpms/stellarium/F-12 stellarium.spec,1.62,1.63 Message-ID: <20091101195627.8305011C00EE@cvs1.fedora.phx.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6699 Modified Files: stellarium.spec Log Message: Remove symlink to font files Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/F-12/stellarium.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- stellarium.spec 1 Nov 2009 19:54:34 -0000 1.62 +++ stellarium.spec 1 Nov 2009 19:56:27 -0000 1.63 @@ -2,7 +2,7 @@ Name: stellarium Version: 0.10.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -103,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING stellarium_user_guide-%{guidever}.pdf %changelog -* Sun Nov 1 2009 Jochen Schmitt 0.10.2-6 +* Sun Nov 1 2009 Jochen Schmitt 0.10.2-7 - Remove symlink to font files * Thu Sep 24 2009 Jochen Schmitt 0.10.2-5 From uwog at fedoraproject.org Sun Nov 1 20:22:34 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Sun, 1 Nov 2009 20:22:34 +0000 (UTC) Subject: rpms/abiword/devel .cvsignore, 1.31, 1.32 abiword.spec, 1.96, 1.97 sources, 1.31, 1.32 Message-ID: <20091101202234.A771211C02A2@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13351/devel Modified Files: .cvsignore abiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- .cvsignore 29 Aug 2009 10:27:35 -0000 1.31 +++ .cvsignore 1 Nov 2009 20:22:30 -0000 1.32 @@ -1,2 +1 @@ -abiword-2.7.10.tar.gz -abiword-docs-2.7.10.tar.gz +abiword-2.8.1.tar.gz Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -p -r1.96 -r1.97 --- abiword.spec 1 Sep 2009 12:21:09 -0000 1.96 +++ abiword.spec 1 Nov 2009 20:22:30 -0000 1.97 @@ -1,13 +1,13 @@ %define majorversion 2 -%define minorversion 7 -%define microversion 10 +%define minorversion 8 +%define microversion 1 %define olpc_build 0 Summary: The AbiWord word processor Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -57,7 +57,6 @@ BuildRequires: libwmf-devel BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel BuildRequires: link-grammar-devel >= 4.2.2 BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison -#BuildRequires: goffice04-devel BuildRequires: loudmouth-devel BuildRequires: asio-devel BuildRequires: libsoup-devel @@ -178,6 +177,9 @@ update-desktop-database %{_datadir}/appl %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Sun Nov 01 2009 Marc Maurer - 1:2.8.1-1 +- New upstream release + * Tue Sep 01 2009 Marc Maurer - 1:2.7.10-2 - Unconditionally add the dbus-glib-devel BR since the AbiCollab Sugar backend is now always compiled in, even on non-OLPC Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- sources 29 Aug 2009 10:27:35 -0000 1.31 +++ sources 1 Nov 2009 20:22:30 -0000 1.32 @@ -1,2 +1 @@ -d6d38074caaee3e92ac5e7fa0e357b51 abiword-2.7.10.tar.gz -4474020698070433e2f97fddbbdf7dd1 abiword-docs-2.7.10.tar.gz +284fe25289c160c3797b527a8aacad12 abiword-2.8.1.tar.gz From uwog at fedoraproject.org Sun Nov 1 20:28:52 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Sun, 1 Nov 2009 20:28:52 +0000 (UTC) Subject: rpms/abiword/devel .cvsignore, 1.32, 1.33 abiword.spec, 1.97, 1.98 sources, 1.32, 1.33 Message-ID: <20091101202852.2650F11C00EE@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15178 Modified Files: .cvsignore abiword.spec sources Log Message: Include documentation tarball Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- .cvsignore 1 Nov 2009 20:22:30 -0000 1.32 +++ .cvsignore 1 Nov 2009 20:28:49 -0000 1.33 @@ -1 +1,2 @@ abiword-2.8.1.tar.gz +abiword-docs-2.8.1.tar.gz Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -p -r1.97 -r1.98 --- abiword.spec 1 Nov 2009 20:22:30 -0000 1.97 +++ abiword.spec 1 Nov 2009 20:28:50 -0000 1.98 @@ -7,7 +7,7 @@ Summary: The AbiWord word processor Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -177,6 +177,9 @@ update-desktop-database %{_datadir}/appl %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Sun Nov 01 2009 Marc Maurer - 1:2.8.1-2 +- Rebuild + * Sun Nov 01 2009 Marc Maurer - 1:2.8.1-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abiword/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- sources 1 Nov 2009 20:22:30 -0000 1.32 +++ sources 1 Nov 2009 20:28:50 -0000 1.33 @@ -1 +1,2 @@ 284fe25289c160c3797b527a8aacad12 abiword-2.8.1.tar.gz +6a6d8260004280687b862e3b9777c338 abiword-docs-2.8.1.tar.gz From uwog at fedoraproject.org Sun Nov 1 20:59:19 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Sun, 1 Nov 2009 20:59:19 +0000 (UTC) Subject: rpms/pyabiword/devel .cvsignore, 1.6, 1.7 pyabiword.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20091101205919.CA28711C00EE@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23944 Modified Files: .cvsignore pyabiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 2 Aug 2009 17:21:32 -0000 1.6 +++ .cvsignore 1 Nov 2009 20:59:16 -0000 1.7 @@ -1 +1 @@ -pyabiword-0.7.8.tar.gz +pyabiword-0.8.0.tar.gz Index: pyabiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/pyabiword.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- pyabiword.spec 2 Aug 2009 17:21:32 -0000 1.8 +++ pyabiword.spec 1 Nov 2009 20:59:16 -0000 1.9 @@ -1,10 +1,10 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define abiword_api_version 2.7.6 +%define abiword_api_version 2.8 Summary: Python bindings for libabiword Name: pyabiword -Version: 0.7.8 +Version: 0.8.0 Release: 1%{?dist} Source0: pyabiword-%{version}.tar.gz URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz @@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pygtk/2.0/defs/pyabiword.defs %changelog +* Sun Nov 01 2009 Marc Maurer - 0.8.0-1 +- New upstream release + * Sun Aug 02 2009 Marc Maurer - 0.7.8-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 2 Aug 2009 17:21:32 -0000 1.6 +++ sources 1 Nov 2009 20:59:17 -0000 1.7 @@ -1 +1 @@ -bf51daf144f1b123a671c9baaa50b96c pyabiword-0.7.8.tar.gz +826ea3e4cdcdd11906ce8739d07e6c26 pyabiword-0.8.0.tar.gz From devrim at fedoraproject.org Sun Nov 1 21:44:46 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Nov 2009 21:44:46 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/F-10 postgresql-pgpool-II.spec,1.28,1.29 Message-ID: <20091101214446.D4B7811C00EE@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3275/F-10 Modified Files: postgresql-pgpool-II.spec Log Message: Remove init script from all runlevels before uninstall. Per RH Bugzilla #532177 Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/postgresql-pgpool-II.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- postgresql-pgpool-II.spec 4 Oct 2009 10:39:39 -0000 1.28 +++ postgresql-pgpool-II.spec 1 Nov 2009 21:44:45 -0000 1.29 @@ -3,7 +3,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 2.2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.projects.PostgreSQL.org @@ -74,6 +74,12 @@ rm -rf %{buildroot} /sbin/ldconfig chkconfig --add pgpool +%preun +if [ $1 = 0 ] ; then + /sbin/service pgpool condstop >/dev/null 2>&1 + chkconfig --del pgpool +fi + %postun -p /sbin/ldconfig %files @@ -106,6 +112,10 @@ chkconfig --add pgpool %{_libdir}/libpcp.so %changelog +* Sun Nov 01 2009 Devrim GUNDUZ - 2.2.5-2 +- Remove init script from all runlevels before uninstall. Per RH Bugzilla + #532177 + * Sun Oct 4 2009 Devrim Gunduz 2.2.5-1 - Update to 2.2.5, for various fixes described at http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html From devrim at fedoraproject.org Sun Nov 1 21:44:46 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Nov 2009 21:44:46 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/EL-5 postgresql-pgpool-II.spec,1.16,1.17 Message-ID: <20091101214446.EECF311C0267@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3275/EL-5 Modified Files: postgresql-pgpool-II.spec Log Message: Remove init script from all runlevels before uninstall. Per RH Bugzilla #532177 Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/postgresql-pgpool-II.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- postgresql-pgpool-II.spec 4 Oct 2009 10:39:39 -0000 1.16 +++ postgresql-pgpool-II.spec 1 Nov 2009 21:44:45 -0000 1.17 @@ -3,7 +3,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 2.2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.projects.PostgreSQL.org @@ -74,6 +74,12 @@ rm -rf %{buildroot} /sbin/ldconfig chkconfig --add pgpool +%preun +if [ $1 = 0 ] ; then + /sbin/service pgpool condstop >/dev/null 2>&1 + chkconfig --del pgpool +fi + %postun -p /sbin/ldconfig %files @@ -106,6 +112,10 @@ chkconfig --add pgpool %{_libdir}/libpcp.so %changelog +* Sun Nov 01 2009 Devrim GUNDUZ - 2.2.5-2 +- Remove init script from all runlevels before uninstall. Per RH Bugzilla + #532177 + * Sun Oct 4 2009 Devrim Gunduz 2.2.5-1 - Update to 2.2.5, for various fixes described at http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html From devrim at fedoraproject.org Sun Nov 1 21:44:47 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Nov 2009 21:44:47 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/F-12 postgresql-pgpool-II.spec,1.36,1.37 Message-ID: <20091101214447.7549411C00EE@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3275/F-12 Modified Files: postgresql-pgpool-II.spec Log Message: Remove init script from all runlevels before uninstall. Per RH Bugzilla #532177 Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/postgresql-pgpool-II.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- postgresql-pgpool-II.spec 4 Oct 2009 10:39:40 -0000 1.36 +++ postgresql-pgpool-II.spec 1 Nov 2009 21:44:46 -0000 1.37 @@ -3,7 +3,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 2.2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.projects.PostgreSQL.org @@ -74,6 +74,12 @@ rm -rf %{buildroot} /sbin/ldconfig chkconfig --add pgpool +%preun +if [ $1 = 0 ] ; then + /sbin/service pgpool condstop >/dev/null 2>&1 + chkconfig --del pgpool +fi + %postun -p /sbin/ldconfig %files @@ -106,6 +112,10 @@ chkconfig --add pgpool %{_libdir}/libpcp.so %changelog +* Sun Nov 01 2009 Devrim GUNDUZ - 2.2.5-2 +- Remove init script from all runlevels before uninstall. Per RH Bugzilla + #532177 + * Sun Oct 4 2009 Devrim Gunduz 2.2.5-1 - Update to 2.2.5, for various fixes described at http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html From devrim at fedoraproject.org Sun Nov 1 21:44:49 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Nov 2009 21:44:49 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/devel postgresql-pgpool-II.spec, 1.36, 1.37 Message-ID: <20091101214449.928B611C00EE@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3275/devel Modified Files: postgresql-pgpool-II.spec Log Message: Remove init script from all runlevels before uninstall. Per RH Bugzilla #532177 Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/postgresql-pgpool-II.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- postgresql-pgpool-II.spec 4 Oct 2009 10:39:40 -0000 1.36 +++ postgresql-pgpool-II.spec 1 Nov 2009 21:44:47 -0000 1.37 @@ -3,7 +3,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 2.2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.projects.PostgreSQL.org @@ -74,6 +74,12 @@ rm -rf %{buildroot} /sbin/ldconfig chkconfig --add pgpool +%preun +if [ $1 = 0 ] ; then + /sbin/service pgpool condstop >/dev/null 2>&1 + chkconfig --del pgpool +fi + %postun -p /sbin/ldconfig %files @@ -106,6 +112,10 @@ chkconfig --add pgpool %{_libdir}/libpcp.so %changelog +* Sun Nov 01 2009 Devrim GUNDUZ - 2.2.5-2 +- Remove init script from all runlevels before uninstall. Per RH Bugzilla + #532177 + * Sun Oct 4 2009 Devrim Gunduz 2.2.5-1 - Update to 2.2.5, for various fixes described at http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html From devrim at fedoraproject.org Sun Nov 1 21:44:48 2009 From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=) Date: Sun, 1 Nov 2009 21:44:48 +0000 (UTC) Subject: rpms/postgresql-pgpool-II/F-11 postgresql-pgpool-II.spec,1.35,1.36 Message-ID: <20091101214448.76FD211C0267@cvs1.fedora.phx.redhat.com> Author: devrim Update of /cvs/extras/rpms/postgresql-pgpool-II/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3275/F-11 Modified Files: postgresql-pgpool-II.spec Log Message: Remove init script from all runlevels before uninstall. Per RH Bugzilla #532177 Index: postgresql-pgpool-II.spec =================================================================== RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/postgresql-pgpool-II.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- postgresql-pgpool-II.spec 4 Oct 2009 10:39:39 -0000 1.35 +++ postgresql-pgpool-II.spec 1 Nov 2009 21:44:46 -0000 1.36 @@ -3,7 +3,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 2.2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.projects.PostgreSQL.org @@ -74,6 +74,12 @@ rm -rf %{buildroot} /sbin/ldconfig chkconfig --add pgpool +%preun +if [ $1 = 0 ] ; then + /sbin/service pgpool condstop >/dev/null 2>&1 + chkconfig --del pgpool +fi + %postun -p /sbin/ldconfig %files @@ -106,6 +112,10 @@ chkconfig --add pgpool %{_libdir}/libpcp.so %changelog +* Sun Nov 01 2009 Devrim GUNDUZ - 2.2.5-2 +- Remove init script from all runlevels before uninstall. Per RH Bugzilla + #532177 + * Sun Oct 4 2009 Devrim Gunduz 2.2.5-1 - Update to 2.2.5, for various fixes described at http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html From nim at fedoraproject.org Sun Nov 1 21:52:52 2009 From: nim at fedoraproject.org (nim) Date: Sun, 1 Nov 2009 21:52:52 +0000 (UTC) Subject: rpms/fontpackages/devel fontpackages.spec, 1.27, 1.28 import.log, 1.23, 1.24 Message-ID: <20091101215252.AC71811C02BC@cvs1.fedora.phx.redhat.com> Author: nim Update of /cvs/extras/rpms/fontpackages/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6589/devel Modified Files: fontpackages.spec import.log Log Message: tweak deps Index: fontpackages.spec =================================================================== RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- fontpackages.spec 1 Nov 2009 19:18:36 -0000 1.27 +++ fontpackages.spec 1 Nov 2009 21:52:49 -0000 1.28 @@ -4,7 +4,7 @@ Name: fontpackages Version: 1.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Common directory and macro definitions used by font packages Group: Development/System @@ -46,7 +46,7 @@ create font packages. %package tools Summary: Tools used to check fonts and font packages -Requires: fontforge, fontconfig, mutt, rpmlint +Requires: fontconfig, fontforge, mutt, rpmlint, yum-utils %description tools This package contains tools used to check fonts and font packages @@ -113,6 +113,8 @@ rm -fr %{buildroot} %changelog * Sat Nov 1 2009 Nicolas Mailhot +- 1.31-2 +? add yum-utils to deps - 1.31-1 ? Rework repo-font-audit messages based on packager feedback Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- import.log 1 Nov 2009 19:18:36 -0000 1.23 +++ import.log 1 Nov 2009 21:52:49 -0000 1.24 @@ -21,3 +21,4 @@ fontpackages-1_28-1_fc13:HEAD:fontpackag fontpackages-1_29-1_fc13:HEAD:fontpackages-1.29-1.fc13.src.rpm:1256683739 fontpackages-1_30-1_fc13:HEAD:fontpackages-1.30-1.fc13.src.rpm:1256843017 fontpackages-1_31-1_fc13:HEAD:fontpackages-1.31-1.fc13.src.rpm:1257103069 +fontpackages-1_31-2_fc13:HEAD:fontpackages-1.31-2.fc13.src.rpm:1257112310 From nim at fedoraproject.org Sun Nov 1 21:54:26 2009 From: nim at fedoraproject.org (nim) Date: Sun, 1 Nov 2009 21:54:26 +0000 (UTC) Subject: rpms/fontpackages/F-12 fontpackages.spec, 1.27, 1.28 import.log, 1.23, 1.24 Message-ID: <20091101215426.4783311C02BC@cvs1.fedora.phx.redhat.com> Author: nim Update of /cvs/extras/rpms/fontpackages/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7109/F-12 Modified Files: fontpackages.spec import.log Log Message: tweak deps Index: fontpackages.spec =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-12/fontpackages.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- fontpackages.spec 1 Nov 2009 19:19:53 -0000 1.27 +++ fontpackages.spec 1 Nov 2009 21:54:25 -0000 1.28 @@ -4,7 +4,7 @@ Name: fontpackages Version: 1.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Common directory and macro definitions used by font packages Group: Development/System @@ -46,7 +46,7 @@ create font packages. %package tools Summary: Tools used to check fonts and font packages -Requires: fontforge, fontconfig, mutt, rpmlint +Requires: fontconfig, fontforge, mutt, rpmlint, yum-utils %description tools This package contains tools used to check fonts and font packages @@ -113,6 +113,8 @@ rm -fr %{buildroot} %changelog * Sat Nov 1 2009 Nicolas Mailhot +- 1.31-2 +? add yum-utils to deps - 1.31-1 ? Rework repo-font-audit messages based on packager feedback Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-12/import.log,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- import.log 1 Nov 2009 19:19:54 -0000 1.23 +++ import.log 1 Nov 2009 21:54:26 -0000 1.24 @@ -21,3 +21,4 @@ fontpackages-1_28-1_fc13:F-12:fontpackag fontpackages-1_29-1_fc13:F-12:fontpackages-1.29-1.fc13.src.rpm:1256683797 fontpackages-1_30-1_fc13:F-12:fontpackages-1.30-1.fc13.src.rpm:1256843115 fontpackages-1_31-1_fc13:F-12:fontpackages-1.31-1.fc13.src.rpm:1257103098 +fontpackages-1_31-2_fc13:F-12:fontpackages-1.31-2.fc13.src.rpm:1257112403 From lkundrak at fedoraproject.org Sun Nov 1 22:01:00 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Nov 2009 22:01:00 +0000 (UTC) Subject: rpms/inkscape/devel inkscape-20091101svn-icon.patch, NONE, 1.1 inkscape.spec, 1.87, 1.88 Message-ID: <20091101220100.5927111C02BA@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9149/devel Modified Files: inkscape.spec Added Files: inkscape-20091101svn-icon.patch Log Message: * Mon Sep 07 2009 Lubomir Rintel - 0.47-0.17.pre4.20091101svn - Icon for main window (#532325) inkscape-20091101svn-icon.patch: main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE inkscape-20091101svn-icon.patch --- From: Lubomir Rintel Hot fix for #532325 [1] Not upstreamable since it defeats the icon's theming. [1] https://bugzilla.redhat.com/show_bug.cgi?id=532325 Index: src/main.cpp =================================================================== --- src/main.cpp (revision 22548) +++ src/main.cpp (working copy) @@ -924,8 +924,7 @@ gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL); Inkscape::Debug::log_display_config(); - // Set default window icon. Obeys the theme. - gtk_window_set_default_icon_name("inkscape"); + gtk_window_set_default_icon_from_file("/usr/share/pixmaps/inkscape.png", NULL); // Do things that were previously in inkscape_gtk_stock_init(). sp_icon_get_phys_size(GTK_ICON_SIZE_MENU); Inkscape::UI::Widget::Panel::prep(); Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -p -r1.87 -r1.88 --- inkscape.spec 1 Nov 2009 14:47:31 -0000 1.87 +++ inkscape.spec 1 Nov 2009 22:00:57 -0000 1.88 @@ -1,6 +1,6 @@ Name: inkscape Version: 0.47 -Release: 0.16.pre4.20091101svn%{?dist} +Release: 0.17.pre4.20091101svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -14,6 +14,7 @@ Source0: %{name}.tar.gz Patch0: inkscape-20090410svn-uniconv.patch Patch4: inkscape-20090410svn-formats.patch Patch5: inkscape-20090925svn-el5.patch +Patch6: inkscape-20091101svn-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -131,6 +132,7 @@ graphics in W3C standard Scalable Vector %patch0 -p1 -b .uniconv %patch4 -p1 -b .formats %patch5 -p1 -b .el5 +%patch6 -p0 -b .japierdole # https://bugs.launchpad.net/inkscape/+bug/314381 # A couple of files have executable bits set, @@ -220,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.17.pre4.20091101svn +- Icon for main window (#532325) + * Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre4.20091101svn - Move to a later snapshot - python-lxml and numpy seem to be rather popular, add them as hard deps From lkundrak at fedoraproject.org Sun Nov 1 22:03:14 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Sun, 1 Nov 2009 22:03:14 +0000 (UTC) Subject: rpms/inkscape/F-12 inkscape-20091101svn-icon.patch, NONE, 1.1 inkscape.spec, 1.87, 1.88 Message-ID: <20091101220314.95F6011C04E9@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/inkscape/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9857 Modified Files: inkscape.spec Added Files: inkscape-20091101svn-icon.patch Log Message: Hot-fix for icon inkscape-20091101svn-icon.patch: main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE inkscape-20091101svn-icon.patch --- From: Lubomir Rintel Hot fix for #532325 [1] Not upstreamable since it defeats the icon's theming. [1] https://bugzilla.redhat.com/show_bug.cgi?id=532325 Index: src/main.cpp =================================================================== --- src/main.cpp (revision 22548) +++ src/main.cpp (working copy) @@ -924,8 +924,7 @@ gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL); Inkscape::Debug::log_display_config(); - // Set default window icon. Obeys the theme. - gtk_window_set_default_icon_name("inkscape"); + gtk_window_set_default_icon_from_file("/usr/share/pixmaps/inkscape.png", NULL); // Do things that were previously in inkscape_gtk_stock_init(). sp_icon_get_phys_size(GTK_ICON_SIZE_MENU); Inkscape::UI::Widget::Panel::prep(); Index: inkscape.spec =================================================================== RCS file: /cvs/pkgs/rpms/inkscape/F-12/inkscape.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -p -r1.87 -r1.88 --- inkscape.spec 1 Nov 2009 15:16:39 -0000 1.87 +++ inkscape.spec 1 Nov 2009 22:03:12 -0000 1.88 @@ -1,6 +1,6 @@ Name: inkscape Version: 0.47 -Release: 0.16.pre4.20091101svn%{?dist} +Release: 0.17.pre4.20091101svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -14,6 +14,7 @@ Source0: %{name}.tar.gz Patch0: inkscape-20090410svn-uniconv.patch Patch4: inkscape-20090410svn-formats.patch Patch5: inkscape-20090925svn-el5.patch +Patch6: inkscape-20091101svn-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -131,6 +132,7 @@ graphics in W3C standard Scalable Vector %patch0 -p1 -b .uniconv %patch4 -p1 -b .formats %patch5 -p1 -b .el5 +%patch6 -p0 -b .japierdole # https://bugs.launchpad.net/inkscape/+bug/314381 # A couple of files have executable bits set, @@ -220,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.17.pre4.20091101svn +- Icon for main window (#532325) + * Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre4.20091101svn - Move to a later snapshot - python-lxml and numpy seem to be rather popular, add them as hard deps From hubbitus at fedoraproject.org Sun Nov 1 22:06:37 2009 From: hubbitus at fedoraproject.org (Pavel Alexeev) Date: Sun, 1 Nov 2009 22:06:37 +0000 (UTC) Subject: rpms/x11vnc/EL-5 x11vnc.spec,1.2,1.3 Message-ID: <20091101220637.629A311C00EE@cvs1.fedora.phx.redhat.com> Author: hubbitus Update of /cvs/pkgs/rpms/x11vnc/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10709 Modified Files: x11vnc.spec Log Message: Increase release only to allow retag, because tag (wrong) removing is not allowed. Index: x11vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/x11vnc/EL-5/x11vnc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- x11vnc.spec 1 Nov 2009 16:37:42 -0000 1.2 +++ x11vnc.spec 1 Nov 2009 22:06:37 -0000 1.3 @@ -2,7 +2,7 @@ Summary: VNC server for the current X11 Summary(ru): VNC-?????? ??? ??????? ?????? X11 Name: x11vnc Version: 0.9.8 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2 Group: User Interface/X URL: http://www.karlrunge.com/x11vnc/ @@ -153,7 +153,7 @@ popd %endif %changelog -* Sun Nov 1 2009 Pavel Alexeev - 0.9.8-15 +* Sun Nov 1 2009 Pavel Alexeev - 0.9.8-16 - Noarch subpackage became only on Fedora ( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 ) - Also -javaviewers subpackage compleatly disabled on PPC arch on EL-5 because From uwog at fedoraproject.org Sun Nov 1 22:40:38 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Sun, 1 Nov 2009 22:40:38 +0000 (UTC) Subject: rpms/abiword/F-10 abiword-2.7.6-desktop.patch, NONE, 1.1 abiword.keys, NONE, 1.1 abiword.xml, NONE, 1.1 abiword.mime, 1.1, 1.2 abiword.spec, 1.73, 1.74 abiword-2.6.4-desktop.patch, 1.1, NONE Message-ID: <20091101224038.6F09E11C0418@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19938 Modified Files: abiword.mime abiword.spec Added Files: abiword-2.7.6-desktop.patch abiword.keys abiword.xml Removed Files: abiword-2.6.4-desktop.patch Log Message: Update to 2.8.1 abiword-2.7.6-desktop.patch: abiword.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE abiword-2.7.6-desktop.patch --- diff -u -r abiword-2.7.6.orig/abiword.desktop abiword-2.7.6/abiword.desktop --- abiword-2.7.6.orig/abiword.desktop 2009-06-21 15:28:21.000000000 +0200 +++ abiword-2.7.6/abiword.desktop 2009-07-05 14:11:02.000000000 +0200 @@ -6,7 +6,7 @@ Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base; StartupNotify=true X-Desktop-File-Install-Version=0.9 -MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab; +MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;application/x-applix-word;application/x-mswrite;application/x-kword;application/x-mif; Name=AbiWord GenericName=Word Processor Comment=Compose, edit, and view documents --- NEW FILE abiword.keys --- application/x-abiword open=abiword %f view=abiword %f application/x-abicollab open=abiword %f view=abiword %f --- NEW FILE abiword.xml --- AbiWord Collaborative Document Index: abiword.mime =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-10/abiword.mime,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- abiword.mime 14 Mar 2005 22:39:45 -0000 1.1 +++ abiword.mime 1 Nov 2009 22:40:37 -0000 1.2 @@ -1,3 +1,5 @@ application/x-abiword ext: abw +application/x-abicollab + ext: abicollab Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-10/abiword.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -p -r1.73 -r1.74 --- abiword.spec 9 Mar 2009 15:19:07 -0000 1.73 +++ abiword.spec 1 Nov 2009 22:40:37 -0000 1.74 @@ -1,6 +1,6 @@ %define majorversion 2 -%define minorversion 6 -%define microversion 8 +%define minorversion 8 +%define microversion 1 %define olpc_build 0 @@ -12,12 +12,13 @@ Epoch: 1 Group: Applications/Editors License: GPLv2+ Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz -Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugins-%{version}.tar.gz -Source2: http://abisource.com/downloads/abiword/%{version}/source/abiword-extras-%{version}.tar.gz -Source3: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz +Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz Source11: abiword.mime +Source12: abiword.keys +Source13: abiword.xml BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.abisource.com/ +Requires: libabiword = %{epoch}:%{version}-%{release} %description AbiWord is a cross-platform Open Source word processor. It is full-featured, @@ -27,7 +28,7 @@ while still remaining lean. Summary: Library for developing applications based on AbiWord's core Group: System Environment/Libraries Patch0: abiword-2.6.0-windowshelppaths.patch -Patch1: abiword-2.6.4-desktop.patch +Patch1: abiword-2.7.6-desktop.patch Patch2: abiword-2.6.0-boolean.patch Patch3: abiword-plugins-2.6.0-boolean.patch %if %{olpc_build} @@ -40,30 +41,26 @@ BuildRequires: autoconf, libtool BuildRequires: desktop-file-utils BuildRequires: fribidi-devel, enchant-devel, wv-devel BuildRequires: zlib-devel, popt-devel, libpng-devel -BuildRequires: gtk2-devel, libgsf-devel, libglade2-devel +BuildRequires: gtk2-devel, libgsf-devel BuildRequires: boost-devel, t1lib-devel -%if %{olpc_build} BuildRequires: dbus-glib-devel >= 0.70 -%else +%if !%{olpc_build} Requires: mathml-fonts Requires: link-grammar >= 4.2.2 -BuildRequires: libgnomeui-devel -BuildRequires: libgnomeprintui22-devel BuildRequires: readline-devel BuildRequires: bzip2-devel BuildRequires: poppler-devel >= 0.4.0 BuildRequires: ots-devel >= 0.4.2 BuildRequires: libwpd-devel >= 0.8.0 +BuildRequires: libwpg-devel BuildRequires: librsvg2-devel BuildRequires: libwmf-devel BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel BuildRequires: link-grammar-devel >= 4.2.2 BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison -BuildRequires: goffice04-devel BuildRequires: loudmouth-devel -%if 0%{?fedora} >= 9 -BuildRequires: asio-devel >= 0.3.8 -%endif +BuildRequires: asio-devel +BuildRequires: libsoup-devel %endif %description -n libabiword @@ -80,6 +77,8 @@ Includes and definitions for developing %prep # setup abiword %setup -q + +# patch abiword %patch1 -p1 -b .desktop %if 0%{?fedora} >= 9 %patch2 -p1 -b .boolean @@ -90,72 +89,33 @@ Includes and definitions for developing %patch102 -p1 -b .nohtmloptions %endif -# setup abiword-plugins -%setup -q -T -b 1 -n abiword-plugins-%{version} -%patch3 -p1 -b .boolean - -# setup abiword extras -%setup -q -T -b 2 -n abiword-extras-%{version} +# patch abiword plugins +#%patch3 -p1 -b .boolean # setup abiword documentation -%setup -q -T -b 3 -n abiword-docs-%{version} +%setup -q -T -b 1 -n abiword-docs-%{version} %patch0 -p1 -b .windowshelppaths %build # build libabiword and abiword cd $RPM_BUILD_DIR/abiword-%{version} %if %{olpc_build} -%configure --enable-libabiword --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing +%configure --disable-static --enable-dynamic --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar %else -%configure --enable-libabiword +%configure --disable-static --enable-dynamic --enable-plugins --enable-clipart --enable-templates %endif -make %{?_smp_mflags} - -# build abiword-plugins -cd $RPM_BUILD_DIR/abiword-plugins-%{version} -export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}" -%if %{olpc_build} -CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --enable-libabiword --disable-all --enable-abicollab --with-abicollab-sugar-backend --enable-loadbindings --enable-OpenDocument --with-abiword=$RPM_BUILD_DIR/%{name}-%{version} -%else -CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --disable-gda --enable-libabiword --with-abiword=$RPM_BUILD_DIR/%{name}-%{version} -%endif -# Remove libtool predep_objects and postdep_objects wonkiness so that -# building without -nostdlib doesn't include them twice. Because we -# already link with g++, weird stuff happens if you don't let the -# compiler handle this. -sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo -sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool.foobar -sed 's/-shared -nostdlib/-shared/' < libtool.foobar > libtool -make %{?_smp_mflags} - -# build the extras -cd $RPM_BUILD_DIR/abiword-extras-%{version} -# abiword-extras looks at the abiword-%{version}.pc pkg-config file to get its location info -# however, that file is not installed yet, so just point to it in the abiword source tree -export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}" -%configure -make +%{__make} %{?_smp_mflags} # build the documentation cd $RPM_BUILD_DIR/abiword-docs-%{version} -ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/wp/main/unix/abiword ./make-html.sh +ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT # install abiword cd $RPM_BUILD_DIR/abiword-%{version} -make install DESTDIR=$RPM_BUILD_ROOT -# overwrite the static binary with the dynamic one -mv -f $RPM_BUILD_DIR/abiword-%{version}/src/wp/main/unix/abiword-dynamic $RPM_BUILD_ROOT%{_bindir}/abiword - -# install abiword-plugins -cd $RPM_BUILD_DIR/abiword-plugins-%{version} -make install DESTDIR=$RPM_BUILD_ROOT - -# install the extras -cd $RPM_BUILD_DIR/abiword-extras-%{version} -make install DESTDIR=$RPM_BUILD_ROOT +%{__make} install DESTDIR=$RPM_BUILD_ROOT # install the documentation cd $RPM_BUILD_DIR/abiword-docs-%{version} @@ -166,7 +126,7 @@ find $RPM_BUILD_ROOT/%{_datadir}/%{name} # finish up mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -cp $RPM_BUILD_DIR/abiword-extras-%{version}/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png +cp $RPM_BUILD_DIR/abiword-%{version}/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png cd $RPM_BUILD_DIR/abiword-%{version} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -176,35 +136,39 @@ desktop-file-install --vendor fedora --a --add-category Applications --add-category Office \ ./abiword.desktop # remove the original one (which has X-Red-Hat-Base) (#107023) -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop +%{__rm} -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop -mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info -install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info +%{__install} -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime +%{__install} -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys +%{__install} -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiword.xml # nuke .la files -rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la -# nuke custom dictionary files -rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml +%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/libabiword-%{majorversion}.%{minorversion}.la +%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %post -update-desktop-database %{_datadir}/applications +update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun -update-desktop-database %{_datadir}/applications +update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files %defattr(-,root,root) %{_bindir}/abiword %{_datadir}/applications/* -%{_datadir}/mime-info/* -%{_datadir}/pixmaps/*png -%{_datadir}/icons/*png +%{_datadir}/mime-info/abiword.mime +%{_datadir}/mime-info/abiword.keys +%{_datadir}/mime/packages/abiword.xml +%{_datadir}/pixmaps/*.png +%{_datadir}/icons/*.png %files -n libabiword -%doc $RPM_BUILD_DIR/%{name}-%{version}/docs $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT +%doc $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT %{_libdir}/libabiword-%{majorversion}.%{minorversion}.so %{_libdir}/%{name}-%{majorversion}.%{minorversion} %{_datadir}/%{name}-%{majorversion}.%{minorversion} @@ -214,6 +178,8 @@ update-desktop-database %{_datadir}/appl %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Sun Nov 01 2009 Marc Maurer - 1:2.8.1-1 + * Mon Mar 09 2009 Marc Maurer - 1:2.6.8-1 - New upstream release --- abiword-2.6.4-desktop.patch DELETED --- From uwog at fedoraproject.org Sun Nov 1 22:42:19 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Sun, 1 Nov 2009 22:42:19 +0000 (UTC) Subject: rpms/abiword/F-10 .cvsignore,1.24,1.25 sources,1.24,1.25 Message-ID: <20091101224219.EC80611C02BA@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20422 Modified Files: .cvsignore sources Log Message: Update sources to 2.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-10/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- .cvsignore 9 Mar 2009 15:19:07 -0000 1.24 +++ .cvsignore 1 Nov 2009 22:42:18 -0000 1.25 @@ -1,4 +1,2 @@ -abiword-2.6.8.tar.gz -abiword-docs-2.6.8.tar.gz -abiword-extras-2.6.8.tar.gz -abiword-plugins-2.6.8.tar.gz +abiword-2.8.1.tar.gz +abiword-docs-2.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-10/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- sources 9 Mar 2009 15:19:07 -0000 1.24 +++ sources 1 Nov 2009 22:42:18 -0000 1.25 @@ -1,4 +1,2 @@ -fab04d8ef999c303f720197adf261310 abiword-2.6.8.tar.gz -5698c79cfa179f4b15c82a699d11a309 abiword-docs-2.6.8.tar.gz -e3cfff6ad4cda3e4200a75fd2665857a abiword-extras-2.6.8.tar.gz -421c49723e209c971ddb0798c1b313a9 abiword-plugins-2.6.8.tar.gz +284fe25289c160c3797b527a8aacad12 abiword-2.8.1.tar.gz +6a6d8260004280687b862e3b9777c338 abiword-docs-2.8.1.tar.gz From uwog at fedoraproject.org Sun Nov 1 22:43:46 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Sun, 1 Nov 2009 22:43:46 +0000 (UTC) Subject: rpms/abiword/F-10 abiword.spec,1.74,1.75 Message-ID: <20091101224346.B351A11C00EE@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/abiword/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20858 Modified Files: abiword.spec Log Message: Rebuild to fix bad tag Index: abiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/abiword/F-10/abiword.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- abiword.spec 1 Nov 2009 22:40:37 -0000 1.74 +++ abiword.spec 1 Nov 2009 22:43:46 -0000 1.75 @@ -7,7 +7,7 @@ Summary: The AbiWord word processor Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -178,7 +178,11 @@ update-desktop-database %{_datadir}/appl %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Sun Nov 01 2009 Marc Maurer - 1:2.8.1-2 +- Rebuild + * Sun Nov 01 2009 Marc Maurer - 1:2.8.1-1 +- New upstream release * Mon Mar 09 2009 Marc Maurer - 1:2.6.8-1 - New upstream release From sailer at fedoraproject.org Sun Nov 1 22:50:24 2009 From: sailer at fedoraproject.org (sailer) Date: Sun, 1 Nov 2009 22:50:24 +0000 (UTC) Subject: rpms/mingw32-qt/devel .cvsignore, 1.4, 1.5 mingw32-qt.spec, 1.13, 1.14 qt-win-configure.patch, 1.2, 1.3 qt-win-configure.sh, 1.2, 1.3 sources, 1.4, 1.5 Message-ID: <20091101225024.1996311C0260@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/mingw32-qt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22653 Modified Files: .cvsignore mingw32-qt.spec qt-win-configure.patch qt-win-configure.sh sources Log Message: update to 4.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mingw32-qt/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 29 Jun 2009 14:37:14 -0000 1.4 +++ .cvsignore 1 Nov 2009 22:50:22 -0000 1.5 @@ -1,2 +1,3 @@ qt-win-opensource-src-4.5.1.zip qt-win-opensource-src-4.5.2.zip +qt-win-opensource-src-4.5.3.zip Index: mingw32-qt.spec =================================================================== RCS file: /cvs/extras/rpms/mingw32-qt/devel/mingw32-qt.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- mingw32-qt.spec 25 Jul 2009 14:30:18 -0000 1.13 +++ mingw32-qt.spec 1 Nov 2009 22:50:22 -0000 1.14 @@ -17,8 +17,8 @@ %global subdirs src/corelib src/network src/xml src/xmlpatterns src/gui src/winmain src/svg src/sql src/qt3support src/opengl src/script src/scripttools Name: mingw32-qt -Version: 4.5.2 -Release: 2%{?dist} +Version: 4.5.3 +Release: 1%{?dist} Summary: Qt for Windows License: GPLv3 with exceptions or LGPLv2 with exceptions @@ -242,6 +242,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 1 2009 Thomas Sailer - 4.5.3-1 +- update to 4.5.3 + * Sat Jul 25 2009 Fedora Release Engineering - 4.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild qt-win-configure.patch: .qmake.cache | 20 +++++ configure.cache | 30 +++++++ configure.output | 149 +++++++++++++++++++++++++++++++++++++ include/Qt/qconfig.h | 1 include/QtCore/qconfig.h | 1 mkspecs/default/qmake.conf | 113 ++++++++++++++++++++++++++++ mkspecs/default/qplatformdefs.h | 160 ++++++++++++++++++++++++++++++++++++++++ mkspecs/qconfig.pri | 11 ++ src/corelib/global/qconfig.cpp | 27 ++++++ src/corelib/global/qconfig.h | 102 +++++++++++++++++++++++++ 10 files changed, 614 insertions(+) Index: qt-win-configure.patch =================================================================== RCS file: /cvs/extras/rpms/mingw32-qt/devel/qt-win-configure.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- qt-win-configure.patch 29 Jun 2009 14:37:14 -0000 1.2 +++ qt-win-configure.patch 1 Nov 2009 22:50:22 -0000 1.3 @@ -1,6 +1,6 @@ -diff -urN qt-win-opensource-src-4.5.2.orig/configure.cache qt-win-opensource-src-4.5.2/configure.cache ---- qt-win-opensource-src-4.5.2.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/configure.cache 2009-06-26 17:14:45.000000000 +0200 +diff -urN qt-win-opensource-src-4.5.3.orig/configure.cache qt-win-opensource-src-4.5.3/configure.cache +--- qt-win-opensource-src-4.5.3.orig/configure.cache 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/configure.cache 2009-11-01 23:03:12.000000000 +0100 @@ -0,0 +1,30 @@ +-platform +fedora-win32-cross @@ -32,11 +32,27 @@ diff -urN qt-win-opensource-src-4.5.2.or +-no-sse2 +-release +-shared -diff -urN qt-win-opensource-src-4.5.2.orig/configure.output qt-win-opensource-src-4.5.2/configure.output ---- qt-win-opensource-src-4.5.2.orig/configure.output 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/configure.output 2009-06-26 17:14:45.000000000 +0200 -@@ -0,0 +1,125 @@ -+Which edition of Qt do you want to use ? +diff -urN qt-win-opensource-src-4.5.3.orig/configure.output qt-win-opensource-src-4.5.3/configure.output +--- qt-win-opensource-src-4.5.3.orig/configure.output 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/configure.output 2009-11-01 23:03:12.000000000 +0100 +@@ -0,0 +1,149 @@ ++err:wineboot:ProcessRunKeys Error running cmd L"C:\\WINDOWS\\SYSTEM\\mstask.exe" (2) ++err:wineboot:ProcessRunKeys Error running cmd L"ati2evxx.exe" (2) ++err:service:load_reg_dword Error 1804 while reading value L"Type" ++err:service:scmdatabase_load_services Error 1804 reading registry key for service L"redbook" - skipping ++err:service:load_reg_dword Error 1804 while reading value L"Type" ++err:service:scmdatabase_load_services Error 1804 reading registry key for service L"sbemul" - skipping ++err:service:load_reg_dword Error 1804 while reading value L"Type" ++err:service:scmdatabase_load_services Error 1804 reading registry key for service L"swmidi" - skipping ++err:service:load_reg_dword Error 1804 while reading value L"Type" ++err:service:scmdatabase_load_services Error 1804 reading registry key for service L"UPDATE" - skipping ++err:service:load_reg_dword Error 1804 while reading value L"Type" ++err:service:scmdatabase_load_services Error 1804 reading registry key for service L"wdmaud" - skipping ++err:service:load_reg_dword Error 1804 while reading value L"Type" ++err:service:scmdatabase_load_services Error 1804 reading registry key for service L"WDMFS" - skipping ++err:winedevice:ServiceMain driver L"VIAPFD" failed to load ++Invalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyInvalid MIT-MAGIC-COOKIE-1 keyerr:menubuilder:init_xdg error looking up the desktop directory ++Invalid MIT-MAGIC-COOKIE-1 keyWhich edition of Qt do you want to use ? +Type 'c' if you want to use the Commercial Edition. +Type 'o' if you want to use the Open Source Edition. + @@ -58,12 +74,19 @@ diff -urN qt-win-opensource-src-4.5.2.or + LIB= + Unset + PATH= -+ C:\windows\system32 -+ C:\windows ++ c:\windows ++ c:\windows\system ++ s:\ ++ s:\test ++ f:\ ++ s:\xilinx\bin\nt ++ s:\modelsim\win32 ++ s:\fujitsu16\bin ++ s:\fujitsu16\flash510 +You are licensed to use this software under the terms of the GNU GPL version 3.You are licensed to use this software under the terms of the Lesser GNU LGPL version 2.1. -+See H:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.23 ++See J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.33 + -+ or H:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.2L ++ or J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.3L + +Configuration: + dist-config @@ -145,8 +168,8 @@ diff -urN qt-win-opensource-src-4.5.2.or + SQLite2.................no + InterBase...............no + -+Sources are in..............H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2 -+Build is done in............H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2 ++Sources are in..............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3 ++Build is done in............J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3 +Install prefix............../usr/i686-pc-mingw32/sys-root/mingw +Headers installed to......../usr/i686-pc-mingw32/sys-root/mingw/include +Libraries installed to....../usr/i686-pc-mingw32/sys-root/mingw/lib @@ -161,19 +184,21 @@ diff -urN qt-win-opensource-src-4.5.2.or +Processing of project files have been disabled. +Only use this option if you really know what you're doing. + -diff -urN qt-win-opensource-src-4.5.2.orig/include/Qt/qconfig.h qt-win-opensource-src-4.5.2/include/Qt/qconfig.h ---- qt-win-opensource-src-4.5.2.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/include/Qt/qconfig.h 2009-06-26 17:14:45.000000000 +0200 ++Invalid MIT-MAGIC-COOKIE-1 key +\ No newline at end of file +diff -urN qt-win-opensource-src-4.5.3.orig/include/Qt/qconfig.h qt-win-opensource-src-4.5.3/include/Qt/qconfig.h +--- qt-win-opensource-src-4.5.3.orig/include/Qt/qconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/include/Qt/qconfig.h 2009-11-01 23:03:12.000000000 +0100 @@ -0,0 +1 @@ +#include "../../src/corelib/global/qconfig.h" -diff -urN qt-win-opensource-src-4.5.2.orig/include/QtCore/qconfig.h qt-win-opensource-src-4.5.2/include/QtCore/qconfig.h ---- qt-win-opensource-src-4.5.2.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/include/QtCore/qconfig.h 2009-06-26 17:14:45.000000000 +0200 +diff -urN qt-win-opensource-src-4.5.3.orig/include/QtCore/qconfig.h qt-win-opensource-src-4.5.3/include/QtCore/qconfig.h +--- qt-win-opensource-src-4.5.3.orig/include/QtCore/qconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/include/QtCore/qconfig.h 2009-11-01 23:03:12.000000000 +0100 @@ -0,0 +1 @@ +#include "../../src/corelib/global/qconfig.h" -diff -urN qt-win-opensource-src-4.5.2.orig/mkspecs/default/qmake.conf qt-win-opensource-src-4.5.2/mkspecs/default/qmake.conf ---- qt-win-opensource-src-4.5.2.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/mkspecs/default/qmake.conf 2009-06-26 17:14:45.000000000 +0200 +diff -urN qt-win-opensource-src-4.5.3.orig/mkspecs/default/qmake.conf qt-win-opensource-src-4.5.3/mkspecs/default/qmake.conf +--- qt-win-opensource-src-4.5.3.orig/mkspecs/default/qmake.conf 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/mkspecs/default/qmake.conf 2009-11-01 23:03:12.000000000 +0100 @@ -0,0 +1,113 @@ +# +# qmake configuration for fedora-win32-cross @@ -287,10 +312,10 @@ diff -urN qt-win-opensource-src-4.5.2.or +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +load(qt_config) + -+QMAKESPEC_ORIGINAL=H:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.2/mkspecs/fedora-win32-cross -diff -urN qt-win-opensource-src-4.5.2.orig/mkspecs/default/qplatformdefs.h qt-win-opensource-src-4.5.2/mkspecs/default/qplatformdefs.h ---- qt-win-opensource-src-4.5.2.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/mkspecs/default/qplatformdefs.h 2009-06-26 17:14:41.000000000 +0200 ++QMAKESPEC_ORIGINAL=J:/src/fedora-extras/rpms/mingw32-qt/devel/qt-win-opensource-src-4.5.3/mkspecs/fedora-win32-cross +diff -urN qt-win-opensource-src-4.5.3.orig/mkspecs/default/qplatformdefs.h qt-win-opensource-src-4.5.3/mkspecs/default/qplatformdefs.h +--- qt-win-opensource-src-4.5.3.orig/mkspecs/default/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/mkspecs/default/qplatformdefs.h 2009-11-01 23:03:02.000000000 +0100 @@ -0,0 +1,160 @@ +/**************************************************************************** +** @@ -452,24 +477,24 @@ diff -urN qt-win-opensource-src-4.5.2.or + + +#endif // QPLATFORMDEFS_H -diff -urN qt-win-opensource-src-4.5.2.orig/mkspecs/qconfig.pri qt-win-opensource-src-4.5.2/mkspecs/qconfig.pri ---- qt-win-opensource-src-4.5.2.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/mkspecs/qconfig.pri 2009-06-26 17:14:45.000000000 +0200 +diff -urN qt-win-opensource-src-4.5.3.orig/mkspecs/qconfig.pri qt-win-opensource-src-4.5.3/mkspecs/qconfig.pri +--- qt-win-opensource-src-4.5.3.orig/mkspecs/qconfig.pri 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/mkspecs/qconfig.pri 2009-11-01 23:03:12.000000000 +0100 @@ -0,0 +1,11 @@ +CONFIG+= release shared stl exceptions rtti +QT_ARCH = windows +QT_EDITION = OpenSource +QT_CONFIG += release zlib png accessibility qt3support opengl ipv6 scripttools xmlpatterns svg minimal-config small-config medium-config large-config full-config +#versioning -+QT_VERSION = 4.5.2 ++QT_VERSION = 4.5.3 +QT_MAJOR_VERSION = 4 +QT_MINOR_VERSION = 5 -+QT_PATCH_VERSION = 2 ++QT_PATCH_VERSION = 3 +#Qt for Windows CE c-runtime deployment +QT_CE_C_RUNTIME = no -diff -urN qt-win-opensource-src-4.5.2.orig/.qmake.cache qt-win-opensource-src-4.5.2/.qmake.cache ---- qt-win-opensource-src-4.5.2.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/.qmake.cache 2009-06-26 17:14:45.000000000 +0200 +diff -urN qt-win-opensource-src-4.5.3.orig/.qmake.cache qt-win-opensource-src-4.5.3/.qmake.cache +--- qt-win-opensource-src-4.5.3.orig/.qmake.cache 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/.qmake.cache 2009-11-01 23:03:12.000000000 +0100 @@ -0,0 +1,20 @@ +QMAKE_QT_VERSION_OVERRIDE = 4 +OBJECTS_DIR = tmp\obj\release_shared @@ -480,10 +505,10 @@ diff -urN qt-win-opensource-src-4.5.2.or +imageformat-plugins += gif tiff jpeg +CONFIG += dist-config large-config medium-config minimal-config small-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build +QT_BUILD_PARTS = libs tools examples demos docs translations -+QMAKESPEC = H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2\mkspecs\fedora-win32-cross ++QMAKESPEC = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3\mkspecs\fedora-win32-cross +ARCH = windows -+QT_BUILD_TREE = H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2 -+QT_SOURCE_TREE = H:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.2 ++QT_BUILD_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3 ++QT_SOURCE_TREE = J:\src\fedora-extras\rpms\mingw32-qt\devel\qt-win-opensource-src-4.5.3 +QMAKE_MOC = $$QT_BUILD_TREE\bin\moc.exe +QMAKE_UIC = $$QT_BUILD_TREE\bin\uic.exe +QMAKE_UIC3 = $$QT_BUILD_TREE\bin\uic3.exe @@ -491,9 +516,9 @@ diff -urN qt-win-opensource-src-4.5.2.or +QMAKE_DUMPCPP = $$QT_BUILD_TREE\bin\dumpcpp.exe +QMAKE_INCDIR_QT = $$QT_BUILD_TREE\include +QMAKE_LIBDIR_QT = $$QT_BUILD_TREE\lib -diff -urN qt-win-opensource-src-4.5.2.orig/src/corelib/global/qconfig.cpp qt-win-opensource-src-4.5.2/src/corelib/global/qconfig.cpp ---- qt-win-opensource-src-4.5.2.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/src/corelib/global/qconfig.cpp 2009-06-26 17:14:45.000000000 +0200 +diff -urN qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.cpp qt-win-opensource-src-4.5.3/src/corelib/global/qconfig.cpp +--- qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/src/corelib/global/qconfig.cpp 2009-11-01 23:03:12.000000000 +0100 @@ -0,0 +1,27 @@ +/* Licensed */ +static const char qt_configure_licensee_str [512 + 12] = "qt_lcnsuser=Open Source"; @@ -522,9 +547,9 @@ diff -urN qt-win-opensource-src-4.5.2.or +#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12; +#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12; + -diff -urN qt-win-opensource-src-4.5.2.orig/src/corelib/global/qconfig.h qt-win-opensource-src-4.5.2/src/corelib/global/qconfig.h ---- qt-win-opensource-src-4.5.2.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ qt-win-opensource-src-4.5.2/src/corelib/global/qconfig.h 2009-06-26 17:14:45.000000000 +0200 +diff -urN qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.h qt-win-opensource-src-4.5.3/src/corelib/global/qconfig.h +--- qt-win-opensource-src-4.5.3.orig/src/corelib/global/qconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ qt-win-opensource-src-4.5.3/src/corelib/global/qconfig.h 2009-11-01 23:03:12.000000000 +0100 @@ -0,0 +1,102 @@ +/* Everything */ + Index: qt-win-configure.sh =================================================================== RCS file: /cvs/extras/rpms/mingw32-qt/devel/qt-win-configure.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- qt-win-configure.sh 29 Jun 2009 14:37:14 -0000 1.2 +++ qt-win-configure.sh 1 Nov 2009 22:50:22 -0000 1.3 @@ -15,7 +15,7 @@ # error: #error "MMX instruction set not enabled" # . Same as above for -no-sse and -no-sse2 -version=4.5.2 +version=4.5.3 platform=fedora-win32-cross set -e Index: sources =================================================================== RCS file: /cvs/extras/rpms/mingw32-qt/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 29 Jun 2009 14:37:14 -0000 1.4 +++ sources 1 Nov 2009 22:50:22 -0000 1.5 @@ -1 +1 @@ -05d3d3448218acc72bd7a5bbfae9312a qt-win-opensource-src-4.5.2.zip +81ca235e0da2728f948ca36236f9ee45 qt-win-opensource-src-4.5.3.zip From pbrobinson at fedoraproject.org Sun Nov 1 23:30:55 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Sun, 1 Nov 2009 23:30:55 +0000 (UTC) Subject: rpms/tangogps/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tangogps.spec, 1.7, 1.8 Message-ID: <20091101233055.BC1A411C0297@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/tangogps/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1399 Modified Files: .cvsignore sources tangogps.spec Log Message: - New upstream 0.9.8 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 22 Sep 2009 07:09:25 -0000 1.5 +++ .cvsignore 1 Nov 2009 23:30:53 -0000 1.6 @@ -1 +1 @@ -tangogps-0.9.7.tar.gz +tangogps-0.9.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 22 Sep 2009 07:09:27 -0000 1.5 +++ sources 1 Nov 2009 23:30:54 -0000 1.6 @@ -1 +1 @@ -168f30696c6024379d953d4c8b38ff2a tangogps-0.9.7.tar.gz +e3ddac86a72d1f6fe80ab919525b8f47 tangogps-0.9.8.tar.gz Index: tangogps.spec =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/devel/tangogps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- tangogps.spec 22 Sep 2009 07:09:28 -0000 1.7 +++ tangogps.spec 1 Nov 2009 23:30:54 -0000 1.8 @@ -1,5 +1,5 @@ Name: tangogps -Version: 0.9.7 +Version: 0.9.8 Release: 1%{?dist} Summary: GTK+ mapping and GPS application @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/tangogps-*.png %changelog +* Sun Nov 1 2009 Peter Robinson 0.9.8-1 +- New upstream 0.9.8 release + * Tue Sep 22 2009 Peter Robinson 0.9.7-1 - New upstream 0.9.7 release From pbrobinson at fedoraproject.org Sun Nov 1 23:36:59 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Sun, 1 Nov 2009 23:36:59 +0000 (UTC) Subject: rpms/tangogps/F-12 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tangogps.spec, 1.7, 1.8 Message-ID: <20091101233659.5E02911C00EE@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/tangogps/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2985 Modified Files: .cvsignore sources tangogps.spec Log Message: - New upstream 0.9.8 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/F-12/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 22 Sep 2009 07:09:25 -0000 1.5 +++ .cvsignore 1 Nov 2009 23:36:58 -0000 1.6 @@ -1 +1 @@ -tangogps-0.9.7.tar.gz +tangogps-0.9.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/F-12/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 22 Sep 2009 07:09:27 -0000 1.5 +++ sources 1 Nov 2009 23:36:58 -0000 1.6 @@ -1 +1 @@ -168f30696c6024379d953d4c8b38ff2a tangogps-0.9.7.tar.gz +e3ddac86a72d1f6fe80ab919525b8f47 tangogps-0.9.8.tar.gz Index: tangogps.spec =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/F-12/tangogps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- tangogps.spec 22 Sep 2009 07:09:28 -0000 1.7 +++ tangogps.spec 1 Nov 2009 23:36:58 -0000 1.8 @@ -1,5 +1,5 @@ Name: tangogps -Version: 0.9.7 +Version: 0.9.8 Release: 1%{?dist} Summary: GTK+ mapping and GPS application @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/tangogps-*.png %changelog +* Sun Nov 1 2009 Peter Robinson 0.9.8-1 +- New upstream 0.9.8 release + * Tue Sep 22 2009 Peter Robinson 0.9.7-1 - New upstream 0.9.7 release From pbrobinson at fedoraproject.org Sun Nov 1 23:39:00 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Sun, 1 Nov 2009 23:39:00 +0000 (UTC) Subject: rpms/tangogps/F-11 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tangogps.spec, 1.6, 1.7 Message-ID: <20091101233900.E315A11C00EE@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/tangogps/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3518 Modified Files: .cvsignore sources tangogps.spec Log Message: - New upstream 0.9.8 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/F-11/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 22 Sep 2009 07:38:39 -0000 1.5 +++ .cvsignore 1 Nov 2009 23:39:00 -0000 1.6 @@ -1 +1 @@ -tangogps-0.9.7.tar.gz +tangogps-0.9.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 22 Sep 2009 07:38:39 -0000 1.5 +++ sources 1 Nov 2009 23:39:00 -0000 1.6 @@ -1 +1 @@ -168f30696c6024379d953d4c8b38ff2a tangogps-0.9.7.tar.gz +e3ddac86a72d1f6fe80ab919525b8f47 tangogps-0.9.8.tar.gz Index: tangogps.spec =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/F-11/tangogps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- tangogps.spec 22 Sep 2009 07:38:39 -0000 1.6 +++ tangogps.spec 1 Nov 2009 23:39:00 -0000 1.7 @@ -1,5 +1,5 @@ Name: tangogps -Version: 0.9.7 +Version: 0.9.8 Release: 1%{?dist} Summary: GTK+ mapping and GPS application @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/tangogps-*.png %changelog +* Sun Nov 1 2009 Peter Robinson 0.9.8-1 +- New upstream 0.9.8 release + * Tue Sep 22 2009 Peter Robinson 0.9.7-1 - New upstream 0.9.7 release From pbrobinson at fedoraproject.org Sun Nov 1 23:41:30 2009 From: pbrobinson at fedoraproject.org (Peter Robinson) Date: Sun, 1 Nov 2009 23:41:30 +0000 (UTC) Subject: rpms/tangogps/F-10 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 tangogps.spec, 1.5, 1.6 Message-ID: <20091101234130.5C3FF11C0417@cvs1.fedora.phx.redhat.com> Author: pbrobinson Update of /cvs/pkgs/rpms/tangogps/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4181 Modified Files: .cvsignore sources tangogps.spec Log Message: - New upstream 0.9.8 release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/F-10/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 22 Sep 2009 07:49:28 -0000 1.4 +++ .cvsignore 1 Nov 2009 23:41:29 -0000 1.5 @@ -1 +1 @@ -tangogps-0.9.7.tar.gz +tangogps-0.9.8.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 22 Sep 2009 07:49:28 -0000 1.5 +++ sources 1 Nov 2009 23:41:29 -0000 1.6 @@ -1 +1 @@ -168f30696c6024379d953d4c8b38ff2a tangogps-0.9.7.tar.gz +e3ddac86a72d1f6fe80ab919525b8f47 tangogps-0.9.8.tar.gz Index: tangogps.spec =================================================================== RCS file: /cvs/pkgs/rpms/tangogps/F-10/tangogps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- tangogps.spec 22 Sep 2009 07:49:28 -0000 1.5 +++ tangogps.spec 1 Nov 2009 23:41:29 -0000 1.6 @@ -1,5 +1,5 @@ Name: tangogps -Version: 0.9.7 +Version: 0.9.8 Release: 1%{?dist} Summary: GTK+ mapping and GPS application @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/tangogps-*.png %changelog +* Sun Nov 1 2009 Peter Robinson 0.9.8-1 +- New upstream 0.9.8 release + * Tue Sep 22 2009 Peter Robinson 0.9.7-1 - New upstream 0.9.7 release From cwickert at fedoraproject.org Mon Nov 2 01:43:07 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Nov 2009 01:43:07 +0000 (UTC) Subject: rpms/libxfcegui4/devel libxfcegui4-4.6.1-fix-crash-in-client-session-free.patch, NONE, 1.1 libxfcegui4-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch, NONE, 1.1 libxfcegui4.spec, 1.36, 1.37 Message-ID: <20091102014307.9CA9111C00EE@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/libxfcegui4/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6009/devel Modified Files: libxfcegui4.spec Added Files: libxfcegui4-4.6.1-fix-crash-in-client-session-free.patch libxfcegui4-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch Log Message: * Mon Nov 02 2009 Christoph Wickert - 4.6.1-3 - Fix SEGV inside disconnect() helper (#532179) - Update gtk-icon-cache scriptlets libxfcegui4-4.6.1-fix-crash-in-client-session-free.patch: session-client.c | 364 ++++++++++++++++++++----------------------------------- 1 file changed, 133 insertions(+), 231 deletions(-) --- NEW FILE libxfcegui4-4.6.1-fix-crash-in-client-session-free.patch --- >From caffa2a1e66f44d63ea201f186d5fd0c5337f4bf Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Fri, 16 Oct 2009 07:43:42 +0000 Subject: various SessionClient improvements and bug fixes * fix crash in client_session_free() * strip previous client id from passsed argv before adding the new one * fix crash when client_session_free() is called when not connected to the session manager * some refactoring to avoid code duplication --- diff --git a/libxfcegui4/session-client.c b/libxfcegui4/session-client.c index 4f036ec..3c63904 100644 --- a/libxfcegui4/session-client.c +++ b/libxfcegui4/session-client.c @@ -408,6 +408,7 @@ save_yourself_possibly_done (SessionClient * session_client) || (session_client->current_state == SESSION_CLIENT_DONE_WITH_INTERACT)) { + set_clone_restart_commands (session_client); SmcSaveYourselfDone ((SmcConn) session_client->session_connection, True); @@ -468,7 +469,6 @@ save_yourself (SmcConn smc_conn, SmPointer client_data, int save_style, } } - set_clone_restart_commands (session_client); TRACE ("save_yourself - SESSION_CLIENT_SAVING_PHASE_1"); session_client->current_state = SESSION_CLIENT_SAVING_PHASE_1; switch (interact_style) @@ -563,168 +563,126 @@ interact (SmcConn smc_conn, SmPointer client_data) save_yourself_possibly_done (session_client); } +#define APPEND 1 +#define REMOVE 2 + static void -set_clone_restart_commands (SessionClient * session_client) +set_property_from_command (SessionClient * session_client, char *command, + gchar **ptr, gint alter_sm_id) { SmProp prop, *props[1]; - gchar **ptr, **args; - gint i = 0; + gchar **args; + gint i; gint argc; SmPropValue *vals; - if ((ptr = session_client->restart_command)) - { - gboolean have_sm_id = FALSE; + if (!ptr) + return; - /* Restart */ - ptr = session_client->restart_command; - args = ptr; - i = 0; - for (argc = 0; *ptr; ptr++) + args = ptr; + for (argc = 0; *args; args++) + { + if (alter_sm_id == APPEND && + !g_ascii_strncasecmp (*args, SM_ID_ARG, strlen (SM_ID_ARG))) { - if (!g_ascii_strncasecmp (*ptr, SM_ID_ARG, strlen (SM_ID_ARG))) - { - have_sm_id = TRUE; - } - argc++; + alter_sm_id = FALSE; } - if (!have_sm_id) + argc++; + } + if (alter_sm_id == APPEND) + { + argc += 2; + } + vals = g_new (SmPropValue, argc); + + i = 0; + while (*ptr) + { + if (alter_sm_id == REMOVE && + !g_ascii_strncasecmp (*ptr, SM_ID_ARG, strlen (SM_ID_ARG))) { - argc += 2; + /* skip the argument after SM_ID_ARG */ + if (ptr[1] != NULL) + ptr++; } - vals = g_new (SmPropValue, argc); - ptr = args; - while (*ptr) + else { vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; + vals[i++].value = *ptr; } - if (!have_sm_id) - { - vals[i].length = strlen (SM_ID_ARG); - vals[i++].value = SM_ID_ARG; - vals[i].length = strlen (session_client->given_client_id); - vals[i++].value = session_client->given_client_id; - } - prop.name = SmRestartCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; - - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (vals); + ptr++; } - /* Clone */ - if ((ptr = - session_client->clone_command ? session_client-> - clone_command : session_client->restart_command)) + if (alter_sm_id == APPEND) { - args = ptr; - for (argc = 0; *ptr; ptr++) - argc++; - vals = g_new (SmPropValue, argc); - ptr = args; - i = 0; - while (*ptr) - { - vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; - } + vals[i].length = strlen (SM_ID_ARG); + vals[i++].value = SM_ID_ARG; + vals[i].length = strlen (session_client->given_client_id); + vals[i++].value = session_client->given_client_id; + } - prop.name = SmCloneCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; + prop.name = command; + prop.type = SmLISTofARRAY8; + prop.vals = vals; + prop.num_vals = i; - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (vals); - } + props[0] = ∝ + SmcSetProperties ((SmcConn) session_client->session_connection, 1, props); + g_free (vals); +} - /* Resign */ - if ((ptr = session_client->resign_command)) - { - args = ptr; - for (argc = 0; *ptr; ptr++) - argc++; - vals = g_new (SmPropValue, argc); - ptr = args; - i = 0; - while (*ptr) - { - vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; - } +static void +set_clone_restart_commands (SessionClient * session_client) +{ + /* Restart */ + set_property_from_command (session_client, SmRestartCommand, + session_client->restart_command, APPEND); - prop.name = SmResignCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; + /* Clone */ + set_property_from_command (session_client, SmCloneCommand, + session_client->clone_command ? + session_client->clone_command : + session_client->restart_command, REMOVE); - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (prop.vals); - } + /* Resign */ + set_property_from_command (session_client, SmResignCommand, + session_client->resign_command, FALSE); /* Discard */ - if ((ptr = session_client->discard_command)) - { - args = ptr; - for (argc = 0; *ptr; ptr++) - argc++; - vals = g_new (SmPropValue, argc); - ptr = args; - i = 0; - while (*ptr) - { - vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; - } + set_property_from_command (session_client, SmDiscardCommand, + session_client->discard_command, FALSE); - prop.name = SmDiscardCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; + /* Shutdown */ + set_property_from_command (session_client, SmShutdownCommand, + session_client->shutdown_command, FALSE); +} - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (prop.vals); - } +#undef APPEND +#undef REMOVE - /* Shutdown */ - if ((ptr = session_client->shutdown_command)) - { - args = ptr; - for (argc = 0; *ptr; ptr++) - argc++; - vals = g_new (SmPropValue, argc); - ptr = args; - i = 0; - while (*ptr) - { - vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; - } +#endif - prop.name = SmShutdownCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; +static gchar** safe_strvdup(gchar ** const source) +{ + int count; + int i; + gchar** result; + + if (source == NULL) { + return NULL; + } - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (prop.vals); + count = g_strv_length((gchar **)source); + result = g_new0(gchar*, count + 1); + + for (i = 0; i < count; ++i) { + result[i] = g_strdup(source[i]); } + + result[count] = NULL; + return result; } -#endif SessionClient * client_session_new_full (gpointer data, SessionRestartStyle restart_style, @@ -759,11 +717,11 @@ client_session_new_full (gpointer data, SessionRestartStyle restart_style, { session_client->current_directory = g_strdup (g_get_home_dir ()); } - session_client->clone_command = clone_command; - session_client->resign_command = resign_command; - session_client->restart_command = restart_command; - session_client->discard_command = discard_command; - session_client->shutdown_command = shutdown_command; + session_client->clone_command = safe_strvdup (clone_command); + session_client->resign_command = safe_strvdup (resign_command); + session_client->restart_command = safe_strvdup (restart_command); + session_client->discard_command = safe_strvdup (discard_command); + session_client->shutdown_command = safe_strvdup (shutdown_command); session_client->shutdown = FALSE; session_client->save_phase_2 = NULL; @@ -781,7 +739,7 @@ client_session_new (gint argc, gchar * argv[], gpointer data, SessionRestartStyle restart_style, gchar priority) { SessionClient *session_client; - gchar **array; + gchar **array, **args; gchar *client_id = NULL; gboolean next_is_client_id = FALSE, had_display = FALSE; GdkDisplay *dpy = gdk_display_get_default(); @@ -795,39 +753,41 @@ client_session_new (gint argc, gchar * argv[], gpointer data, } else { - array = g_new (gchar *, argc + 3); - i = 0; + array = args = g_new (gchar *, argc + 3); - while (i < argc) + for (i = 0; i < argc; i++) { - array[i] = argv[i]; if (next_is_client_id) { client_id = argv[i]; next_is_client_id = FALSE; } - if (!g_ascii_strncasecmp (argv[i], SM_ID_ARG, strlen (SM_ID_ARG))) + else if (!g_ascii_strncasecmp (argv[i], SM_ID_ARG, strlen (SM_ID_ARG))) { next_is_client_id = TRUE; } - else if (!g_ascii_strncasecmp (argv[i], DPY_ARG, strlen (DPY_ARG))) + else { - had_display = TRUE; + if (!g_ascii_strncasecmp (argv[i], DPY_ARG, strlen (DPY_ARG))) + { + had_display = TRUE; + } + *args++ = argv[i]; } - i++; } if ((!had_display) && (dpy != NULL)) { - array[i++] = "--display"; - array[i++] = (gchar *)gdk_display_get_name(dpy); + *args++ = DPY_ARG; + *args++ = (gchar *)gdk_display_get_name(dpy); } - array[i] = NULL; + *args = NULL; } session_client = client_session_new_full (data, restart_style, priority, client_id, - NULL, NULL, array, array, NULL, NULL, NULL); + NULL, NULL, array, NULL, NULL, NULL, NULL); + g_free (array); return session_client; } @@ -837,7 +797,9 @@ void client_session_free(SessionClient * session_client) /* session_client->data; */ /* session_client->session_connection; */ - if (session_client->current_state != SESSION_CLIENT_DISCONNECTED) { + if (session_client->session_connection != NULL && + session_client->current_state != SESSION_CLIENT_DISCONNECTED) + { disconnect(session_client); } @@ -854,27 +816,6 @@ void client_session_free(SessionClient * session_client) g_free(session_client); } -static gchar** safe_strvdup(gchar ** const source) -{ - int count; - int i; - gchar** result; - - if (source == NULL) { - return NULL; - } - - count = g_strv_length((gchar **)source); - result = g_new0(gchar*, count + 1); - - for (i = 0; i < count; ++i) { - result[i] = g_strdup(source[i]); - } - - result[count] = NULL; - return result; -} - void client_session_set_save_phase_2_callback(SessionClient * session_client, save_phase_2_callback value) { session_client->save_phase_2 = value; @@ -1053,84 +994,46 @@ void client_session_set_program(SessionClient * session_client, gchar const* val #endif /* HAVE_LIBSM */ } -void client_session_set_clone_command(SessionClient * session_client, gchar** const value) +static gchar **copy_command(gchar **command, gchar** const value) { - if (session_client->clone_command == value) { - return; - } - - if (session_client->clone_command != NULL) { - g_strfreev(session_client->clone_command); - session_client->clone_command = NULL; - } + if (command != value) + { + if (command != NULL) { + g_strfreev(command); + command = NULL; + } - if (value != NULL) { - session_client->clone_command = safe_strvdup(value); + if (value != NULL) { + command = safe_strvdup(value); + } } + + return command; +} + +void client_session_set_clone_command(SessionClient * session_client, gchar** const value) +{ + session_client->clone_command = copy_command(session_client->clone_command, value); } void client_session_set_resign_command(SessionClient * session_client, gchar** const value) { - if (session_client->resign_command == value) { - return; - } - - if (session_client->resign_command != NULL) { - g_strfreev(session_client->resign_command); - session_client->resign_command = NULL; - } - - if (value != NULL) { - session_client->resign_command = safe_strvdup(value); - } + session_client->resign_command = copy_command(session_client->resign_command, value); } void client_session_set_restart_command(SessionClient * session_client, gchar** const value) { - if (session_client->restart_command == value) { - return; - } - - if (session_client->restart_command != NULL) { - g_strfreev(session_client->restart_command); - session_client->restart_command = NULL; - } - - if (value != NULL) { - session_client->restart_command = safe_strvdup(value); - } + session_client->restart_command = copy_command(session_client->restart_command, value); } void client_session_set_discard_command(SessionClient * session_client, gchar** const value) { - if (session_client->discard_command == value) { - return; - } - - if (session_client->discard_command != NULL) { - g_strfreev(session_client->discard_command); - session_client->discard_command = NULL; - } - - if (value != NULL) { - session_client->discard_command = safe_strvdup(value); - } + session_client->discard_command = copy_command(session_client->discard_command, value); } void client_session_set_shutdown_command(SessionClient * session_client, gchar** const value) { - if (session_client->shutdown_command == value) { - return; - } - - if (session_client->shutdown_command != NULL) { - g_strfreev(session_client->shutdown_command); - session_client->shutdown_command = NULL; - } - - if (value != NULL) { - session_client->shutdown_command = safe_strvdup(value); - } + session_client->shutdown_command = copy_command(session_client->shutdown_command, value); } save_phase_2_callback client_session_get_save_phase_2_callback(SessionClient * session_client) -- cgit v0.8.2.1 libxfcegui4-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch: session-client.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- NEW FILE libxfcegui4-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch --- >From 6f5cee8006a6800787e488fce36670e6aa62fa13 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Sat, 24 Oct 2009 23:23:42 +0400 Subject: [PATCH] session-client: fix SEGV inside disconnect() helper Don't call SmcCloseConnection if no connection is present: we will dereference NULL-pointer in this case and this will provoke SEGV I had seen this problem when I tried to start xfce4 settings-helper without running session manager: it whined that ----- (xfce4-settings-helper:86452): xfce4-settings-helper-WARNING **: Failed to connect to session manager ----- and dumped core afterwards. With this patch I can run the utility without session manager. May be the other clients of libxfcegui4 were affected -- don't currently know. Signed-off-by: Eygene Ryabinkin --- libxfcegui4/session-client.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libxfcegui4/session-client.c b/libxfcegui4/session-client.c index 3c63904..c9c1137 100644 --- a/libxfcegui4/session-client.c +++ b/libxfcegui4/session-client.c @@ -335,9 +335,11 @@ logout_session (SessionClient * session_client) static void disconnect (SessionClient * session_client) { - SmcCloseConnection ((SmcConn) session_client->session_connection, 0, - NULL); - session_client->session_connection = NULL; + if (session_client->session_connection != NULL) { + SmcCloseConnection ((SmcConn) session_client->session_connection, + 0, NULL); + session_client->session_connection = NULL; + } session_client->current_state = SESSION_CLIENT_DISCONNECTED; gdk_set_sm_client_id (NULL); } -- 1.6.4.4 Index: libxfcegui4.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxfcegui4/devel/libxfcegui4.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- libxfcegui4.spec 25 Jul 2009 08:57:44 -0000 1.36 +++ libxfcegui4.spec 2 Nov 2009 01:43:06 -0000 1.37 @@ -1,12 +1,18 @@ Summary: GTK widgets for Xfce Name: libxfcegui4 Version: 4.6.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/libxfcegui4-%{version}.tar.bz2 Patch0: %{name}-4.4.2-xfce-exec-use-thunar.patch -Patch1: libxfcegui4-4.6.0-keyboard-shortcuts.patch +Patch1: %{name}-4.6.0-keyboard-shortcuts.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=532179 +# upstream: http://bugzilla.xfce.org/show_bug.cgi?id=5310 +# http://git.xfce.org/xfce/libxfcegui4/commit/?h=xfce-4.6&id=caffa2a1e66f44d63ea201f186d5fd0c5337f4bf +Patch2: %{name}-4.6.1-fix-crash-in-client-session-free.patch +# http://git.xfce.org/xfce/libxfcegui4/commit/?h=xfce-4.6&id=f2053a1e2db56c3f1f92e230140de4fe6ba04f48 +Patch3: %{name}-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gtk2 >= 2.0.6 @@ -44,6 +50,8 @@ to compile applications for Xfce. %setup -q %patch0 -p1 -b .thunar %patch1 -p1 -b .shortcut +%patch2 -p1 -b .client-session-free +%patch3 -p1 -b .disconnect-helper %build %configure --enable-xinerama --disable-static @@ -66,14 +74,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/glade3/* rm -rf $RPM_BUILD_ROOT %post -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -96,6 +106,10 @@ touch --no-create %{_datadir}/icons/hico %{_datadir}/glade3/pixmaps/hicolor/*/actions/* %changelog +* Mon Nov 02 2009 Christoph Wickert - 4.6.1-3 +- Fix SEGV inside disconnect() helper (#532179) +- Update gtk-icon-cache scriptlets + * Sat Jul 25 2009 Fedora Release Engineering - 4.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From cwickert at fedoraproject.org Mon Nov 2 01:43:07 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Nov 2009 01:43:07 +0000 (UTC) Subject: rpms/libxfcegui4/F-12 libxfcegui4-4.6.1-fix-crash-in-client-session-free.patch, NONE, 1.1 libxfcegui4-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch, NONE, 1.1 libxfcegui4.spec, 1.36, 1.37 Message-ID: <20091102014307.A0C3911C0260@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/libxfcegui4/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6009/F-12 Modified Files: libxfcegui4.spec Added Files: libxfcegui4-4.6.1-fix-crash-in-client-session-free.patch libxfcegui4-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch Log Message: * Mon Nov 02 2009 Christoph Wickert - 4.6.1-3 - Fix SEGV inside disconnect() helper (#532179) - Update gtk-icon-cache scriptlets libxfcegui4-4.6.1-fix-crash-in-client-session-free.patch: session-client.c | 364 ++++++++++++++++++++----------------------------------- 1 file changed, 133 insertions(+), 231 deletions(-) --- NEW FILE libxfcegui4-4.6.1-fix-crash-in-client-session-free.patch --- >From caffa2a1e66f44d63ea201f186d5fd0c5337f4bf Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Fri, 16 Oct 2009 07:43:42 +0000 Subject: various SessionClient improvements and bug fixes * fix crash in client_session_free() * strip previous client id from passsed argv before adding the new one * fix crash when client_session_free() is called when not connected to the session manager * some refactoring to avoid code duplication --- diff --git a/libxfcegui4/session-client.c b/libxfcegui4/session-client.c index 4f036ec..3c63904 100644 --- a/libxfcegui4/session-client.c +++ b/libxfcegui4/session-client.c @@ -408,6 +408,7 @@ save_yourself_possibly_done (SessionClient * session_client) || (session_client->current_state == SESSION_CLIENT_DONE_WITH_INTERACT)) { + set_clone_restart_commands (session_client); SmcSaveYourselfDone ((SmcConn) session_client->session_connection, True); @@ -468,7 +469,6 @@ save_yourself (SmcConn smc_conn, SmPointer client_data, int save_style, } } - set_clone_restart_commands (session_client); TRACE ("save_yourself - SESSION_CLIENT_SAVING_PHASE_1"); session_client->current_state = SESSION_CLIENT_SAVING_PHASE_1; switch (interact_style) @@ -563,168 +563,126 @@ interact (SmcConn smc_conn, SmPointer client_data) save_yourself_possibly_done (session_client); } +#define APPEND 1 +#define REMOVE 2 + static void -set_clone_restart_commands (SessionClient * session_client) +set_property_from_command (SessionClient * session_client, char *command, + gchar **ptr, gint alter_sm_id) { SmProp prop, *props[1]; - gchar **ptr, **args; - gint i = 0; + gchar **args; + gint i; gint argc; SmPropValue *vals; - if ((ptr = session_client->restart_command)) - { - gboolean have_sm_id = FALSE; + if (!ptr) + return; - /* Restart */ - ptr = session_client->restart_command; - args = ptr; - i = 0; - for (argc = 0; *ptr; ptr++) + args = ptr; + for (argc = 0; *args; args++) + { + if (alter_sm_id == APPEND && + !g_ascii_strncasecmp (*args, SM_ID_ARG, strlen (SM_ID_ARG))) { - if (!g_ascii_strncasecmp (*ptr, SM_ID_ARG, strlen (SM_ID_ARG))) - { - have_sm_id = TRUE; - } - argc++; + alter_sm_id = FALSE; } - if (!have_sm_id) + argc++; + } + if (alter_sm_id == APPEND) + { + argc += 2; + } + vals = g_new (SmPropValue, argc); + + i = 0; + while (*ptr) + { + if (alter_sm_id == REMOVE && + !g_ascii_strncasecmp (*ptr, SM_ID_ARG, strlen (SM_ID_ARG))) { - argc += 2; + /* skip the argument after SM_ID_ARG */ + if (ptr[1] != NULL) + ptr++; } - vals = g_new (SmPropValue, argc); - ptr = args; - while (*ptr) + else { vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; + vals[i++].value = *ptr; } - if (!have_sm_id) - { - vals[i].length = strlen (SM_ID_ARG); - vals[i++].value = SM_ID_ARG; - vals[i].length = strlen (session_client->given_client_id); - vals[i++].value = session_client->given_client_id; - } - prop.name = SmRestartCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; - - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (vals); + ptr++; } - /* Clone */ - if ((ptr = - session_client->clone_command ? session_client-> - clone_command : session_client->restart_command)) + if (alter_sm_id == APPEND) { - args = ptr; - for (argc = 0; *ptr; ptr++) - argc++; - vals = g_new (SmPropValue, argc); - ptr = args; - i = 0; - while (*ptr) - { - vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; - } + vals[i].length = strlen (SM_ID_ARG); + vals[i++].value = SM_ID_ARG; + vals[i].length = strlen (session_client->given_client_id); + vals[i++].value = session_client->given_client_id; + } - prop.name = SmCloneCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; + prop.name = command; + prop.type = SmLISTofARRAY8; + prop.vals = vals; + prop.num_vals = i; - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (vals); - } + props[0] = ∝ + SmcSetProperties ((SmcConn) session_client->session_connection, 1, props); + g_free (vals); +} - /* Resign */ - if ((ptr = session_client->resign_command)) - { - args = ptr; - for (argc = 0; *ptr; ptr++) - argc++; - vals = g_new (SmPropValue, argc); - ptr = args; - i = 0; - while (*ptr) - { - vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; - } +static void +set_clone_restart_commands (SessionClient * session_client) +{ + /* Restart */ + set_property_from_command (session_client, SmRestartCommand, + session_client->restart_command, APPEND); - prop.name = SmResignCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; + /* Clone */ + set_property_from_command (session_client, SmCloneCommand, + session_client->clone_command ? + session_client->clone_command : + session_client->restart_command, REMOVE); - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (prop.vals); - } + /* Resign */ + set_property_from_command (session_client, SmResignCommand, + session_client->resign_command, FALSE); /* Discard */ - if ((ptr = session_client->discard_command)) - { - args = ptr; - for (argc = 0; *ptr; ptr++) - argc++; - vals = g_new (SmPropValue, argc); - ptr = args; - i = 0; - while (*ptr) - { - vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; - } + set_property_from_command (session_client, SmDiscardCommand, + session_client->discard_command, FALSE); - prop.name = SmDiscardCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; + /* Shutdown */ + set_property_from_command (session_client, SmShutdownCommand, + session_client->shutdown_command, FALSE); +} - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (prop.vals); - } +#undef APPEND +#undef REMOVE - /* Shutdown */ - if ((ptr = session_client->shutdown_command)) - { - args = ptr; - for (argc = 0; *ptr; ptr++) - argc++; - vals = g_new (SmPropValue, argc); - ptr = args; - i = 0; - while (*ptr) - { - vals[i].length = strlen (*ptr); - vals[i++].value = *ptr++; - } +#endif - prop.name = SmShutdownCommand; - prop.type = SmLISTofARRAY8; - prop.vals = vals; - prop.num_vals = argc; +static gchar** safe_strvdup(gchar ** const source) +{ + int count; + int i; + gchar** result; + + if (source == NULL) { + return NULL; + } - props[0] = ∝ - SmcSetProperties ((SmcConn) session_client->session_connection, 1, - props); - g_free (prop.vals); + count = g_strv_length((gchar **)source); + result = g_new0(gchar*, count + 1); + + for (i = 0; i < count; ++i) { + result[i] = g_strdup(source[i]); } + + result[count] = NULL; + return result; } -#endif SessionClient * client_session_new_full (gpointer data, SessionRestartStyle restart_style, @@ -759,11 +717,11 @@ client_session_new_full (gpointer data, SessionRestartStyle restart_style, { session_client->current_directory = g_strdup (g_get_home_dir ()); } - session_client->clone_command = clone_command; - session_client->resign_command = resign_command; - session_client->restart_command = restart_command; - session_client->discard_command = discard_command; - session_client->shutdown_command = shutdown_command; + session_client->clone_command = safe_strvdup (clone_command); + session_client->resign_command = safe_strvdup (resign_command); + session_client->restart_command = safe_strvdup (restart_command); + session_client->discard_command = safe_strvdup (discard_command); + session_client->shutdown_command = safe_strvdup (shutdown_command); session_client->shutdown = FALSE; session_client->save_phase_2 = NULL; @@ -781,7 +739,7 @@ client_session_new (gint argc, gchar * argv[], gpointer data, SessionRestartStyle restart_style, gchar priority) { SessionClient *session_client; - gchar **array; + gchar **array, **args; gchar *client_id = NULL; gboolean next_is_client_id = FALSE, had_display = FALSE; GdkDisplay *dpy = gdk_display_get_default(); @@ -795,39 +753,41 @@ client_session_new (gint argc, gchar * argv[], gpointer data, } else { - array = g_new (gchar *, argc + 3); - i = 0; + array = args = g_new (gchar *, argc + 3); - while (i < argc) + for (i = 0; i < argc; i++) { - array[i] = argv[i]; if (next_is_client_id) { client_id = argv[i]; next_is_client_id = FALSE; } - if (!g_ascii_strncasecmp (argv[i], SM_ID_ARG, strlen (SM_ID_ARG))) + else if (!g_ascii_strncasecmp (argv[i], SM_ID_ARG, strlen (SM_ID_ARG))) { next_is_client_id = TRUE; } - else if (!g_ascii_strncasecmp (argv[i], DPY_ARG, strlen (DPY_ARG))) + else { - had_display = TRUE; + if (!g_ascii_strncasecmp (argv[i], DPY_ARG, strlen (DPY_ARG))) + { + had_display = TRUE; + } + *args++ = argv[i]; } - i++; } if ((!had_display) && (dpy != NULL)) { - array[i++] = "--display"; - array[i++] = (gchar *)gdk_display_get_name(dpy); + *args++ = DPY_ARG; + *args++ = (gchar *)gdk_display_get_name(dpy); } - array[i] = NULL; + *args = NULL; } session_client = client_session_new_full (data, restart_style, priority, client_id, - NULL, NULL, array, array, NULL, NULL, NULL); + NULL, NULL, array, NULL, NULL, NULL, NULL); + g_free (array); return session_client; } @@ -837,7 +797,9 @@ void client_session_free(SessionClient * session_client) /* session_client->data; */ /* session_client->session_connection; */ - if (session_client->current_state != SESSION_CLIENT_DISCONNECTED) { + if (session_client->session_connection != NULL && + session_client->current_state != SESSION_CLIENT_DISCONNECTED) + { disconnect(session_client); } @@ -854,27 +816,6 @@ void client_session_free(SessionClient * session_client) g_free(session_client); } -static gchar** safe_strvdup(gchar ** const source) -{ - int count; - int i; - gchar** result; - - if (source == NULL) { - return NULL; - } - - count = g_strv_length((gchar **)source); - result = g_new0(gchar*, count + 1); - - for (i = 0; i < count; ++i) { - result[i] = g_strdup(source[i]); - } - - result[count] = NULL; - return result; -} - void client_session_set_save_phase_2_callback(SessionClient * session_client, save_phase_2_callback value) { session_client->save_phase_2 = value; @@ -1053,84 +994,46 @@ void client_session_set_program(SessionClient * session_client, gchar const* val #endif /* HAVE_LIBSM */ } -void client_session_set_clone_command(SessionClient * session_client, gchar** const value) +static gchar **copy_command(gchar **command, gchar** const value) { - if (session_client->clone_command == value) { - return; - } - - if (session_client->clone_command != NULL) { - g_strfreev(session_client->clone_command); - session_client->clone_command = NULL; - } + if (command != value) + { + if (command != NULL) { + g_strfreev(command); + command = NULL; + } - if (value != NULL) { - session_client->clone_command = safe_strvdup(value); + if (value != NULL) { + command = safe_strvdup(value); + } } + + return command; +} + +void client_session_set_clone_command(SessionClient * session_client, gchar** const value) +{ + session_client->clone_command = copy_command(session_client->clone_command, value); } void client_session_set_resign_command(SessionClient * session_client, gchar** const value) { - if (session_client->resign_command == value) { - return; - } - - if (session_client->resign_command != NULL) { - g_strfreev(session_client->resign_command); - session_client->resign_command = NULL; - } - - if (value != NULL) { - session_client->resign_command = safe_strvdup(value); - } + session_client->resign_command = copy_command(session_client->resign_command, value); } void client_session_set_restart_command(SessionClient * session_client, gchar** const value) { - if (session_client->restart_command == value) { - return; - } - - if (session_client->restart_command != NULL) { - g_strfreev(session_client->restart_command); - session_client->restart_command = NULL; - } - - if (value != NULL) { - session_client->restart_command = safe_strvdup(value); - } + session_client->restart_command = copy_command(session_client->restart_command, value); } void client_session_set_discard_command(SessionClient * session_client, gchar** const value) { - if (session_client->discard_command == value) { - return; - } - - if (session_client->discard_command != NULL) { - g_strfreev(session_client->discard_command); - session_client->discard_command = NULL; - } - - if (value != NULL) { - session_client->discard_command = safe_strvdup(value); - } + session_client->discard_command = copy_command(session_client->discard_command, value); } void client_session_set_shutdown_command(SessionClient * session_client, gchar** const value) { - if (session_client->shutdown_command == value) { - return; - } - - if (session_client->shutdown_command != NULL) { - g_strfreev(session_client->shutdown_command); - session_client->shutdown_command = NULL; - } - - if (value != NULL) { - session_client->shutdown_command = safe_strvdup(value); - } + session_client->shutdown_command = copy_command(session_client->shutdown_command, value); } save_phase_2_callback client_session_get_save_phase_2_callback(SessionClient * session_client) -- cgit v0.8.2.1 libxfcegui4-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch: session-client.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- NEW FILE libxfcegui4-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch --- >From 6f5cee8006a6800787e488fce36670e6aa62fa13 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Sat, 24 Oct 2009 23:23:42 +0400 Subject: [PATCH] session-client: fix SEGV inside disconnect() helper Don't call SmcCloseConnection if no connection is present: we will dereference NULL-pointer in this case and this will provoke SEGV I had seen this problem when I tried to start xfce4 settings-helper without running session manager: it whined that ----- (xfce4-settings-helper:86452): xfce4-settings-helper-WARNING **: Failed to connect to session manager ----- and dumped core afterwards. With this patch I can run the utility without session manager. May be the other clients of libxfcegui4 were affected -- don't currently know. Signed-off-by: Eygene Ryabinkin --- libxfcegui4/session-client.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libxfcegui4/session-client.c b/libxfcegui4/session-client.c index 3c63904..c9c1137 100644 --- a/libxfcegui4/session-client.c +++ b/libxfcegui4/session-client.c @@ -335,9 +335,11 @@ logout_session (SessionClient * session_client) static void disconnect (SessionClient * session_client) { - SmcCloseConnection ((SmcConn) session_client->session_connection, 0, - NULL); - session_client->session_connection = NULL; + if (session_client->session_connection != NULL) { + SmcCloseConnection ((SmcConn) session_client->session_connection, + 0, NULL); + session_client->session_connection = NULL; + } session_client->current_state = SESSION_CLIENT_DISCONNECTED; gdk_set_sm_client_id (NULL); } -- 1.6.4.4 Index: libxfcegui4.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxfcegui4/F-12/libxfcegui4.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- libxfcegui4.spec 25 Jul 2009 08:57:44 -0000 1.36 +++ libxfcegui4.spec 2 Nov 2009 01:43:05 -0000 1.37 @@ -1,12 +1,18 @@ Summary: GTK widgets for Xfce Name: libxfcegui4 Version: 4.6.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/libxfcegui4-%{version}.tar.bz2 Patch0: %{name}-4.4.2-xfce-exec-use-thunar.patch -Patch1: libxfcegui4-4.6.0-keyboard-shortcuts.patch +Patch1: %{name}-4.6.0-keyboard-shortcuts.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=532179 +# upstream: http://bugzilla.xfce.org/show_bug.cgi?id=5310 +# http://git.xfce.org/xfce/libxfcegui4/commit/?h=xfce-4.6&id=caffa2a1e66f44d63ea201f186d5fd0c5337f4bf +Patch2: %{name}-4.6.1-fix-crash-in-client-session-free.patch +# http://git.xfce.org/xfce/libxfcegui4/commit/?h=xfce-4.6&id=f2053a1e2db56c3f1f92e230140de4fe6ba04f48 +Patch3: %{name}-4.6.1-session-client-fix-SEGV-inside-disconnect-helper.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gtk2 >= 2.0.6 @@ -44,6 +50,8 @@ to compile applications for Xfce. %setup -q %patch0 -p1 -b .thunar %patch1 -p1 -b .shortcut +%patch2 -p1 -b .client-session-free +%patch3 -p1 -b .disconnect-helper %build %configure --enable-xinerama --disable-static @@ -66,14 +74,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/glade3/* rm -rf $RPM_BUILD_ROOT %post -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -96,6 +106,10 @@ touch --no-create %{_datadir}/icons/hico %{_datadir}/glade3/pixmaps/hicolor/*/actions/* %changelog +* Mon Nov 02 2009 Christoph Wickert - 4.6.1-3 +- Fix SEGV inside disconnect() helper (#532179) +- Update gtk-icon-cache scriptlets + * Sat Jul 25 2009 Fedora Release Engineering - 4.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From nucleo at fedoraproject.org Mon Nov 2 02:52:39 2009 From: nucleo at fedoraproject.org (nucleo) Date: Mon, 2 Nov 2009 02:52:39 +0000 (UTC) Subject: comps comps-f10.xml.in, 1.291, 1.292 comps-f11.xml.in, 1.325, 1.326 comps-f12.xml.in, 1.181, 1.182 comps-f13.xml.in, 1.70, 1.71 Message-ID: <20091102025239.B65D311C00EE@cvs1.fedora.phx.redhat.com> Author: nucleo Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24557 Modified Files: comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in Log Message: Added kde-plasma-yawp and qt-creator to F10, F11, F12 and F13 Placed to right place kde-colorscheme-plastik and netstat-nat Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.291 retrieving revision 1.292 diff -u -p -r1.291 -r1.292 --- comps-f10.xml.in 1 Nov 2009 13:30:17 -0000 1.291 +++ comps-f10.xml.in 2 Nov 2009 02:52:38 -0000 1.292 @@ -3053,6 +3053,8 @@ kchmviewer kcoloredit kcometen4 + kde-colorscheme-plastik + kde-plasma-yawp kdeadmin kdeartwork-screensavers kdeartwork-sounds @@ -3061,7 +3063,6 @@ kdebase-workspace-python-applet kdebase-workspace-wallpapers kdeclassic-icon-theme - kde-colorscheme-plastik kdeedu kdetoys kdissert @@ -3142,6 +3143,7 @@ PyKDE-devel PyKDE4-devel PyQt-devel + qt-creator @@ -4542,8 +4544,8 @@ munin nagios net-snmp-utils - netstat-nat netgo + netstat-nat nfswatch nmap-frontend nomarch Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.325 retrieving revision 1.326 diff -u -p -r1.325 -r1.326 --- comps-f11.xml.in 1 Nov 2009 13:30:17 -0000 1.325 +++ comps-f11.xml.in 2 Nov 2009 02:52:38 -0000 1.326 @@ -3506,6 +3506,8 @@ kchmviewer kcoloredit kcometen4 + kde-colorscheme-plastik + kde-plasma-yawp kdeadmin kdeartwork kdeartwork-sounds @@ -3514,7 +3516,6 @@ kdebase-workspace-python-applet kdebase-workspace-wallpapers kdeclassic-icon-theme - kde-colorscheme-plastik kdeedu kdetoys kdissert @@ -3588,6 +3589,7 @@ krazy2 PyKDE-devel PyQt-devel + qt-creator @@ -5264,8 +5266,8 @@ munin nagios net-snmp-utils - netstat-nat netgo + netstat-nat nfswatch nmap-frontend nomarch Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.181 retrieving revision 1.182 diff -u -p -r1.181 -r1.182 --- comps-f12.xml.in 1 Nov 2009 13:30:18 -0000 1.181 +++ comps-f12.xml.in 2 Nov 2009 02:52:38 -0000 1.182 @@ -3724,8 +3724,10 @@ kchmviewer kcoloredit kcometen4 + kde-colorscheme-plastik kde-plasma-ktorrent kde-plasma-networkmanagement + kde-plasma-yawp kdeadmin kdeartwork kdeartwork-sounds @@ -3733,7 +3735,6 @@ kdebase-workspace-googlegadgets kdebase-workspace-wallpapers kdeclassic-icon-theme - kde-colorscheme-plastik kdeedu kdetoys kdissert @@ -3808,6 +3809,7 @@ krazy2 PyKDE-devel PyQt-devel + qt-creator @@ -5533,8 +5535,8 @@ munin nagios net-snmp-utils - netstat-nat netgo + netstat-nat nfswatch nmap-frontend nomarch Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- comps-f13.xml.in 1 Nov 2009 13:30:18 -0000 1.70 +++ comps-f13.xml.in 2 Nov 2009 02:52:38 -0000 1.71 @@ -3704,8 +3704,10 @@ kchmviewer kcoloredit kcometen4 + kde-colorscheme-plastik kde-plasma-ktorrent kde-plasma-networkmanagement + kde-plasma-yawp kdeadmin kdeartwork kdeartwork-sounds @@ -3713,7 +3715,6 @@ kdebase-workspace-googlegadgets kdebase-workspace-wallpapers kdeclassic-icon-theme - kde-colorscheme-plastik kdeedu kdetoys kdissert @@ -3788,6 +3789,7 @@ krazy2 PyKDE-devel PyQt-devel + qt-creator @@ -5498,8 +5500,8 @@ munin nagios net-snmp-utils - netstat-nat netgo + netstat-nat nfswatch nmap-frontend nomarch From airlied at fedoraproject.org Mon Nov 2 03:04:05 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Mon, 2 Nov 2009 03:04:05 +0000 (UTC) Subject: rpms/kernel/F-12 drm-kms-r600-maybe-fix.patch, NONE, 1.1 kernel.spec, 1.1891, 1.1892 Message-ID: <20091102030405.3ED7911C00EE@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27970 Modified Files: kernel.spec Added Files: drm-kms-r600-maybe-fix.patch Log Message: * Mon Nov 02 2009 Dave Airlie 2.6.31.5-106 - r600: ring size guesswork fix. drm-kms-r600-maybe-fix.patch: r600.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE drm-kms-r600-maybe-fix.patch --- diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index e87475c..4192e40 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1271,7 +1271,7 @@ int r600_cp_resume(struct radeon_device *rdev) WREG32(GRBM_SOFT_RESET, 0); /* Set ring buffer size */ - rb_bufsz = drm_order(rdev->cp.ring_size / 8); + rb_bufsz = drm_order(rdev->cp.ring_size / 8) - 1; #ifdef __BIG_ENDIAN WREG32(CP_RB_CNTL, BUF_SWAP_32BIT | RB_NO_UPDATE | (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v retrieving revision 1.1891 retrieving revision 1.1892 diff -u -p -r1.1891 -r1.1892 --- kernel.spec 30 Oct 2009 04:14:20 -0000 1.1891 +++ kernel.spec 2 Nov 2009 03:04:03 -0000 1.1892 @@ -697,6 +697,7 @@ Patch1825: drm-intel-pm.patch Patch1826: drm-intel-no-tv-hotplug.patch Patch1827: drm-disable-r600-aspm.patch Patch1828: drm-radeon-agp-font-fix.patch +Patch1829: drm-kms-r600-maybe-fix.patch # vga arb Patch1900: linux-2.6-vga-arb.patch @@ -1382,6 +1383,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch ApplyPatch kms-offb-handoff.patch ApplyPatch drm-next-ea1495a6.patch ApplyPatch drm-radeon-agp-font-fix.patch +ApplyPatch drm-kms-r600-maybe-fix.patch ApplyPatch drm-nouveau.patch # pm broken on my thinkpad t60p - airlied @@ -2104,6 +2106,9 @@ fi # and build. %changelog +* Mon Nov 02 2009 Dave Airlie 2.6.31.5-106 +- r600: ring size guesswork fix. + * Fri Oct 30 2009 Dave Airlie 2.6.31.5-105 - drm-radeon-agp-font-fix.patch: hopefully fix AGP coherency issue From wtogami at fedoraproject.org Mon Nov 2 03:37:21 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Mon, 2 Nov 2009 03:37:21 +0000 (UTC) Subject: rpms/perl-Razor-Agent/devel razor-agents-2.85-use-sha-not-sha1.patch, NONE, 1.1 perl-Razor-Agent.spec, 1.21, 1.22 Message-ID: <20091102033722.3BE0111C00EE@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/perl-Razor-Agent/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6068 Modified Files: perl-Razor-Agent.spec Added Files: razor-agents-2.85-use-sha-not-sha1.patch Log Message: Use Digest::SHA instead of Digest::SHA1 razor-agents-2.85-use-sha-not-sha1.patch: Client/Engine.pm | 1 - Signature/Ephemeral.pm | 14 +++++++------- Signature/Whiplash.pm | 14 ++++++-------- String.pm | 17 +++++++---------- 4 files changed, 20 insertions(+), 26 deletions(-) --- NEW FILE razor-agents-2.85-use-sha-not-sha1.patch --- diff -urN razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm razor-agents-2.85/lib/Razor2/Client/Engine.pm --- razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm 2005-06-13 19:42:25.000000000 -0400 +++ razor-agents-2.85/lib/Razor2/Client/Engine.pm 2009-11-01 13:45:08.125369192 -0500 @@ -1,7 +1,6 @@ package Razor2::Client::Engine; use strict; -use Digest::SHA1 qw(sha1_hex); use Data::Dumper; use Razor2::Signature::Ephemeral; use Razor2::Engine::VR8; diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm --- razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm 2003-03-03 18:09:50.000000000 -0500 +++ razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm 2009-11-01 13:45:08.125369192 -0500 @@ -2,9 +2,13 @@ package Razor2::Signature::Ephemeral; use strict; -use Digest::SHA1; use Data::Dumper; +BEGIN { + eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } + or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } +} + sub new { my ($class, %args) = @_; @@ -86,16 +90,12 @@ } my $digest; - my $ctx = Digest::SHA1->new; if ($seclength > 128) { - $ctx->add($section1); - $ctx->add($section2); - $digest = $ctx->hexdigest; + $digest = sha1_hex($section1, $section2); } else { debug("Sections too small... reverting back to orginal content."); - $ctx->add($content); - $digest = $ctx->hexdigest; + $digest = sha1_hex($content); } debug("Computed e-hash is $digest"); diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm --- razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm 2007-05-08 18:22:36.000000000 -0400 +++ razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm 2009-11-01 13:45:08.124368017 -0500 @@ -7,7 +7,10 @@ package Razor2::Signature::Whiplash; -use Digest::SHA1; +BEGIN { + eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } + or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } +} sub new { @@ -683,13 +686,8 @@ # the value of length to the nearest multiple of ``length_error''. # Take the first 20 hex chars from SHA1 and call it the signature. - my $sha1 = Digest::SHA1->new(); - - $sha1->add($host); - $sig = substr $sha1->hexdigest, 0, 12; - - $sha1->add($corrected_length); - $sig .= substr $sha1->hexdigest, 0, 4; + $sig = substr sha1_hex($host), 0, 12; + $sig .= substr sha1_hex($corrected_length), 0, 4; push @sigs, $sig; $sig_meta{$sig} = [$host, $corrected_length]; diff -urN razor-agents-2.85.orig/lib/Razor2/String.pm razor-agents-2.85/lib/Razor2/String.pm --- razor-agents-2.85.orig/lib/Razor2/String.pm 2005-06-13 17:09:59.000000000 -0400 +++ razor-agents-2.85/lib/Razor2/String.pm 2009-11-01 13:45:08.123368518 -0500 @@ -1,11 +1,15 @@ # $Id: String.pm,v 1.48 2005/06/13 21:09:59 vipul Exp $ package Razor2::String; -use Digest::SHA1 qw(sha1_hex); use URI::Escape; use Razor2::Preproc::enBase64; use Data::Dumper; +BEGIN { + eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } + or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } +} + #use MIME::Parser; require Exporter; @@ -69,15 +73,8 @@ return unless $text && $iv1 && $iv2; die "no ref's allowed" if ref($text); - my $ctx = Digest::SHA1->new; - $ctx->add($iv2); - $ctx->add($text); - my $digest = $ctx->hexdigest; - - $ctx = Digest::SHA1->new; - $ctx->add($iv1); - $ctx->add($digest); - $digest = $ctx->hexdigest; + my $digest = sha1_hex($iv2, $text); + $digest = sha1_hex($iv1, $digest); return (hextobase64($digest), $digest); } Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- perl-Razor-Agent.spec 26 Jul 2009 16:20:15 -0000 1.21 +++ perl-Razor-Agent.spec 2 Nov 2009 03:37:20 -0000 1.22 @@ -1,11 +1,12 @@ Summary: Use a Razor catalogue server to filter spam messages Name: perl-Razor-Agent Version: 2.85 -Release: 3%{?dist} +Release: 4%{?dist} License: Artistic 2.0 Group: Applications/Internet URL: http://razor.sourceforge.net/ Source: http://dl.sourceforge.net/razor/razor-agents-%{version}.tar.bz2 +Patch0: razor-agents-2.85-use-sha-not-sha1.patch Requires: perl(Net::DNS), perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Net::DNS), perl(Digest::SHA1), perl(Time::HiRes), perl(URI), perl(ExtUtils::MakeMaker) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +29,7 @@ Agents on the network. %prep %setup -q -n razor-agents-%{version} +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Sun Nov 01 2009 Warren Togami - 2.85-4 +- Use Digest::SHA instead of Digest::SHA1 + * Sun Jul 26 2009 Fedora Release Engineering - 2.85-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From wtogami at fedoraproject.org Mon Nov 2 03:39:36 2009 From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=) Date: Mon, 2 Nov 2009 03:39:36 +0000 (UTC) Subject: rpms/perl-Razor-Agent/F-12 razor-agents-2.85-use-sha-not-sha1.patch, NONE, 1.1 perl-Razor-Agent.spec, 1.21, 1.22 Message-ID: <20091102033936.632ED11C00EE@cvs1.fedora.phx.redhat.com> Author: wtogami Update of /cvs/pkgs/rpms/perl-Razor-Agent/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6617 Modified Files: perl-Razor-Agent.spec Added Files: razor-agents-2.85-use-sha-not-sha1.patch Log Message: Use Digest::SHA instead of Digest::SHA1 razor-agents-2.85-use-sha-not-sha1.patch: Client/Engine.pm | 1 - Signature/Ephemeral.pm | 14 +++++++------- Signature/Whiplash.pm | 14 ++++++-------- String.pm | 17 +++++++---------- 4 files changed, 20 insertions(+), 26 deletions(-) --- NEW FILE razor-agents-2.85-use-sha-not-sha1.patch --- diff -urN razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm razor-agents-2.85/lib/Razor2/Client/Engine.pm --- razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm 2005-06-13 19:42:25.000000000 -0400 +++ razor-agents-2.85/lib/Razor2/Client/Engine.pm 2009-11-01 13:45:08.125369192 -0500 @@ -1,7 +1,6 @@ package Razor2::Client::Engine; use strict; -use Digest::SHA1 qw(sha1_hex); use Data::Dumper; use Razor2::Signature::Ephemeral; use Razor2::Engine::VR8; diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm --- razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm 2003-03-03 18:09:50.000000000 -0500 +++ razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm 2009-11-01 13:45:08.125369192 -0500 @@ -2,9 +2,13 @@ package Razor2::Signature::Ephemeral; use strict; -use Digest::SHA1; use Data::Dumper; +BEGIN { + eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } + or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } +} + sub new { my ($class, %args) = @_; @@ -86,16 +90,12 @@ } my $digest; - my $ctx = Digest::SHA1->new; if ($seclength > 128) { - $ctx->add($section1); - $ctx->add($section2); - $digest = $ctx->hexdigest; + $digest = sha1_hex($section1, $section2); } else { debug("Sections too small... reverting back to orginal content."); - $ctx->add($content); - $digest = $ctx->hexdigest; + $digest = sha1_hex($content); } debug("Computed e-hash is $digest"); diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm --- razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm 2007-05-08 18:22:36.000000000 -0400 +++ razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm 2009-11-01 13:45:08.124368017 -0500 @@ -7,7 +7,10 @@ package Razor2::Signature::Whiplash; -use Digest::SHA1; +BEGIN { + eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } + or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } +} sub new { @@ -683,13 +686,8 @@ # the value of length to the nearest multiple of ``length_error''. # Take the first 20 hex chars from SHA1 and call it the signature. - my $sha1 = Digest::SHA1->new(); - - $sha1->add($host); - $sig = substr $sha1->hexdigest, 0, 12; - - $sha1->add($corrected_length); - $sig .= substr $sha1->hexdigest, 0, 4; + $sig = substr sha1_hex($host), 0, 12; + $sig .= substr sha1_hex($corrected_length), 0, 4; push @sigs, $sig; $sig_meta{$sig} = [$host, $corrected_length]; diff -urN razor-agents-2.85.orig/lib/Razor2/String.pm razor-agents-2.85/lib/Razor2/String.pm --- razor-agents-2.85.orig/lib/Razor2/String.pm 2005-06-13 17:09:59.000000000 -0400 +++ razor-agents-2.85/lib/Razor2/String.pm 2009-11-01 13:45:08.123368518 -0500 @@ -1,11 +1,15 @@ # $Id: String.pm,v 1.48 2005/06/13 21:09:59 vipul Exp $ package Razor2::String; -use Digest::SHA1 qw(sha1_hex); use URI::Escape; use Razor2::Preproc::enBase64; use Data::Dumper; +BEGIN { + eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 } + or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) } +} + #use MIME::Parser; require Exporter; @@ -69,15 +73,8 @@ return unless $text && $iv1 && $iv2; die "no ref's allowed" if ref($text); - my $ctx = Digest::SHA1->new; - $ctx->add($iv2); - $ctx->add($text); - my $digest = $ctx->hexdigest; - - $ctx = Digest::SHA1->new; - $ctx->add($iv1); - $ctx->add($digest); - $digest = $ctx->hexdigest; + my $digest = sha1_hex($iv2, $text); + $digest = sha1_hex($iv1, $digest); return (hextobase64($digest), $digest); } Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Razor-Agent/F-12/perl-Razor-Agent.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- perl-Razor-Agent.spec 26 Jul 2009 16:20:15 -0000 1.21 +++ perl-Razor-Agent.spec 2 Nov 2009 03:39:34 -0000 1.22 @@ -1,11 +1,12 @@ Summary: Use a Razor catalogue server to filter spam messages Name: perl-Razor-Agent Version: 2.85 -Release: 3%{?dist} +Release: 4%{?dist} License: Artistic 2.0 Group: Applications/Internet URL: http://razor.sourceforge.net/ Source: http://dl.sourceforge.net/razor/razor-agents-%{version}.tar.bz2 +Patch0: razor-agents-2.85-use-sha-not-sha1.patch Requires: perl(Net::DNS), perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Net::DNS), perl(Digest::SHA1), perl(Time::HiRes), perl(URI), perl(ExtUtils::MakeMaker) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +29,7 @@ Agents on the network. %prep %setup -q -n razor-agents-%{version} +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Sun Nov 01 2009 Warren Togami - 2.85-4 +- Use Digest::SHA instead of Digest::SHA1 + * Sun Jul 26 2009 Fedora Release Engineering - 2.85-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rlandmann at fedoraproject.org Mon Nov 2 03:59:11 2009 From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=) Date: Mon, 2 Nov 2009 03:59:11 +0000 (UTC) Subject: rpms/publican/devel .cvsignore, 1.12, 1.13 import.log, 1.1, 1.2 publican.spec, 1.28, 1.29 sources, 1.13, 1.14 Message-ID: <20091102035911.55CFE11C00EE@cvs1.fedora.phx.redhat.com> Author: rlandmann Update of /cvs/pkgs/rpms/publican/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12546/devel Modified Files: .cvsignore import.log publican.spec sources Log Message: * Mon Nov 2 2009 Jeff Fearn 1.1-0 - Fix brew failure. BZ #532383 - Fix distributed sets no packaging properly. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 31 Oct 2009 23:33:40 -0000 1.12 +++ .cvsignore 2 Nov 2009 03:59:08 -0000 1.13 @@ -1 +1 @@ -Publican-1.0.tar.gz +Publican-1.1.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 31 Oct 2009 23:33:40 -0000 1.1 +++ import.log 2 Nov 2009 03:59:09 -0000 1.2 @@ -1 +1,2 @@ publican-1_0-0_fc11:HEAD:publican-1.0-0.fc11.src.rpm:1257031816 +publican-1_1-0_fc11:HEAD:publican-1.1-0.fc11.src.rpm:1257134206 Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- publican.spec 31 Oct 2009 23:33:40 -0000 1.28 +++ publican.spec 2 Nov 2009 03:59:09 -0000 1.29 @@ -13,7 +13,7 @@ # TODO after beta revert to lower case name Name: publican -Version: 1.0 +Version: 1.1 Release: 0%{?dist} Summary: Common files and scripts for publishing with DocBook XML # For a breakdown of the licensing, refer to LICENSE @@ -186,11 +186,15 @@ rm -rf $RPM_BUILD_ROOT %files doc %defattr(-,root,root,-) -%doc Users_Guide/publish/* +%doc Users_Guide/publish/desktop/* %{_datadir}/applications/%{my_vendor}-%{name}.desktop %doc fdl.txt %changelog +* Mon Nov 2 2009 Jeff Fearn 1.1-0 +- Fix brew failure. BZ #532383 +- Fix distributed sets no packaging properly. + * Mon Oct 26 2009 Jeff Fearn 1.0-0 - Add base langauge summary & descriptions to translated spec file. BZ #515573 - Fix translated package build failure. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/publican/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 31 Oct 2009 23:33:40 -0000 1.13 +++ sources 2 Nov 2009 03:59:09 -0000 1.14 @@ -1 +1 @@ -1c0b735fd5ba7fe7487d0e88ae894f01 Publican-1.0.tar.gz +2a27f069ef259da30ebda56fbabad36e Publican-1.1.tar.gz From rlandmann at fedoraproject.org Mon Nov 2 04:02:58 2009 From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=) Date: Mon, 2 Nov 2009 04:02:58 +0000 (UTC) Subject: rpms/publican/F-12 .cvsignore, 1.12, 1.13 import.log, 1.1, 1.2 publican.spec, 1.28, 1.29 sources, 1.13, 1.14 Message-ID: <20091102040258.82F8E11C00E8@cvs1.fedora.phx.redhat.com> Author: rlandmann Update of /cvs/pkgs/rpms/publican/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13746/F-12 Modified Files: .cvsignore import.log publican.spec sources Log Message: * Mon Nov 2 2009 Jeff Fearn 1.1-0 - Fix brew failure. BZ #532383 - Fix distributed sets no packaging properly. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-12/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 1 Nov 2009 03:51:38 -0000 1.12 +++ .cvsignore 2 Nov 2009 04:02:57 -0000 1.13 @@ -1 +1 @@ -Publican-1.0.tar.gz +Publican-1.1.tar.gz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-12/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- import.log 1 Nov 2009 03:51:38 -0000 1.1 +++ import.log 2 Nov 2009 04:02:57 -0000 1.2 @@ -1 +1,2 @@ publican-1_0-0_fc11:F-12:publican-1.0-0.fc11.src.rpm:1257047363 +publican-1_1-0_fc11:F-12:publican-1.1-0.fc11.src.rpm:1257134462 Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-12/publican.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- publican.spec 1 Nov 2009 03:51:38 -0000 1.28 +++ publican.spec 2 Nov 2009 04:02:57 -0000 1.29 @@ -13,7 +13,7 @@ # TODO after beta revert to lower case name Name: publican -Version: 1.0 +Version: 1.1 Release: 0%{?dist} Summary: Common files and scripts for publishing with DocBook XML # For a breakdown of the licensing, refer to LICENSE @@ -186,11 +186,15 @@ rm -rf $RPM_BUILD_ROOT %files doc %defattr(-,root,root,-) -%doc Users_Guide/publish/* +%doc Users_Guide/publish/desktop/* %{_datadir}/applications/%{my_vendor}-%{name}.desktop %doc fdl.txt %changelog +* Mon Nov 2 2009 Jeff Fearn 1.1-0 +- Fix brew failure. BZ #532383 +- Fix distributed sets no packaging properly. + * Mon Oct 26 2009 Jeff Fearn 1.0-0 - Add base langauge summary & descriptions to translated spec file. BZ #515573 - Fix translated package build failure. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-12/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 1 Nov 2009 03:51:38 -0000 1.13 +++ sources 2 Nov 2009 04:02:57 -0000 1.14 @@ -1 +1 @@ -1c0b735fd5ba7fe7487d0e88ae894f01 Publican-1.0.tar.gz +2a27f069ef259da30ebda56fbabad36e Publican-1.1.tar.gz From spot at fedoraproject.org Mon Nov 2 04:10:15 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Mon, 2 Nov 2009 04:10:15 +0000 (UTC) Subject: rpms/nant/F-12 nant.spec,1.38,1.39 Message-ID: <20091102041015.3F37F11C0338@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/nant/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16188 Modified Files: nant.spec Log Message: unbootstrap Index: nant.spec =================================================================== RCS file: /cvs/pkgs/rpms/nant/F-12/nant.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- nant.spec 30 Oct 2009 16:54:16 -0000 1.38 +++ nant.spec 2 Nov 2009 04:10:13 -0000 1.39 @@ -1,12 +1,12 @@ %global debug_package %{nil} %global monodir %{_libdir} %global mlib %{_lib} -%global bootstrap 1 +%global bootstrap 0 Summary: NAnt is a build tool for Mono and .NET Name: nant Version: 0.85 -Release: 31%{?dist}.1 +Release: 32%{?dist} Epoch: 1 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz Patch0: nant-build.patch @@ -131,6 +131,9 @@ scrollkeeper-update -q || : %doc examples/* doc/help/* %changelog +* Fri Oct 30 2009 Tom "spot" Callaway - 1:0.85-32 +- aaaand, unbootstrap + * Fri Oct 30 2009 Tom "spot" Callaway - 1:0.85-31.1 - bootstrapping again From mclasen at fedoraproject.org Mon Nov 2 04:16:57 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:16:57 +0000 (UTC) Subject: rpms/epiphany-extensions/F-12 epiphany-extensions.spec,1.70,1.71 Message-ID: <20091102041657.9589811C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/epiphany-extensions/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18687 Modified Files: epiphany-extensions.spec Log Message: Don't require epiphany-devel Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-12/epiphany-extensions.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- epiphany-extensions.spec 19 Oct 2009 22:12:00 -0000 1.70 +++ epiphany-extensions.spec 2 Nov 2009 04:16:56 -0000 1.71 @@ -4,7 +4,7 @@ Name: epiphany-extensions Version: %{ephy_major}.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extensions for Epiphany, the GNOME web browser ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is @@ -24,7 +24,7 @@ BuildRequires: libtool BuildRequires: opensp-devel BuildRequires: pcre-devel -Requires: epiphany-devel >= %{ephy_min_version} +Requires: epiphany >= %{ephy_min_version} Requires: pygtk2 >= 2.11 Requires(pre): GConf2 @@ -92,6 +92,9 @@ scrollkeeper-update -q ||: %changelog +* Sun Nov 1 2009 Matthias Clasen - 2.28.1-2 +- Don't require epiphany-devel (#529624) + * Mon Oct 19 2009 Matthias Clasen - 2.28.1-1 - Update to 2.28.1 From mclasen at fedoraproject.org Mon Nov 2 04:22:13 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:22:13 +0000 (UTC) Subject: rpms/gtk2/devel allow-set-hint.patch, NONE, 1.1 compose-sequences.patch, NONE, 1.1 fresh-tooltips.patch, NONE, 1.1 icon-padding.patch, NONE, 1.1 iconview-hang.patch, NONE, 1.1 image-size-alloc.patch, NONE, 1.1 symbolic-color-parsing.patch, NONE, 1.1 toolbutton-assert.patch, NONE, 1.1 tooltip-positioning.patch, NONE, 1.1 gtk2.spec, 1.407, 1.408 appearance-crash.patch, 1.1, NONE csw-fixes.patch, 1.1, NONE dont-use-deprecated-api.patch, 1.6, NONE entry-include-fix.patch, 1.1, NONE fix-anchors.patch, 1.1, NONE gdm-background.patch, 1.1, NONE gtk-bell.patch, 1.1, NONE gtk2-fix-install.patch, 1.1, NONE gtk2-printing-nonblocking-printer-list.patch, 1.1, NONE gtk2-printing-smb-auth.patch, 1.1, NONE iconview-crash.patch, 1.1, NONE print_authentication.patch, 1.1, NONE root-event-mask.patch, 1.1, NONE set-cursor.patch, 1.2, NONE Message-ID: <20091102042213.C80F011C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gtk2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20747 Modified Files: gtk2.spec Added Files: allow-set-hint.patch compose-sequences.patch fresh-tooltips.patch icon-padding.patch iconview-hang.patch image-size-alloc.patch symbolic-color-parsing.patch toolbutton-assert.patch tooltip-positioning.patch Removed Files: appearance-crash.patch csw-fixes.patch dont-use-deprecated-api.patch entry-include-fix.patch fix-anchors.patch gdm-background.patch gtk-bell.patch gtk2-fix-install.patch gtk2-printing-nonblocking-printer-list.patch gtk2-printing-smb-auth.patch iconview-crash.patch print_authentication.patch root-event-mask.patch set-cursor.patch Log Message: Copy F12 work over allow-set-hint.patch: gtkwindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE allow-set-hint.patch --- --- gtk+-2.18.3/gtk/gtkwindow.c 2009-10-09 01:00:44.000000000 -0400 +++ hacked/gtk/gtkwindow.c 2009-10-28 11:45:33.583105288 -0400 @@ -2414,7 +2414,7 @@ GtkWindowPrivate *priv; g_return_if_fail (GTK_IS_WINDOW (window)); - g_return_if_fail (!GTK_WIDGET_VISIBLE (window)); + g_return_if_fail (!GTK_WIDGET_MAPPED (window)); priv = GTK_WINDOW_GET_PRIVATE (window); compose-sequences.patch: gtkimcontextsimple.c | 2 - gtkimcontextsimpleseqs.h | 92 ++++++++++++++++++++++++++++++----------------- 2 files changed, 61 insertions(+), 33 deletions(-) --- NEW FILE compose-sequences.patch --- >From 4eb82ed9624da58cff9dd6c348b12d35967ae3c3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 22 Oct 2009 15:25:19 +1000 Subject: [PATCH] Update compose sequences Signed-off-by: Peter Hutterer --- gtk/gtkimcontextsimple.c | 2 +- gtk/gtkimcontextsimpleseqs.h | 91 +++++++++++++++++++++++++++-------------- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 62bab7c..f36dcf5 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -61,7 +61,7 @@ struct _GtkComposeTableCompact static const GtkComposeTableCompact gtk_compose_table_compact = { gtk_compose_seqs_compact, 5, - 23, + 24, 6 }; diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h index 9e3fc29..131b3db 100644 --- a/gtk/gtkimcontextsimpleseqs.h +++ b/gtk/gtkimcontextsimpleseqs.h @@ -18,10 +18,9 @@ */ /* - * File auto-generated from script found at gtk/compose-parse.py, with the --gtk parameter, + * File auto-generated from script found at http://bugzilla.gnome.org/show_bug.cgi?id=321896 * using the input files * Input : http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=blob_plain;f=nls/en_US.UTF-8/Compose.pre - * Input : http://svn.gnome.org/viewcvs/gtk%2B/trunk/gtk/gtk-compose-lookaside.txt * Input : http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt * Input : http://www.unicode.org/Public/UNIDATA/UnicodeData.txt * @@ -68,29 +67,30 @@ */ static const guint16 gtk_compose_seqs_compact[] = { -GDK_dead_stroke, 138, 226, 235, 235, 235, -GDK_Greek_accentdieresis, 235, 239, 239, 239, 239, -GDK_dead_grave, 239, 299, 386, 598, 598, -GDK_dead_acute, 598, 664, 760, 1036, 1036, -GDK_dead_circumflex, 1036, 1176, 1176, 1376, 1376, -GDK_dead_tilde, 1376, 1458, 1521, 1661, 1661, -GDK_dead_macron, 1661, 1707, 1707, 1779, 1779, -GDK_dead_breve, 1779, 1833, 1833, 1857, 1857, -GDK_dead_abovedot, 1857, 1887, 1890, 1922, 1922, -GDK_dead_diaeresis, 1922, 2010, 2019, 2043, 2043, -GDK_dead_abovering, 2043, 2053, 2053, 2053, 2053, -GDK_dead_doubleacute, 2053, 2063, 2063, 2063, 2063, -GDK_dead_caron, 2063, 2089, 2089, 2097, 2097, -GDK_dead_cedilla, 2097, 2111, 2111, 2111, 2111, -GDK_dead_ogonek, 2111, 2121, 2121, 2121, 2121, -GDK_dead_iota, 2121, 2143, 2242, 2674, 3334, -GDK_dead_voiced_sound, 3334, 3380, 3380, 3380, 3380, -GDK_dead_semivoiced_sound, 3380, 3390, 3390, 3390, 3390, -GDK_dead_belowdot, 3390, 3400, 3400, 3416, 3416, -GDK_dead_hook, 3416, 3494, 3494, 3550, 3550, -GDK_dead_psili, 3550, 3578, 3578, 3578, 3578, -GDK_dead_dasia, 3578, 3610, 3610, 3610, 3610, -GDK_Multi_key, 3610, 3610, 9589, 13297, 15157, +GDK_dead_stroke, 144, 232, 241, 241, 241, +GDK_Greek_accentdieresis, 241, 245, 245, 245, 245, +GDK_dead_grave, 245, 307, 394, 606, 606, +GDK_dead_acute, 606, 674, 770, 1046, 1046, +GDK_dead_circumflex, 1046, 1186, 1186, 1386, 1386, +GDK_dead_tilde, 1386, 1470, 1533, 1673, 1673, +GDK_dead_macron, 1673, 1719, 1719, 1791, 1791, +GDK_dead_breve, 1791, 1845, 1845, 1869, 1869, +GDK_dead_abovedot, 1869, 1899, 1902, 1934, 1934, +GDK_dead_diaeresis, 1934, 2022, 2031, 2055, 2055, +GDK_dead_abovering, 2055, 2065, 2065, 2065, 2065, +GDK_dead_doubleacute, 2065, 2075, 2075, 2075, 2075, +GDK_dead_caron, 2075, 2121, 2121, 2129, 2129, +GDK_dead_cedilla, 2129, 2143, 2143, 2143, 2143, +GDK_dead_ogonek, 2143, 2153, 2153, 2153, 2153, +GDK_dead_iota, 2153, 2175, 2274, 2706, 3366, +GDK_dead_voiced_sound, 3366, 3412, 3412, 3412, 3412, +GDK_dead_semivoiced_sound, 3412, 3422, 3422, 3422, 3422, +GDK_dead_belowdot, 3422, 3438, 3438, 3454, 3454, +GDK_dead_hook, 3454, 3532, 3532, 3588, 3588, +GDK_dead_horn, 3588, 3598, 3598, 3598, 3598, +GDK_dead_psili, 3598, 3626, 3626, 3626, 3626, +GDK_dead_dasia, 3626, 3658, 3658, 3658, 3658, +GDK_Multi_key, 3658, 3658, 9658, 13366, 15231, GDK_space, 0x002F, GDK_2, 0x01BB, GDK_A, 0x023A, @@ -143,6 +143,7 @@ GDK_Greek_upsilon, 0x03B0, GDK_space, 0x0060, GDK_V, 0x01DB, GDK_v, 0x01DC, +GDK_nobreakspace, 0x0300, GDK_Abreve, 0x1EB0, GDK_abreve, 0x1EB1, GDK_Emacron, 0x1E14, @@ -255,6 +256,7 @@ GDK_Multi_key, GDK_macron, GDK_o, 0x1E51, GDK_space, 0x0027, GDK_V, 0x01D7, GDK_v, 0x01D8, +GDK_nobreakspace, 0x0301, GDK_Abreve, 0x1EAE, GDK_abreve, 0x1EAF, GDK_Emacron, 0x1E16, @@ -510,6 +512,7 @@ GDK_space, 0x007E, GDK_less, 0x2272, GDK_equal, 0x2243, GDK_greater, 0x2273, +GDK_nobreakspace, 0x0303, GDK_Oacute, 0x1E4C, GDK_Odiaeresis, 0x1E4E, GDK_Uacute, 0x1E78, @@ -769,6 +772,16 @@ GDK_parenleft, 0x208D, GDK_parenright, 0x208E, GDK_plus, 0x208A, GDK_minus, 0x208B, +GDK_0, 0x2080, +GDK_1, 0x2081, +GDK_2, 0x2082, +GDK_3, 0x2083, +GDK_4, 0x2084, +GDK_5, 0x2085, +GDK_6, 0x2086, +GDK_7, 0x2087, +GDK_8, 0x2088, +GDK_9, 0x2088, GDK_equal, 0x208C, GDK_V, 0x01D9, GDK_v, 0x01DA, @@ -1103,11 +1116,14 @@ GDK_kana_HI, 0x30D4, GDK_kana_FU, 0x30D7, GDK_kana_HE, 0x30DA, GDK_kana_HO, 0x30DD, +GDK_space, 0x0323, GDK_plus, 0x2A25, GDK_minus, 0x2A2A, GDK_equal, 0x2A66, +GDK_nobreakspace, 0x0323, GDK_Abreve, 0x1EB6, GDK_abreve, 0x1EB7, +GDK_dead_belowdot, 0x0323, GDK_Multi_key, GDK_plus, GDK_O, 0x1EE2, GDK_Multi_key, GDK_plus, GDK_U, 0x1EF0, GDK_Multi_key, GDK_plus, GDK_o, 0x1EE3, @@ -1165,6 +1181,11 @@ GDK_Multi_key, GDK_asciicircum, GDK_e, 0x1EC3, GDK_Multi_key, GDK_asciicircum, GDK_o, 0x1ED5, GDK_Multi_key, GDK_b, GDK_A, 0x1EB2, GDK_Multi_key, GDK_b, GDK_a, 0x1EB3, +GDK_space, 0x031B, +GDK_nobreakspace, 0x031B, +GDK_Utilde, 0x1EEE, +GDK_utilde, 0x1EEF, +GDK_dead_horn, 0x031B, GDK_Greek_ALPHA, 0x1F08, GDK_Greek_EPSILON, 0x1F18, GDK_Greek_ETA, 0x1F28, @@ -1368,7 +1389,7 @@ GDK_apostrophe, GDK_Idiaeresis, 0x1E2E, GDK_apostrophe, GDK_Ocircumflex, 0x1ED0, GDK_apostrophe, GDK_Otilde, 0x1E4C, GDK_apostrophe, GDK_Ooblique, 0x01FE, -GDK_apostrophe, 0x00DC, 0x01D7, +GDK_apostrophe, GDK_Udiaeresis, 0x01D7, GDK_apostrophe, GDK_acircumflex, 0x1EA5, GDK_apostrophe, GDK_aring, 0x01FB, GDK_apostrophe, GDK_ae, 0x01FD, @@ -1529,6 +1550,7 @@ GDK_minus, GDK_parenright, 0x007D, GDK_minus, GDK_plus, 0x00B1, GDK_minus, GDK_comma, 0x00AC, GDK_minus, GDK_colon, 0x00F7, +GDK_minus, GDK_greater, 0x2192, GDK_minus, GDK_A, 0x00C3, GDK_minus, GDK_D, 0x0110, GDK_minus, GDK_E, 0x0112, @@ -1603,6 +1625,7 @@ GDK_period, 0x1E62, 0x1E68, GDK_period, 0x1E63, 0x1E69, GDK_slash, GDK_slash, 0x005C, GDK_slash, GDK_less, 0x005C, +GDK_slash, GDK_equal, 0x2260, GDK_slash, GDK_C, 0x00A2, GDK_slash, GDK_D, 0x0110, GDK_slash, GDK_G, 0x01E4, @@ -1682,8 +1705,11 @@ GDK_semicolon, GDK_u, 0x0173, GDK_less, GDK_space, 0x02C7, GDK_less, GDK_quotedbl, 0x201C, GDK_less, GDK_apostrophe, 0x2018, +GDK_less, GDK_minus, 0x2190, GDK_less, GDK_slash, 0x005C, +GDK_less, GDK_3, 0x2665, GDK_less, GDK_less, 0x00AB, +GDK_less, GDK_equal, 0x2264, GDK_less, GDK_C, 0x010C, GDK_less, GDK_D, 0x010E, GDK_less, GDK_E, 0x011A, @@ -1703,6 +1729,7 @@ GDK_less, GDK_s, 0x0161, GDK_less, GDK_t, 0x0165, GDK_less, GDK_z, 0x017E, GDK_less, 0x0338, 0x226E, +GDK_equal, GDK_slash, 0x2260, GDK_equal, GDK_C, 0x20AC, GDK_equal, GDK_E, 0x20AC, GDK_equal, GDK_L, 0x00A3, @@ -1725,6 +1752,7 @@ GDK_equal, GDK_Cyrillic_U, 0x04F2, GDK_greater, GDK_space, 0x005E, GDK_greater, GDK_quotedbl, 0x201D, GDK_greater, GDK_apostrophe, 0x2019, +GDK_greater, GDK_equal, 0x2265, GDK_greater, GDK_greater, 0x00BB, GDK_greater, GDK_A, 0x00C2, GDK_greater, GDK_E, 0x00CA, @@ -2068,7 +2096,7 @@ GDK_underscore, GDK_Adiaeresis, 0x01DE, GDK_underscore, GDK_AE, 0x01E2, GDK_underscore, GDK_Otilde, 0x022C, GDK_underscore, GDK_Odiaeresis, 0x022A, -GDK_underscore, 0x00DC, 0x01D5, +GDK_underscore, GDK_Udiaeresis, 0x01D5, GDK_underscore, GDK_adiaeresis, 0x01DF, GDK_underscore, GDK_ae, 0x01E3, GDK_underscore, GDK_otilde, 0x022D, @@ -2128,7 +2156,7 @@ GDK_grave, GDK_y, 0x1EF3, GDK_grave, GDK_Acircumflex, 0x1EA6, GDK_grave, GDK_Ecircumflex, 0x1EC0, GDK_grave, GDK_Ocircumflex, 0x1ED2, -GDK_grave, 0x00DC, 0x01DB, +GDK_grave, GDK_Udiaeresis, 0x01DB, GDK_grave, GDK_acircumflex, 0x1EA7, GDK_grave, GDK_ecircumflex, 0x1EC1, GDK_grave, GDK_ocircumflex, 0x1ED3, @@ -2279,7 +2307,7 @@ GDK_c, GDK_t, 0x0165, GDK_c, GDK_u, 0x01D4, GDK_c, GDK_z, 0x017E, GDK_c, GDK_bar, 0x00A2, -GDK_c, 0x00DC, 0x01D9, +GDK_c, GDK_Udiaeresis, 0x01D9, GDK_c, GDK_udiaeresis, 0x01DA, GDK_c, 0x01B7, 0x01EE, GDK_c, 0x0292, 0x01EF, @@ -2517,7 +2545,7 @@ GDK_macron, GDK_Adiaeresis, 0x01DE, GDK_macron, GDK_AE, 0x01E2, GDK_macron, GDK_Otilde, 0x022C, GDK_macron, GDK_Odiaeresis, 0x022A, -GDK_macron, 0x00DC, 0x01D5, +GDK_macron, GDK_Udiaeresis, 0x01D5, GDK_macron, GDK_adiaeresis, 0x01DF, GDK_macron, GDK_ae, 0x01E3, GDK_macron, GDK_otilde, 0x022D, @@ -2586,7 +2614,7 @@ GDK_acute, GDK_Idiaeresis, 0x1E2E, GDK_acute, GDK_Ocircumflex, 0x1ED0, GDK_acute, GDK_Otilde, 0x1E4C, GDK_acute, GDK_Ooblique, 0x01FE, -GDK_acute, 0x00DC, 0x01D7, +GDK_acute, GDK_Udiaeresis, 0x01D7, GDK_acute, GDK_acircumflex, 0x1EA5, GDK_acute, GDK_aring, 0x01FB, GDK_acute, GDK_ae, 0x01FD, @@ -4320,6 +4348,7 @@ GDK_parenleft, GDK_KP_4, GDK_KP_7, GDK_parenright, 0x32BC, GDK_parenleft, GDK_KP_4, GDK_KP_8, GDK_parenright, 0x32BD, GDK_parenleft, GDK_KP_4, GDK_KP_9, GDK_parenright, 0x32BE, GDK_parenleft, GDK_KP_5, GDK_KP_0, GDK_parenright, 0x32BF, +GDK_C, GDK_C, GDK_C, GDK_P, 0x262D, GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_ALPHA, 0x1F8D, GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_ETA, 0x1F9D, GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_OMEGA, 0x1FAD, -- 1.6.5.rc2 fresh-tooltips.patch: gtktooltip.c | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- gtkwidget.c | 8 + 2 files changed, 268 insertions(+), 19 deletions(-) --- NEW FILE fresh-tooltips.patch --- diff -up gtk+-2.18.3/gtk/gtktooltip.c.fresh-tooltips gtk+-2.18.3/gtk/gtktooltip.c --- gtk+-2.18.3/gtk/gtktooltip.c.fresh-tooltips 2009-10-16 10:35:45.000000000 -0400 +++ gtk+-2.18.3/gtk/gtktooltip.c 2009-10-31 14:53:37.120183113 -0400 @@ -29,6 +29,10 @@ #include "gtkhbox.h" #include "gtkalignment.h" +#ifdef GDK_WINDOWING_X11 +#include "gdk/x11/gdkx.h" +#endif + #include "gtkalias.h" #include @@ -95,6 +99,7 @@ static void gtk_tooltip_display_cl GtkTooltip *tooltip); static void gtk_tooltip_set_last_window (GtkTooltip *tooltip, GdkWindow *window); +static void update_shape (GtkTooltip *tooltip); G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT); @@ -110,8 +115,43 @@ gtk_tooltip_class_init (GtkTooltipClass } static void +on_composited_changed (GtkWidget *window, + GtkTooltip *tooltip) +{ + update_shape (tooltip); +} + +static void +on_screen_changed (GtkWidget *window, + GdkScreen *previous, + GtkTooltip *tooltip) +{ + GdkScreen *screen; + GdkColormap *cmap; + + screen = gtk_widget_get_screen (window); + + cmap = NULL; + if (gdk_screen_is_composited (screen)) + cmap = gdk_screen_get_rgba_colormap (screen); + if (cmap == NULL) + cmap = gdk_screen_get_rgb_colormap (screen); + + gtk_widget_set_colormap (window, cmap); +} + +static void +on_realized (GtkWidget *window, + GtkTooltip *tooltip) +{ + update_shape (tooltip); +} + +static void gtk_tooltip_init (GtkTooltip *tooltip) { + GdkScreen *screen; + tooltip->timeout_id = 0; tooltip->browse_mode_timeout_id = 0; @@ -127,8 +167,12 @@ gtk_tooltip_init (GtkTooltip *tooltip) tooltip->last_window = NULL; tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP)); + + on_screen_changed (tooltip->window, NULL, tooltip); + gtk_window_set_type_hint (GTK_WINDOW (tooltip->window), GDK_WINDOW_TYPE_HINT_TOOLTIP); + gtk_widget_set_app_paintable (tooltip->window, TRUE); gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE); gtk_widget_set_name (tooltip->window, "gtk-tooltip"); @@ -145,7 +189,7 @@ gtk_tooltip_init (GtkTooltip *tooltip) gtk_widget_show (tooltip->alignment); g_signal_connect_swapped (tooltip->window, "style-set", - G_CALLBACK (gtk_tooltip_window_style_set), tooltip); + G_CALLBACK (gtk_tooltip_window_style_set), tooltip); g_signal_connect_swapped (tooltip->window, "expose-event", G_CALLBACK (gtk_tooltip_paint_window), tooltip); @@ -162,6 +206,13 @@ gtk_tooltip_init (GtkTooltip *tooltip) gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label, FALSE, FALSE, 0); + g_signal_connect (tooltip->window, "composited-changed", + G_CALLBACK (on_composited_changed), tooltip); + g_signal_connect (tooltip->window, "screen-changed", + G_CALLBACK (on_screen_changed), tooltip); + g_signal_connect (tooltip->window, "realize", + G_CALLBACK (on_realized), tooltip); + tooltip->custom_widget = NULL; } @@ -318,9 +369,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool * Since: 2.14 */ void -gtk_tooltip_set_icon_from_icon_name(GtkTooltip *tooltip, - const gchar *icon_name, - GtkIconSize size) +gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip, + const gchar *icon_name, + GtkIconSize size) { g_return_if_fail (GTK_IS_TOOLTIP (tooltip)); @@ -471,27 +522,217 @@ static void gtk_tooltip_window_style_set (GtkTooltip *tooltip) { gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment), - tooltip->window->style->ythickness, - tooltip->window->style->ythickness, - tooltip->window->style->xthickness, + tooltip->window->style->ythickness, + tooltip->window->style->ythickness, + tooltip->window->style->xthickness, tooltip->window->style->xthickness); - + gtk_box_set_spacing (GTK_BOX (tooltip->box), + tooltip->window->style->xthickness); gtk_widget_queue_draw (tooltip->window); } +static void +draw_round_rect (cairo_t *cr, + gdouble aspect, + gdouble x, + gdouble y, + gdouble corner_radius, + gdouble width, + gdouble height) +{ + gdouble radius = corner_radius / aspect; + + cairo_move_to (cr, x + radius, y); + + /* top-right, left of the corner */ + cairo_line_to (cr, x + width - radius, y); + + /* top-right, below the corner */ + cairo_arc (cr, + x + width - radius, y + radius, radius, + -90.0f * G_PI / 180.0f, 0.0f * G_PI / 180.0f); + + /* bottom-right, above the corner */ + cairo_line_to (cr, x + width, y + height - radius); + + /* bottom-right, left of the corner */ + cairo_arc (cr, + x + width - radius, y + height - radius, radius, + 0.0f * G_PI / 180.0f, 90.0f * G_PI / 180.0f); + + /* bottom-left, right of the corner */ + cairo_line_to (cr, x + radius, y + height); + + /* bottom-left, above the corner */ + cairo_arc (cr, + x + radius, y + height - radius, radius, + 90.0f * G_PI / 180.0f, 180.0f * G_PI / 180.0f); + + /* top-left, below the corner */ + cairo_line_to (cr, x, y + radius); + + /* top-left, right of the corner */ + cairo_arc (cr, + x + radius, y + radius, radius, + 180.0f * G_PI / 180.0f, 270.0f * G_PI / 180.0f); + + cairo_close_path (cr); +} + +static void +fill_background (GtkWidget *widget, + cairo_t *cr) +{ + GdkColor color; + gdouble r, g, b; + gint radius; + gdouble background_alpha; + + if (gdk_screen_is_composited (gtk_widget_get_screen (widget))) + background_alpha = 0.90; + else + background_alpha = 1.0; + + radius = MIN (widget->style->xthickness, widget->style->ythickness); + radius = MAX (radius, 1); + + cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); + cairo_paint (cr); + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + + draw_round_rect (cr, + 1.0, 0.5, 0.5, radius, + widget->allocation.width - 1, + widget->allocation.height - 1); + + color = widget->style->bg [GTK_STATE_NORMAL]; + r = (float)color.red / 65535.0; + g = (float)color.green / 65535.0; + b = (float)color.blue / 65535.0; + cairo_set_source_rgba (cr, r, g, b, background_alpha); + cairo_fill_preserve (cr); + + color = widget->style->bg [GTK_STATE_SELECTED]; + r = (float) color.red / 65535.0; + g = (float) color.green / 65535.0; + b = (float) color.blue / 65535.0; + + cairo_set_source_rgba (cr, r, g, b, background_alpha); + cairo_set_line_width (cr, 1.0); + cairo_stroke (cr); +} + +static void +update_shape (GtkTooltip *tooltip) +{ + GdkScreen *screen; + GdkBitmap *mask; + cairo_t *cr; + gint width, height; + gboolean new_style; + gint radius; + + gtk_widget_style_get (tooltip->window, "new-tooltip-style", &new_style, NULL); + + if (!new_style) + { + gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0); + return; + } + + screen = gtk_widget_get_screen (tooltip->window); + + gtk_window_get_size (GTK_WINDOW (tooltip->window), &width, &height); + + if (gdk_screen_is_composited (screen)) + { + GdkRectangle rect; + GdkRegion *region; + const char *wm; + + gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0); +#ifdef GDK_WINDOWING_X11 + /* This is a hack to keep the Metacity compositor from slapping a + * non-shaped shadow around the shaped tooltip + */ + if (!GTK_WIDGET_MAPPED (tooltip->window)) + { + wm = gdk_x11_screen_get_window_manager_name (screen); + if (g_strcmp0 (wm, "Metacity") == 0) + gtk_window_set_type_hint (GTK_WINDOW (tooltip->window), + GDK_WINDOW_TYPE_HINT_DND); + } +#endif + return; + } + + radius = MIN (tooltip->window->style->xthickness, + tooltip->window->style->ythickness); + radius = MAX (radius, 1); + mask = (GdkBitmap *) gdk_pixmap_new (NULL, width, height, 1); + cr = gdk_cairo_create (mask); + if (cairo_status (cr) == CAIRO_STATUS_SUCCESS) + { + cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); + cairo_paint (cr); + + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); + draw_round_rect (cr, 1.0, 0, 0, radius + 1, width, height); + cairo_fill (cr); + + gtk_widget_shape_combine_mask (tooltip->window, mask, 0, 0); + } + cairo_destroy (cr); + + g_object_unref (mask); +} + static gboolean gtk_tooltip_paint_window (GtkTooltip *tooltip) { - gtk_paint_flat_box (tooltip->window->style, - tooltip->window->window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - NULL, - tooltip->window, - "tooltip", - 0, 0, - tooltip->window->allocation.width, - tooltip->window->allocation.height); + gboolean new_style; + + gtk_widget_style_get (tooltip->window, "new-tooltip-style", &new_style, NULL); + + if (new_style) + { + cairo_t *context; + cairo_surface_t *surface; + cairo_t *cr; + + context = gdk_cairo_create (tooltip->window->window); + + cairo_set_operator (context, CAIRO_OPERATOR_SOURCE); + surface = cairo_surface_create_similar (cairo_get_target (context), + CAIRO_CONTENT_COLOR_ALPHA, + tooltip->window->allocation.width, + tooltip->window->allocation.height); + cr = cairo_create (surface); + + fill_background (tooltip->window, cr); + + cairo_destroy (cr); + cairo_set_source_surface (context, surface, 0, 0); + cairo_paint (context); + cairo_surface_destroy (surface); + cairo_destroy (context); + + update_shape (tooltip); + } + else + { + gtk_paint_flat_box (tooltip->window->style, + tooltip->window->window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + NULL, + tooltip->window, + "tooltip", + 0, 0, + tooltip->window->allocation.width, + tooltip->window->allocation.height); + } return FALSE; } @@ -631,7 +872,7 @@ find_widget_under_pointer (GdkWindow *wi #ifdef DEBUG_TOOLTIP g_print ("event window %p (belonging to %p (%s)) (%d, %d)\n", - window, event_widget, gtk_widget_get_name (event_widget), + gindow, event_widget, gtk_widget_get_name (event_widget), *x, *y); #endif diff -up gtk+-2.18.3/gtk/gtkwidget.c.fresh-tooltips gtk+-2.18.3/gtk/gtkwidget.c --- gtk+-2.18.3/gtk/gtkwidget.c.fresh-tooltips 2009-10-09 01:00:44.000000000 -0400 +++ gtk+-2.18.3/gtk/gtkwidget.c 2009-10-31 14:27:50.333957199 -0400 @@ -2386,6 +2386,14 @@ gtk_widget_class_init (GtkWidgetClass *k P_("The length of vertical scroll arrows"), 1, G_MAXINT, 16, GTK_PARAM_READABLE)); + + gtk_widget_class_install_style_property (klass, + g_param_spec_boolean ("new-tooltip-style", + NULL, + NULL, + FALSE, + GTK_PARAM_READABLE)); + } static void icon-padding.patch: gtkstatusicon.c | 25 ++++++++++++++ gtktrayicon-x11.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++--- gtktrayicon.h | 3 + 3 files changed, 114 insertions(+), 6 deletions(-) --- NEW FILE icon-padding.patch --- diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index 1cdb0c1..62b3913 100644 --- a/gtk/gtkstatusicon.c +++ b/gtk/gtkstatusicon.c @@ -170,6 +170,7 @@ static void gtk_status_icon_screen_changed (GtkStatusIcon *status_icon, GdkScreen *old_screen); static void gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon); static void gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon); +static void gtk_status_icon_padding_changed (GtkStatusIcon *status_icon); static gboolean gtk_status_icon_scroll (GtkStatusIcon *status_icon, GdkEventScroll *event); static gboolean gtk_status_icon_query_tooltip (GtkStatusIcon *status_icon, @@ -850,6 +851,8 @@ gtk_status_icon_init (GtkStatusIcon *status_icon) G_CALLBACK (gtk_status_icon_embedded_changed), status_icon); g_signal_connect_swapped (priv->tray_icon, "notify::orientation", G_CALLBACK (gtk_status_icon_orientation_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "notify::padding", + G_CALLBACK (gtk_status_icon_padding_changed), status_icon); g_signal_connect_swapped (priv->tray_icon, "button-press-event", G_CALLBACK (gtk_status_icon_button_press), status_icon); g_signal_connect_swapped (priv->tray_icon, "button-release-event", @@ -975,6 +978,8 @@ gtk_status_icon_finalize (GObject *object) g_signal_handlers_disconnect_by_func (priv->tray_icon, gtk_status_icon_orientation_changed, status_icon); g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_padding_changed, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, gtk_status_icon_button_press, status_icon); g_signal_handlers_disconnect_by_func (priv->tray_icon, gtk_status_icon_button_release, status_icon); @@ -1679,14 +1684,32 @@ gtk_status_icon_screen_changed (GtkStatusIcon *status_icon, #ifdef GDK_WINDOWING_X11 static void +gtk_status_icon_padding_changed (GtkStatusIcon *status_icon) +{ + GtkStatusIconPrivate *priv = status_icon->priv; + GtkOrientation orientation; + gint padding; + + orientation = _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (priv->tray_icon)); + padding = _gtk_tray_icon_get_padding (GTK_TRAY_ICON (priv->tray_icon)); + + if (orientation == GTK_ORIENTATION_HORIZONTAL) + gtk_misc_set_padding (GTK_MISC (priv->image), padding, 0); + else + gtk_misc_set_padding (GTK_MISC (priv->image), 0, padding); +} + +static void gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon) { + gtk_status_icon_padding_changed (status_icon); g_object_notify (G_OBJECT (status_icon), "embedded"); } static void gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon) { + gtk_status_icon_padding_changed (status_icon); g_object_notify (G_OBJECT (status_icon), "orientation"); } @@ -1804,7 +1827,7 @@ gtk_status_icon_reset_image_data (GtkStatusIcon *status_icon) g_object_notify (G_OBJECT (status_icon), "stock"); break; - + case GTK_IMAGE_ICON_NAME: g_free (priv->image_data.icon_name); priv->image_data.icon_name = NULL; diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c index 32c3140..74413df 100644 --- a/gtk/gtktrayicon-x11.c +++ b/gtk/gtktrayicon-x11.c @@ -43,23 +43,26 @@ enum { PROP_0, - PROP_ORIENTATION + PROP_ORIENTATION, + PROP_PADDING }; struct _GtkTrayIconPrivate { guint stamp; - + Atom selection_atom; Atom manager_atom; Atom system_tray_opcode_atom; Atom orientation_atom; Atom visual_atom; + Atom padding_atom; Window manager_window; GdkVisual *manager_visual; gboolean manager_visual_rgba; GtkOrientation orientation; + gint padding; }; static void gtk_tray_icon_constructed (GObject *object); @@ -113,6 +116,16 @@ gtk_tray_icon_class_init (GtkTrayIconClass *class) GTK_ORIENTATION_HORIZONTAL, GTK_PARAM_READABLE)); + g_object_class_install_property (gobject_class, + PROP_PADDING, + g_param_spec_int ("padding", + P_("Padding"), + P_("Padding that should be put around icons in the tray"), + 0, + G_MAXINT, + 0, + GTK_PARAM_READABLE)); + g_type_class_add_private (class, sizeof (GtkTrayIconPrivate)); } @@ -124,6 +137,7 @@ gtk_tray_icon_init (GtkTrayIcon *icon) icon->priv->stamp = 1; icon->priv->orientation = GTK_ORIENTATION_HORIZONTAL; + icon->priv->padding = 0; gtk_widget_set_app_paintable (GTK_WIDGET (icon), TRUE); gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); @@ -161,6 +175,10 @@ gtk_tray_icon_constructed (GObject *object) "_NET_SYSTEM_TRAY_VISUAL", False); + icon->priv->padding_atom = XInternAtom (xdisplay, + "_NET_SYSTEM_TRAY_PADDING", + False); + /* Add a root window filter so that we get changes on MANAGER */ gdk_window_add_filter (root_window, gtk_tray_icon_manager_filter, icon); @@ -212,6 +230,9 @@ gtk_tray_icon_get_property (GObject *object, case PROP_ORIENTATION: g_value_set_enum (value, icon->priv->orientation); break; + case PROP_PADDING: + g_value_set_int (value, icon->priv->padding); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -372,9 +393,58 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon) XFree (prop.prop); } +static void +gtk_tray_icon_get_padding_property (GtkTrayIcon *icon) +{ + GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (icon)); + GdkDisplay *display = gdk_screen_get_display (screen); + Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); + + Atom type; + int format; + union { + gulong *prop; + guchar *prop_ch; + } prop = { NULL }; + gulong nitems; + gulong bytes_after; + int error, result; + + g_assert (icon->priv->manager_window != None); + + gdk_error_trap_push (); + type = None; + result = XGetWindowProperty (xdisplay, + icon->priv->manager_window, + icon->priv->padding_atom, + 0, G_MAXLONG, FALSE, + XA_CARDINAL, + &type, &format, &nitems, + &bytes_after, &(prop.prop_ch)); + error = gdk_error_trap_pop (); + + if (!error && result == Success && + type == XA_CARDINAL && nitems == 1 && format == 32) + { + gint padding; + + padding = prop.prop[0]; + + if (icon->priv->padding != padding) + { + icon->priv->padding = padding; + + g_object_notify (G_OBJECT (icon), "padding"); + } + } + + if (type != None) + XFree (prop.prop); +} + static GdkFilterReturn -gtk_tray_icon_manager_filter (GdkXEvent *xevent, - GdkEvent *event, +gtk_tray_icon_manager_filter (GdkXEvent *xevent, + GdkEvent *event, gpointer user_data) { GtkTrayIcon *icon = user_data; @@ -399,6 +469,11 @@ gtk_tray_icon_manager_filter (GdkXEvent *xevent, gtk_tray_icon_get_orientation_property (icon); } + else if (xev->xany.type == PropertyNotify && + xev->xproperty.atom == icon->priv->padding_atom) + { + gtk_tray_icon_get_padding_property (icon); + } else if (xev->xany.type == DestroyNotify) { GTK_NOTE (PLUGSOCKET, @@ -504,6 +579,7 @@ gtk_tray_icon_update_manager_window (GtkTrayIcon *icon) gtk_tray_icon_get_orientation_property (icon); gtk_tray_icon_get_visual_property (icon); + gtk_tray_icon_get_padding_property (icon); if (GTK_WIDGET_REALIZED (icon)) { @@ -740,6 +816,14 @@ _gtk_tray_icon_get_orientation (GtkTrayIcon *icon) return icon->priv->orientation; } +gint +_gtk_tray_icon_get_padding (GtkTrayIcon *icon) +{ + g_return_val_if_fail (GTK_IS_TRAY_ICON (icon), 0); + + return icon->priv->padding; +} + #define __GTK_TRAY_ICON_X11_C__ #include "gtkaliasdef.c" diff --git a/gtk/gtktrayicon.h b/gtk/gtktrayicon.h index 4c1e184..6dc9852 100644 --- a/gtk/gtktrayicon.h +++ b/gtk/gtktrayicon.h @@ -69,7 +69,8 @@ void _gtk_tray_icon_cancel_message (GtkTrayIcon *icon, guint id); GtkOrientation _gtk_tray_icon_get_orientation (GtkTrayIcon *icon); - +gint _gtk_tray_icon_get_padding (GtkTrayIcon *icon); + G_END_DECLS #endif /* __GTK_TRAY_ICON_H__ */ iconview-hang.patch: gtkiconview.c | 5 +++++ 1 file changed, 5 insertions(+) --- NEW FILE iconview-hang.patch --- diff -up gtk+-2.18.3/gtk/gtkiconview.c.icon-view-hang gtk+-2.18.3/gtk/gtkiconview.c --- gtk+-2.18.3/gtk/gtkiconview.c.icon-view-hang 2009-10-09 01:00:44.000000000 -0400 +++ gtk+-2.18.3/gtk/gtkiconview.c 2009-10-23 20:09:18.670311545 -0400 @@ -1545,6 +1545,11 @@ gtk_icon_view_expose (GtkWidget *widget, if (expose->window != icon_view->priv->bin_window) return FALSE; + /* If a layout has been scheduled, do it now so that all + * cell view items have valid sizes before we proceed. */ + if (icon_view->priv->layout_idle_id != 0) + gtk_icon_view_layout (icon_view); + cr = gdk_cairo_create (icon_view->priv->bin_window); cairo_set_line_width (cr, 1.); image-size-alloc.patch: gtkimage.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) --- NEW FILE image-size-alloc.patch --- --- /home/mclasen/git.gnome.org/gtk+/gtk/gtkimage.c 2009-06-04 15:18:04.063943764 -0400 +++ gtk+-2.18.3/gtk/gtkimage.c 2009-10-18 01:31:00.705062264 -0400 @@ -45,6 +45,7 @@ gchar *filename; gint pixel_size; + guint need_calc_size : 1; }; #define GTK_IMAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_IMAGE, GtkImagePrivate)) @@ -1710,6 +1711,7 @@ { GtkImage *image; GtkMisc *misc; + GtkImagePrivate *priv; GdkRectangle area, image_bound; gfloat xalign; gint x, y, mask_x, mask_y; @@ -1719,6 +1721,7 @@ image = GTK_IMAGE (widget); misc = GTK_MISC (widget); + priv = GTK_IMAGE_GET_PRIVATE (image); area = event->area; @@ -1727,7 +1730,7 @@ * and size_request() if something explicitely forces * a redraw. */ - if (widget->requisition.width == 0 && widget->requisition.height == 0) + if (priv->need_calc_size) gtk_image_calc_size (image); if (!gdk_rectangle_intersect (&area, &widget->allocation, &area)) @@ -1737,7 +1740,7 @@ xalign = misc->xalign; else xalign = 1.0 - misc->xalign; - + x = floor (widget->allocation.x + misc->xpad + ((widget->allocation.width - widget->requisition.width) * xalign)); y = floor (widget->allocation.y + misc->ypad @@ -2149,8 +2152,13 @@ void gtk_image_clear (GtkImage *image) { - gtk_image_reset (image); + GtkImagePrivate *priv; + + priv = GTK_IMAGE_GET_PRIVATE (image); + + priv->need_calc_size = 1; + gtk_image_reset (image); gtk_image_update_size (image, 0, 0); } @@ -2159,7 +2167,12 @@ { GtkWidget *widget = GTK_WIDGET (image); GdkPixbuf *pixbuf = NULL; - + GtkImagePrivate *priv; + + priv = GTK_IMAGE_GET_PRIVATE (image); + + priv->need_calc_size = 0; + /* We update stock/icon set on every size request, because * the theme could have affected the size; for other kinds of * image, we just update the requisition when the image data symbolic-color-parsing.patch: gtkrc.c | 16 +++++++++++----- gtksettings.c | 49 +++++++++++++++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 21 deletions(-) --- NEW FILE symbolic-color-parsing.patch --- diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index a2ac58b..70540a3 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -659,11 +659,15 @@ gtk_rc_color_hash_changed (GtkSettings *settings, GParamSpec *pspec, GtkRcContext *context) { - if (context->color_hash) - g_hash_table_unref (context->color_hash); - + GHashTable *old_hash; + + old_hash = context->color_hash; + g_object_get (settings, "color-hash", &context->color_hash, NULL); + if (old_hash) + g_hash_table_unref (old_hash); + gtk_rc_reparse_all_for_settings (settings, TRUE); } @@ -3148,8 +3152,10 @@ gtk_rc_parse_style (GtkRcContext *context, break; case GTK_RC_TOKEN_COLOR: if (our_hash == NULL) - gtk_rc_style_prepend_empty_color_hash (rc_style); - our_hash = rc_priv->color_hashes->data; + { + gtk_rc_style_prepend_empty_color_hash (rc_style); + our_hash = rc_priv->color_hashes->data; + } token = gtk_rc_parse_logical_color (scanner, rc_style, our_hash); break; case G_TOKEN_IDENTIFIER: diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 4917263..2b6b24e 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -2190,8 +2190,8 @@ settings_update_color_scheme (GtkSettings *settings) } static gboolean -add_color_to_hash (gchar *name, - GdkColor *color, +add_color_to_hash (gchar *name, + GdkColor *color, GHashTable *target) { GdkColor *old; @@ -2200,7 +2200,7 @@ add_color_to_hash (gchar *name, if (!old || !gdk_color_equal (old, color)) { g_hash_table_insert (target, g_strdup (name), gdk_color_copy (color)); - + return TRUE; } @@ -2208,7 +2208,7 @@ add_color_to_hash (gchar *name, } static gboolean -add_colors_to_hash_from_string (GHashTable *hash, +add_colors_to_hash_from_string (GHashTable *hash, const gchar *colors) { gchar *s, *p, *name; @@ -2256,24 +2256,27 @@ add_colors_to_hash_from_string (GHashTable *hash, static gboolean update_color_hash (ColorSchemeData *data, - const gchar *str, + const gchar *str, GtkSettingsSource source) { gboolean changed = FALSE; gint i; GHashTable *old_hash; + GHashTableIter iter; + gchar *name; + GdkColor *color; - if ((str == NULL || *str == '\0') && + if ((str == NULL || *str == '\0') && (data->lastentry[source] == NULL || data->lastentry[source][0] == '\0')) return FALSE; if (str && data->lastentry[source] && strcmp (str, data->lastentry[source]) == 0) return FALSE; - /* For the RC_FILE source we merge the values rather than over-writing + /* For the RC_FILE source we merge the values rather than over-writing * them, since multiple rc files might define independent sets of colors */ - if ((source != GTK_SETTINGS_SOURCE_RC_FILE) && + if ((source != GTK_SETTINGS_SOURCE_RC_FILE) && data->tables[source] && g_hash_table_size (data->tables[source]) > 0) { g_hash_table_unref (data->tables[source]); @@ -2282,22 +2285,36 @@ update_color_hash (ColorSchemeData *data, } if (data->tables[source] == NULL) - data->tables[source] = g_hash_table_new_full (g_str_hash, g_str_equal, + data->tables[source] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) gdk_color_free); g_free (data->lastentry[source]); data->lastentry[source] = g_strdup (str); - + changed |= add_colors_to_hash_from_string (data->tables[source], str); if (!changed) return FALSE; - + /* Rebuild the merged hash table. */ - old_hash = data->color_hash; - data->color_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, - (GDestroyNotify) gdk_color_free); + if (data->color_hash) + { + old_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, + (GDestroyNotify) gdk_color_free); + + g_hash_table_iter_init (&iter, data->color_hash); + while (g_hash_table_iter_next (&iter, &name, &color)) + { + g_hash_table_insert (old_hash, name, color); + g_hash_table_iter_steal (&iter); + } + } + else + { + old_hash = NULL; + } + for (i = 0; i <= GTK_SETTINGS_SOURCE_APPLICATION; i++) { if (data->tables[i]) @@ -2324,13 +2341,13 @@ update_color_hash (ColorSchemeData *data, { changed = TRUE; break; - } + } } } g_hash_table_unref (old_hash); } - else + else changed = TRUE; return changed; toolbutton-assert.patch: gtktoolbutton.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- NEW FILE toolbutton-assert.patch --- diff -up gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert gtk+-2.18.3/gtk/gtktoolbutton.c --- gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert 2009-10-16 10:38:56.000000000 -0400 +++ gtk+-2.18.3/gtk/gtktoolbutton.c 2009-10-26 01:12:26.146186990 -0400 @@ -916,11 +916,15 @@ gtk_tool_button_set_label (GtkToolButton button->priv->label_text = g_strdup (label); button->priv->contents_invalid = TRUE; - elided_label = _gtk_toolbar_elide_underscores (label); - accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button)); - atk_object_set_name (accessible, elided_label); + if (label) + { + elided_label = _gtk_toolbar_elide_underscores (label); + accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button)); + atk_object_set_name (accessible, elided_label); + + g_free (elided_label); + } - g_free (elided_label); g_free (old_label); g_object_notify (G_OBJECT (button), "label"); tooltip-positioning.patch: gtktooltip.c | 147 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 113 insertions(+), 34 deletions(-) --- NEW FILE tooltip-positioning.patch --- diff -up gtk+-2.18.3/gtk/gtktooltip.c.positioning gtk+-2.18.3/gtk/gtktooltip.c --- gtk+-2.18.3/gtk/gtktooltip.c.positioning 2009-10-23 13:12:16.205437913 -0400 +++ gtk+-2.18.3/gtk/gtktooltip.c 2009-10-23 13:52:15.922749329 -0400 @@ -1023,57 +1023,134 @@ gtk_tooltip_position (GtkTooltip *toolti GtkWidget *new_tooltip_widget) { gint x, y; + gint wx, wy; GdkScreen *screen; + gint monitor_num; + GdkRectangle monitor; + GtkRequisition requisition; + guint cursor_size; + +#define MAX_DISTANCE 32 tooltip->tooltip_widget = new_tooltip_widget; + screen = gtk_widget_get_screen (new_tooltip_widget); + + gtk_widget_size_request (GTK_WIDGET (tooltip->current_window), &requisition); + + monitor_num = gdk_screen_get_monitor_at_point (screen, + tooltip->last_x, + tooltip->last_y); + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + + gdk_window_get_origin (new_tooltip_widget->window, &wx, &wy); + if (GTK_WIDGET_NO_WINDOW (new_tooltip_widget)) + { + wx += new_tooltip_widget->allocation.x; + wy += new_tooltip_widget->allocation.y; + } + /* Position the tooltip */ - /* FIXME: should we swap this when RTL is enabled? */ - if (tooltip->keyboard_mode_enabled) + + cursor_size = gdk_display_get_default_cursor_size (display); + + /* Try below */ + x = wx + new_tooltip_widget->allocation.width / 2 - requisition.width / 2; + y = wy + new_tooltip_widget->allocation.height + 4; + + if (y + requisition.height <= monitor.y + monitor.height) { - gdk_window_get_origin (new_tooltip_widget->window, &x, &y); - if (GTK_WIDGET_NO_WINDOW (new_tooltip_widget)) + if (tooltip->keyboard_mode_enabled) + goto found; + + if (y <= tooltip->last_y + cursor_size + MAX_DISTANCE) { - x += new_tooltip_widget->allocation.x; - y += new_tooltip_widget->allocation.y; - } + if (tooltip->last_x + cursor_size + MAX_DISTANCE < x) + x = tooltip->last_x + cursor_size + MAX_DISTANCE; + else if (x + requisition.width < tooltip->last_x - MAX_DISTANCE) + x = tooltip->last_x - MAX_DISTANCE - requisition.width; - /* For keyboard mode we position the tooltip below the widget, - * right of the center of the widget. - */ - x += new_tooltip_widget->allocation.width / 2; - y += new_tooltip_widget->allocation.height + 4; + goto found; + } + } + + /* Try above */ + x = wx + new_tooltip_widget->allocation.width / 2 - requisition.width / 2; + y = wy - requisition.height - 4; + + if (y >= monitor.y) + { + if (tooltip->keyboard_mode_enabled) + goto found; + + if (y + requisition.height >= tooltip->last_y - MAX_DISTANCE) + { + if (tooltip->last_x + cursor_size + MAX_DISTANCE < x) + x = tooltip->last_x + cursor_size + MAX_DISTANCE; + else if (x + requisition.width < tooltip->last_x - MAX_DISTANCE) + x = tooltip->last_x - MAX_DISTANCE - requisition.width; + + goto found; + } } - else + + /* Try right FIXME: flip on rtl ? */ + x = wx + new_tooltip_widget->allocation.width + 4; + y = wy + new_tooltip_widget->allocation.height / 2 - requisition.height / 2; + + if (x + requisition.width <= monitor.x + monitor.width) { - guint cursor_size; + if (tooltip->keyboard_mode_enabled) + goto found; - x = tooltip->last_x; - y = tooltip->last_y; + if (x <= tooltip->last_x + cursor_size + MAX_DISTANCE) + { + if (tooltip->last_y + cursor_size + MAX_DISTANCE < y) + y = tooltip->last_y + cursor_size + MAX_DISTANCE; + else if (y + requisition.height < tooltip->last_y - MAX_DISTANCE) + y = tooltip->last_y - MAX_DISTANCE - requisition.height; - /* For mouse mode, we position the tooltip right of the cursor, - * a little below the cursor's center. - */ - cursor_size = gdk_display_get_default_cursor_size (display); - x += cursor_size / 2; - y += cursor_size / 2; + goto found; + } } - screen = gtk_widget_get_screen (new_tooltip_widget); + /* Try left FIXME: flip on rtl ? */ + x = wx - requisition.width - 4; + y = wy + new_tooltip_widget->allocation.height / 2 - requisition.height / 2; - /* Show it */ - if (tooltip->current_window) + if (x >= monitor.x) { - gint monitor_num; - GdkRectangle monitor; - GtkRequisition requisition; + if (tooltip->keyboard_mode_enabled) + goto found; - gtk_widget_size_request (GTK_WIDGET (tooltip->current_window), - &requisition); + if (x + requisition.width >= tooltip->last_x - MAX_DISTANCE) + { + if (tooltip->last_y + cursor_size + MAX_DISTANCE < y) + y = tooltip->last_y + cursor_size + MAX_DISTANCE; + else if (y + requisition.height < tooltip->last_y - MAX_DISTANCE) + y = tooltip->last_y - MAX_DISTANCE - requisition.height; - monitor_num = gdk_screen_get_monitor_at_point (screen, x, y); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + goto found; + } + } + /* Fallback */ + if (tooltip->keyboard_mode_enabled) + { + x = wx + new_tooltip_widget->allocation.width / 2 - requisition.width / 2; + y = wy + new_tooltip_widget->allocation.height + 4; + } + else + { + /* At cursor */ + x = tooltip->last_x + cursor_size * 3 / 4; + y = tooltip->last_y + cursor_size * 3 / 4; + } + +found: + /* Show it */ + if (tooltip->current_window) + { if (x + requisition.width > monitor.x + monitor.width) x -= x - (monitor.x + monitor.width) + requisition.width; else if (x < monitor.x) @@ -1081,7 +1158,9 @@ gtk_tooltip_position (GtkTooltip *toolti if (y + requisition.height > monitor.y + monitor.height) y -= y - (monitor.y + monitor.height) + requisition.height; - + else if (y < monitor.y) + y = monitor.y; + if (!tooltip->keyboard_mode_enabled) { /* don't pop up under the pointer */ @@ -1089,7 +1168,7 @@ gtk_tooltip_position (GtkTooltip *toolti y <= tooltip->last_y && tooltip->last_y < y + requisition.height) y = tooltip->last_y - requisition.height - 2; } - + gtk_window_move (GTK_WINDOW (tooltip->current_window), x, y); gtk_widget_show (GTK_WIDGET (tooltip->current_window)); } Index: gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.407 retrieving revision 1.408 diff -u -p -r1.407 -r1.408 --- gtk2.spec 28 Sep 2009 16:47:25 -0000 1.407 +++ gtk2.spec 2 Nov 2009 04:22:13 -0000 1.408 @@ -11,13 +11,13 @@ %define libpng_version 2:1.2.2-16 %define xrandr_version 1.2.99.4-2 -%define base_version 2.18.0 +%define base_version 2.18.3 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 5%{?dist} +Release: 16%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2 @@ -27,15 +27,25 @@ Source3: im-cedilla.conf # Biarch changes Patch0: gtk+-2.13.5-lib64.patch - -# https://bugzilla.gnome.org/show_bug.cgi?id=566522 -Patch1: gtk2-printing-smb-auth.patch -# https://bugzilla.gnome.org/show_bug.cgi?id=586207 -Patch2: gtk2-printing-nonblocking-printer-list.patch +Patch1: system-python.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=583273 +Patch2: icon-padding.patch +# from upstream +Patch3: image-size-alloc.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=599617 +Patch4: fresh-tooltips.patch +# from upstream +Patch5: allow-set-hint.patch # from upstream -Patch3: fix-anchors.patch +Patch6: compose-sequences.patch # from upstream -Patch4: iconview-crash.patch +Patch7: symbolic-color-parsing.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=599618 +Patch8: tooltip-positioning.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=581150 +Patch9: iconview-hang.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=599446 +Patch10: toolbutton-assert.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -147,15 +157,16 @@ This package contains developer document %setup -q -n gtk+-%{version} %patch0 -p1 -b .lib64 -%patch1 -p1 -b .printing-smb-auth -%patch2 -p1 -b .printing-nonblocking-printer-list -%patch3 -p1 -b .fix-anchors -%patch4 -p1 -b .iconview-crash - -# make sure that gtkmarshalers.{c, h} get regenerated during the build -# - caused by print_authentication.patch -rm --force ./gtk/gtkmarshalers.c -rm --force ./gtk/gtkmarshalers.h +%patch1 -p1 -b .system-python +%patch2 -p1 -b .icon-padding +%patch3 -p1 -b .image-size-alloc +%patch4 -p1 -b .fresh-tooltips +%patch5 -p1 -b .allow-set-hint +%patch6 -p1 -b .compose-sequences +%patch7 -p1 -b .symbolic-color-parsing +%patch8 -p1 -b .tooltip-positioning +%patch9 -p1 -b .iconview-hang +%patch10 -p1 -b .toolbutton-assert %build libtoolize --force --copy @@ -392,6 +403,67 @@ fi %changelog +* Sat Oct 31 2009 Matthias Clasen - 2.18.3-16 +- Handle screen changes for tooltips (#531568) + +* Wed Oct 28 2009 Matthias Clasen - 2.18.3-15 +- Work around a bug in the X automatic compositor (#531443) + +* Wed Oct 28 2009 Matthias Clasen - 2.18.3-14 +- Make the new tooltips sharp +- Improve the Metacity compositor workaround for new tooltips + +* Mon Oct 26 2009 Matthias Clasen - 2.18.3-12 +- Fix a possible assertion failure in GtkToolButton + +* Fri Oct 23 2009 Matthew Barnes - 2.18.3-11 +- Fix a GtkIconView hang + +* Fri Oct 23 2009 Matthias Clasen - 2.18.3-10 +- Tweak tooltip positioning +- Make new tooltip style an opt-in theme choice + +* Thu Oct 22 2009 Matthias Clasen - 2.18.3-9 +- Fix a problem with parsing symbolic colors in rc files (#528662) + +* Thu Oct 22 2009 Peter Hutterer - 2.18.3-8 +- compose-sequences.patch: update compose sequences to what's currently in + libX11 git. + +* Wed Oct 21 2009 Matthias Clasen - 2.18.3-7 +- Try to catch some nm-applet problems by rejecting requests to + load icons at size 0 + +* Wed Oct 21 2009 Matthias Clasen - 2.18.3-6 +- Hack around metacity compositor limitations + +* Wed Oct 21 2009 Matthias Clasen - 2.18.3-5 +- Tweak tooltip appearance + +* Tue Oct 20 2009 Matthias Clasen - 2.18.3-4 +- Make tooltips look nicer + +* Sun Oct 18 2009 Matthias Clasen - 2.18.3-3 +- Fix a size allocation problem uncovered by the previous patch + +* Sat Oct 17 2009 Matthias Clasen - 2.18.3-2 +- Support padding around status icons + +* Sat Oct 17 2009 Matthias Clasen - 2.18.3-1 +- Update to 2.18.3 + +* Tue Oct 13 2009 Matthias Clasen - 2.18.2-3 +- Make gtk-builder-convert use system python + +* Fri Oct 9 2009 Matthias Clasen - 2.18.2-2 +- Make selecting the final char work again (#528072) + +* Mon Oct 5 2009 Matthias Clasen - 2.18.2-1 +- Update to 2.18.2 + +* Wed Sep 30 2009 Matthias Clasen - 2.18.1-1 +- Update to 2.18.1 + * Mon Sep 28 2009 Matthias Clasen - 2.18.0-3 - Fix a crash in the appearance capplet --- appearance-crash.patch DELETED --- --- csw-fixes.patch DELETED --- --- dont-use-deprecated-api.patch DELETED --- --- entry-include-fix.patch DELETED --- --- fix-anchors.patch DELETED --- --- gdm-background.patch DELETED --- --- gtk-bell.patch DELETED --- --- gtk2-fix-install.patch DELETED --- --- gtk2-printing-nonblocking-printer-list.patch DELETED --- --- gtk2-printing-smb-auth.patch DELETED --- --- iconview-crash.patch DELETED --- --- print_authentication.patch DELETED --- --- root-event-mask.patch DELETED --- --- set-cursor.patch DELETED --- From pnemade at fedoraproject.org Mon Nov 2 04:24:07 2009 From: pnemade at fedoraproject.org (pnemade) Date: Mon, 2 Nov 2009 04:24:07 +0000 (UTC) Subject: rpms/iso-codes/F-12 .cvsignore, 1.29, 1.30 iso-codes.spec, 1.39, 1.40 sources, 1.31, 1.32 Message-ID: <20091102042407.B2BBF11C00E8@cvs1.fedora.phx.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/iso-codes/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21280 Modified Files: .cvsignore iso-codes.spec sources Log Message: * Mon Nov 02 2009 Parag Nemade - 3.11.1-1 - Update to 3.11.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iso-codes/F-12/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- .cvsignore 17 Sep 2009 09:46:06 -0000 1.29 +++ .cvsignore 2 Nov 2009 04:24:06 -0000 1.30 @@ -1 +1 @@ -iso-codes-3.10.3.tar.bz2 +iso-codes-3.11.1.tar.bz2 Index: iso-codes.spec =================================================================== RCS file: /cvs/pkgs/rpms/iso-codes/F-12/iso-codes.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- iso-codes.spec 23 Oct 2009 06:09:37 -0000 1.39 +++ iso-codes.spec 2 Nov 2009 04:24:06 -0000 1.40 @@ -1,7 +1,7 @@ Name: iso-codes Summary: ISO code lists and translations -Version: 3.11 +Version: 3.11.1 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Base @@ -57,6 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_datadir}/pkgconfig/iso-codes.pc %changelog +* Mon Nov 02 2009 Parag Nemade - 3.11.1-1 +- Update to 3.11.1 + * Fri Oct 23 2009 Parag Nemade - 3.11-1 - Update to 3.11 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iso-codes/F-12/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- sources 23 Oct 2009 06:09:38 -0000 1.31 +++ sources 2 Nov 2009 04:24:06 -0000 1.32 @@ -1 +1 @@ -29d5526d963a6ecdac40772fac9fe6bb iso-codes-3.11.tar.bz2 +e92e8e98defff9b410b8437adde8a85f iso-codes-3.11.1.tar.bz2 From mclasen at fedoraproject.org Mon Nov 2 04:24:15 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:24:15 +0000 (UTC) Subject: rpms/gtk2/F-12 appearance-crash.patch, 1.1, NONE csw-fixes.patch, 1.1, NONE dont-use-deprecated-api.patch, 1.6, NONE entry-include-fix.patch, 1.1, NONE fix-anchors.patch, 1.1, NONE gdm-background.patch, 1.1, NONE gtk-bell.patch, 1.1, NONE gtk2-fix-install.patch, 1.1, NONE gtk2-printing-nonblocking-printer-list.patch, 1.1, NONE gtk2-printing-smb-auth.patch, 1.1, NONE iconview-crash.patch, 1.1, NONE print_authentication.patch, 1.1, NONE root-event-mask.patch, 1.1, NONE select-final-char.patch, 1.1, NONE set-cursor.patch, 1.2, NONE zerosize.patch, 1.2, NONE Message-ID: <20091102042416.0DD9D11C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gtk2/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21101 Removed Files: appearance-crash.patch csw-fixes.patch dont-use-deprecated-api.patch entry-include-fix.patch fix-anchors.patch gdm-background.patch gtk-bell.patch gtk2-fix-install.patch gtk2-printing-nonblocking-printer-list.patch gtk2-printing-smb-auth.patch iconview-crash.patch print_authentication.patch root-event-mask.patch select-final-char.patch set-cursor.patch zerosize.patch Log Message: drop dead patches --- appearance-crash.patch DELETED --- --- csw-fixes.patch DELETED --- --- dont-use-deprecated-api.patch DELETED --- --- entry-include-fix.patch DELETED --- --- fix-anchors.patch DELETED --- --- gdm-background.patch DELETED --- --- gtk-bell.patch DELETED --- --- gtk2-fix-install.patch DELETED --- --- gtk2-printing-nonblocking-printer-list.patch DELETED --- --- gtk2-printing-smb-auth.patch DELETED --- --- iconview-crash.patch DELETED --- --- print_authentication.patch DELETED --- --- root-event-mask.patch DELETED --- --- select-final-char.patch DELETED --- --- set-cursor.patch DELETED --- --- zerosize.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 04:24:10 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:24:10 +0000 (UTC) Subject: rpms/webkitgtk/devel sources,1.11,1.12 webkitgtk.spec,1.24,1.25 Message-ID: <20091102042410.4B53A11C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/webkitgtk/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21297 Modified Files: sources webkitgtk.spec Log Message: Copy F12 work over Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/webkitgtk/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 24 Sep 2009 03:20:20 -0000 1.11 +++ sources 2 Nov 2009 04:24:09 -0000 1.12 @@ -1 +1 @@ -e6eb43bb4f75b4a2a09aec95e2f43e91 webkit-1.1.15.1.tar.gz +18736af3c751eb078fa3f4a7393cc864 webkit-1.1.15.3.tar.gz Index: webkitgtk.spec =================================================================== RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- webkitgtk.spec 25 Sep 2009 06:01:36 -0000 1.24 +++ webkitgtk.spec 2 Nov 2009 04:24:09 -0000 1.25 @@ -34,8 +34,8 @@ %bcond_with wml Name: webkitgtk -Version: 1.1.15.1 -Release: 3%{?dist} +Version: 1.1.15.3 +Release: 1%{?dist} Summary: GTK+ Web content engine library Provides: WebKit-gtk = %{version}-%{release} @@ -197,6 +197,14 @@ rm -rf %{buildroot} %changelog +* Sat Oct 31 2009 Matthias Clasen - 1.1.15.3-1 +- Update to 1.1.15.3, more crash fixes and important media player fixes +- See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000047.html + +* Thu Oct 15 2009 Matthias Clasen - 1.1.15.2-1 +- Update to 1.1.15.2, which has multiple crash and other fixes +- See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000040.html + * Thu Sep 24 2009 Peter Gordon - 1.1.15.1-3 - Forcibly disable JIT until we can properly resolve the execmem-caused segfaulting. (Temporary workaround until bug #516057 can be properly fixed.) From mclasen at fedoraproject.org Mon Nov 2 04:26:06 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:26:06 +0000 (UTC) Subject: rpms/vinagre/devel sources,1.30,1.31 vinagre.spec,1.61,1.62 Message-ID: <20091102042606.CC43C11C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/vinagre/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21733 Modified Files: sources vinagre.spec Log Message: Copy F12 updates over Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- sources 23 Sep 2009 23:14:42 -0000 1.30 +++ sources 2 Nov 2009 04:26:06 -0000 1.31 @@ -1 +1 @@ -3413726184c4c2ab0e20319777c87e7c vinagre-2.28.0.1.tar.bz2 +3fec37a3e20d6f3641d905b580f7306a vinagre-2.28.1.tar.bz2 Index: vinagre.spec =================================================================== RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- vinagre.spec 23 Sep 2009 23:52:37 -0000 1.61 +++ vinagre.spec 2 Nov 2009 04:26:06 -0000 1.62 @@ -1,5 +1,5 @@ Name: vinagre -Version: 2.28.0.1 +Version: 2.28.1 Release: 1%{?dist} Summary: VNC client for GNOME @@ -155,6 +155,9 @@ fi %changelog +* Mon Oct 19 2009 Matthias Clasen 2.28.1-1 +- Update to 2.28.1 + * Wed Sep 23 2009 Matthias Clasen 2.28.0.1-1 - Update to 2.28.0.1 From mclasen at fedoraproject.org Mon Nov 2 04:27:38 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:27:38 +0000 (UTC) Subject: rpms/vino/devel sources,1.53,1.54 vino.spec,1.109,1.110 Message-ID: <20091102042738.DDEEE11C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/vino/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21991 Modified Files: sources vino.spec Log Message: Copy F12 updates over Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/vino/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -p -r1.53 -r1.54 --- sources 23 Sep 2009 22:39:04 -0000 1.53 +++ sources 2 Nov 2009 04:27:38 -0000 1.54 @@ -1 +1 @@ -de7874e503b0c4eaa48758620611c75c vino-2.28.0.tar.bz2 +5cf3c006f0d0b5e0daa3b10bc94f0e0d vino-2.28.1.tar.bz2 Index: vino.spec =================================================================== RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -p -r1.109 -r1.110 --- vino.spec 28 Sep 2009 00:03:00 -0000 1.109 +++ vino.spec 2 Nov 2009 04:27:38 -0000 1.110 @@ -9,8 +9,8 @@ Summary: A remote desktop system for GNOME Name: vino -Version: 2.28.0 -Release: 3%{?dist} +Version: 2.28.1 +Release: 1%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/vino/2.28/%{name}-%{version}.tar.bz2 @@ -54,7 +54,6 @@ connect to a running GNOME session using %prep %setup -q %patch0 -p1 -b .smclient -%patch1 -p1 -b .restart-command autoreconf -i -f @@ -132,6 +131,9 @@ fi %{_sysconfdir}/xdg/autostart/vino-server.desktop %changelog +* Mon Oct 19 2009 Matthias Clasen - 2.28.1-1 +- Update to 2.28.1 + * Sun Sep 27 2009 Matthias Clasen - 2.28.0-3 - Even better, just rely on autostart From mclasen at fedoraproject.org Mon Nov 2 04:31:01 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:31:01 +0000 (UTC) Subject: rpms/gtk-vnc/devel gtk-vnc.spec,1.37,1.38 sources,1.13,1.14 Message-ID: <20091102043101.789D611C02BC@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gtk-vnc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22923 Modified Files: gtk-vnc.spec sources Log Message: Copy F12 updates over Index: gtk-vnc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/gtk-vnc.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- gtk-vnc.spec 11 Aug 2009 13:49:35 -0000 1.37 +++ gtk-vnc.spec 2 Nov 2009 04:31:00 -0000 1.38 @@ -6,15 +6,17 @@ Summary: A GTK widget for VNC clients Name: gtk-vnc -Version: 0.3.9 +Version: 0.3.10 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://live.gnome.org/gtk-vnc BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel BuildRequires: gnutls-devel cyrus-sasl-devel +BuildRequires: intltool %if %{with_plugin} %if 0%{?fedora} > 8 BuildRequires: xulrunner-devel @@ -88,6 +90,8 @@ rm -f %{buildroot}%{_libdir}/mozilla/plu rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la %endif +%find_lang gtk-vnc + %clean rm -fr %{buildroot} @@ -95,7 +99,7 @@ rm -fr %{buildroot} %postun -p /sbin/ldconfig -%files +%files -f gtk-vnc.lang %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README COPYING.LIB %{_libdir}/lib*.so.* @@ -120,6 +124,12 @@ rm -fr %{buildroot} %endif %changelog +* Tue Oct 20 2009 Matthias Clasen - 0.3.10-1 +- Update to 0.3.10 + +* Thu Oct 8 2009 Matthias Clasen - 0.3.9-2 +- Request a full screen refresh when receives a desktop-resize encoding + * Tue Aug 11 2009 Daniel P. Berrange - 0.3.9-1 - Update to 0.3.9 release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtk-vnc/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 11 Aug 2009 13:49:35 -0000 1.13 +++ sources 2 Nov 2009 04:31:00 -0000 1.14 @@ -1 +1 @@ -18cbf50b393fea57b691987e5ea62259 gtk-vnc-0.3.9.tar.bz2 +9aa9d830b219255c8d6753ef55802932 gtk-vnc-0.3.10.tar.bz2 From mclasen at fedoraproject.org Mon Nov 2 04:32:42 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:32:42 +0000 (UTC) Subject: rpms/gucharmap/devel gucharmap.spec,1.44,1.45 sources,1.24,1.25 Message-ID: <20091102043242.20DF511C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gucharmap/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23373 Modified Files: gucharmap.spec sources Log Message: Copy F12 updates over Index: gucharmap.spec =================================================================== RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- gucharmap.spec 22 Sep 2009 00:37:27 -0000 1.44 +++ gucharmap.spec 2 Nov 2009 04:32:41 -0000 1.45 @@ -3,7 +3,7 @@ %define desktop_file_utils_version 0.9 Name: gucharmap -Version: 2.28.0 +Version: 2.28.1 Release: 1%{?dist} Summary: Unicode character picker and font browser @@ -142,6 +142,9 @@ fi %changelog +* Mon Oct 19 2009 Matthias Clasen - 2.28.1-1 +- Update to 2.28.1 + * Mon Sep 21 2009 Matthias Clasen - 2.28.0-1 - Update to 2.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gucharmap/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- sources 22 Sep 2009 00:05:38 -0000 1.24 +++ sources 2 Nov 2009 04:32:41 -0000 1.25 @@ -1 +1 @@ -c358564da35d7bc93b99d826b4d28f7c gucharmap-2.28.0.tar.bz2 +409a08462fab85daa5523e950a794561 gucharmap-2.28.1.tar.bz2 From mclasen at fedoraproject.org Mon Nov 2 04:34:51 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:34:51 +0000 (UTC) Subject: rpms/seahorse-plugins/devel seahorse-plugins.spec, 1.30, 1.31 sources, 1.14, 1.15 Message-ID: <20091102043451.5695611C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/seahorse-plugins/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23740 Modified Files: seahorse-plugins.spec sources Log Message: Copy F12 updates over Index: seahorse-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- seahorse-plugins.spec 24 Sep 2009 02:24:26 -0000 1.30 +++ seahorse-plugins.spec 2 Nov 2009 04:34:50 -0000 1.31 @@ -1,14 +1,14 @@ -Name: seahorse-plugins -Version: 2.28.0 -Release: 1%{?dist} +Name: seahorse-plugins +Version: 2.28.1 +Release: 1%{?dist} Summary: Plugins and utilities for encryption in GNOME -Group: User Interface/Desktops -License: GPLv2+ and GFDL -URL: http://projects.gnome.org/seahorse/ -Source: http://download.gnome.org/sources/seahorse-plugins/2.28/%{name}-%{version}.tar.bz2 +Group: User Interface/Desktops +License: GPLv2+ and GFDL +URL: http://projects.gnome.org/seahorse/ +Source: http://download.gnome.org/sources/seahorse-plugins/2.28/%{name}-%{version}.tar.bz2 Source1: seahorse-agent.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: intltool BuildRequires: gettext-devel @@ -183,6 +183,12 @@ fi #%{_libdir}/epiphany/2.27/extensions/seahorse.ephy-extension %changelog +* Mon Oct 19 2009 Tomas Bzatek 2.28.1-1 +- Update to 2.28.1 + +* Wed Oct 7 2009 Matthias Clasen - 2.28.0-2 +- Implement GETINFO to make seahorse-agent work with gnupg >= 2.0.12 + * Wed Sep 23 2009 Matthias Clasen - 2.28.0-1 - Update to 2.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 24 Sep 2009 02:24:26 -0000 1.14 +++ sources 2 Nov 2009 04:34:50 -0000 1.15 @@ -1 +1 @@ -ff3f238af0b19896ed949fec06b5b40d seahorse-plugins-2.28.0.tar.bz2 +cec5ef8b94c16798f53a5876d3718b91 seahorse-plugins-2.28.1.tar.bz2 From pnemade at fedoraproject.org Mon Nov 2 04:37:57 2009 From: pnemade at fedoraproject.org (pnemade) Date: Mon, 2 Nov 2009 04:37:57 +0000 (UTC) Subject: rpms/iso-codes/devel iso-codes.spec,1.39,1.40 sources,1.31,1.32 Message-ID: <20091102043757.6771311C00E8@cvs1.fedora.phx.redhat.com> Author: pnemade Update of /cvs/pkgs/rpms/iso-codes/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24662 Modified Files: iso-codes.spec sources Log Message: * Mon Nov 02 2009 Parag Nemade - 3.11.1-1 - Update to 3.11.1 Index: iso-codes.spec =================================================================== RCS file: /cvs/pkgs/rpms/iso-codes/devel/iso-codes.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- iso-codes.spec 23 Oct 2009 06:03:50 -0000 1.39 +++ iso-codes.spec 2 Nov 2009 04:37:57 -0000 1.40 @@ -1,7 +1,7 @@ Name: iso-codes Summary: ISO code lists and translations -Version: 3.11 +Version: 3.11.1 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Base @@ -57,6 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_datadir}/pkgconfig/iso-codes.pc %changelog +* Mon Nov 02 2009 Parag Nemade - 3.11.1-1 +- Update to 3.11.1 + * Fri Oct 23 2009 Parag Nemade - 3.11-1 - Update to 3.11 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iso-codes/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- sources 23 Oct 2009 06:03:50 -0000 1.31 +++ sources 2 Nov 2009 04:37:57 -0000 1.32 @@ -1 +1 @@ -29d5526d963a6ecdac40772fac9fe6bb iso-codes-3.11.tar.bz2 +e92e8e98defff9b410b8437adde8a85f iso-codes-3.11.1.tar.bz2 From mclasen at fedoraproject.org Mon Nov 2 04:40:21 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:40:21 +0000 (UTC) Subject: rpms/gnome-panel/F-12 gnome-panel-2.16.0-compiz-support.patch, 1.2, NONE gnome-panel-2.17.91-about-fedora.patch, 1.1, NONE gnome-panel-2.21.92-about-this-computer.patch, 1.1, NONE gnome-panel-2.23.4-vendor.patch, 1.1, NONE gnome-panel-2.25.3-search.patch, 1.3, NONE gnome-panel-2.26.0-show-emblemed-icons.patch, 1.1, NONE gnome-panel-2.27.4-fix-monitor.patch, 1.1, NONE panel-icons.patch, 1.2, NONE polkit1.patch, 1.2, NONE recent-icon.patch, 1.1, NONE Message-ID: <20091102044021.7561711C0418@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-panel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25172 Removed Files: gnome-panel-2.16.0-compiz-support.patch gnome-panel-2.17.91-about-fedora.patch gnome-panel-2.21.92-about-this-computer.patch gnome-panel-2.23.4-vendor.patch gnome-panel-2.25.3-search.patch gnome-panel-2.26.0-show-emblemed-icons.patch gnome-panel-2.27.4-fix-monitor.patch panel-icons.patch polkit1.patch recent-icon.patch Log Message: drop dead patches --- gnome-panel-2.16.0-compiz-support.patch DELETED --- --- gnome-panel-2.17.91-about-fedora.patch DELETED --- --- gnome-panel-2.21.92-about-this-computer.patch DELETED --- --- gnome-panel-2.23.4-vendor.patch DELETED --- --- gnome-panel-2.25.3-search.patch DELETED --- --- gnome-panel-2.26.0-show-emblemed-icons.patch DELETED --- --- gnome-panel-2.27.4-fix-monitor.patch DELETED --- --- panel-icons.patch DELETED --- --- polkit1.patch DELETED --- --- recent-icon.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 04:45:41 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:45:41 +0000 (UTC) Subject: rpms/gnome-panel/devel bookmarks-submenu.patch, NONE, 1.1 clock-home.patch, NONE, 1.1 icon-order.patch, NONE, 1.1 icon-padding.patch, NONE, 1.1 panel-padding.patch, NONE, 1.1 panel-randr-crashes.patch, NONE, 1.1 gnome-panel.spec, 1.370, 1.371 redhat-panel-default-setup.entries, 1.18, 1.19 Message-ID: <20091102044541.23F5211C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-panel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25735 Modified Files: gnome-panel.spec redhat-panel-default-setup.entries Added Files: bookmarks-submenu.patch clock-home.patch icon-order.patch icon-padding.patch panel-padding.patch panel-randr-crashes.patch Log Message: Copy F12 work over bookmarks-submenu.patch: panel-menu-items.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bookmarks-submenu.patch --- diff -up gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu gnome-panel-2.28.0/gnome-panel/panel-menu-items.c --- gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu 2009-10-08 00:52:51.855737118 -0400 +++ gnome-panel-2.28.0/gnome-panel/panel-menu-items.c 2009-10-08 00:53:09.378716600 -0400 @@ -61,7 +61,7 @@ #define NAMES_DIR "/apps/nautilus/desktop" #define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name" #define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name" -#define MAX_ITEMS_OR_SUBMENU 5 +#define MAX_ITEMS_OR_SUBMENU 8 G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM) G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM) clock-home.patch: clock.schemas.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE clock-home.patch --- diff -up gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home gnome-panel-2.28.0/applets/clock/clock.schemas.in --- gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home 2009-07-01 09:06:23.000000000 -0400 +++ gnome-panel-2.28.0/applets/clock/clock.schemas.in 2009-10-07 22:36:12.298466938 -0400 @@ -211,7 +211,7 @@ /schemas/apps/clock_applet/prefs/expand_locations clock-applet bool - false + true Expand list of locations @@ -271,7 +271,7 @@ clock-applet list string - [] + [<location name="" city="Boston" timezone="America/New_York" latitude="42.360558" longitude="-71.010559" code="KBOS" current="true"/>] List of locations icon-order.patch: na-tray-child.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ na-tray-child.h | 5 ++- na-tray.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 172 insertions(+), 3 deletions(-) --- NEW FILE icon-order.patch --- --- gnome-panel-2.28.0/applets/notification_area/na-tray-child.c 2009-08-11 12:56:35.000000000 -0400 +++ hacked/applets/notification_area/na-tray-child.c 2009-10-16 00:18:25.057041777 -0400 @@ -428,3 +428,84 @@ #endif } } + + +/* from libwnck xutils.c */ +static char * +latin1_to_utf8 (const char *latin1) +{ + GString *str; + const char *p; + + str = g_string_new (NULL); + + p = latin1; + while (*p) + { + g_string_append_unichar (str, (gunichar) *p); + ++p; + } + + return g_string_free (str, FALSE); +} + +/* derived from libwnck xutils.c */ +static void +_get_wmclass (Display *xdisplay, + Window xwindow, + char **res_class, + char **res_name) +{ + XClassHint ch; + char *retval; + + gdk_error_trap_push (); + + ch.res_name = NULL; + ch.res_class = NULL; + + XGetClassHint (xdisplay, xwindow, &ch); + + gdk_error_trap_pop (); + + retval = NULL; + + if (res_class) + *res_class = NULL; + + if (res_name) + *res_name = NULL; + + if (ch.res_name) + { + if (res_name) + *res_name = latin1_to_utf8 (ch.res_name); + + XFree (ch.res_name); + } + + if (ch.res_class) + { + if (res_class) + *res_class = latin1_to_utf8 (ch.res_class); + + XFree (ch.res_class); + } +} + +void +na_tray_child_get_wm_class (NaTrayChild *child, + char **res_name, + char **res_class) +{ + GdkDisplay *display; + + g_return_if_fail (NA_IS_TRAY_CHILD (child)); + + display = gtk_widget_get_display (GTK_WIDGET (child)); + + _get_wmclass (GDK_DISPLAY_XDISPLAY (display), + child->icon_window, + res_class, + res_name); +} --- gnome-panel-2.28.0/applets/notification_area/na-tray-child.h 2009-08-11 12:55:28.000000000 -0400 +++ hacked/applets/notification_area/na-tray-child.h 2009-10-16 00:19:19.841050913 -0400 @@ -61,7 +61,10 @@ gboolean na_tray_child_has_alpha (NaTrayChild *child); void na_tray_child_set_composited (NaTrayChild *child, gboolean composited); -void na_tray_child_force_redraw (NaTrayChild *child); +void na_tray_child_force_redraw (NaTrayChild *child); +void na_tray_child_get_wm_class (NaTrayChild *child, + char **res_name, + char **res_class); G_END_DECLS --- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-08-11 16:27:41.000000000 -0400 +++ hacked/applets/notification_area/na-tray.c 2009-10-16 01:38:03.211041558 -0400 @@ -117,6 +117,51 @@ return trays_screen->all_trays->data; } +const char *roles[] = { + "keyboard", + "volume", + "bluetooth", + "network", + "battery", + NULL +}; + +const char *wmclass_roles[] = { + "Bluetooth-applet", "bluetooth", + "Gnome-volume-control-applet", "volume", + "Nm-applet", "network", + "Gnome-power-manager", "battery", + NULL, +}; + +static const char * +find_role (const char *wmclass) +{ + int i; + + for (i = 0; wmclass_roles[i]; i += 2) + { + if (strcmp (wmclass, wmclass_roles[i]) == 0) + return wmclass_roles[i + 1]; + } + + return NULL; +} + +static int +find_role_pos (const char *role) +{ + int i; + + for (i = 0; roles[i]; i++) + { + if (strcmp (role, roles[i]) == 0) + break; + } + + return i + 1; +} + static void tray_added (NaTrayManager *manager, GtkWidget *icon, @@ -124,6 +169,11 @@ { NaTray *tray; NaTrayPrivate *priv; + GList *l, *children; + int position; + char *class_a; + const char *role; + int role_position; tray = get_tray (trays_screen); if (tray == NULL) @@ -132,10 +182,45 @@ priv = tray->priv; g_assert (priv->trays_screen == trays_screen); - + g_hash_table_insert (trays_screen->icon_table, icon, tray); - gtk_box_pack_end (GTK_BOX (priv->box), icon, FALSE, FALSE, 0); + position = 0; + + class_a = NULL; + na_tray_child_get_wm_class (NA_TRAY_CHILD (icon), NULL, &class_a); + if (!class_a) + goto insert; + + role = find_role (class_a); + g_free (class_a); + if (!role) + goto insert; + + role_position = find_role_pos (role); + g_object_set_data (G_OBJECT (icon), "role-position", GINT_TO_POINTER (role_position)); + + children = gtk_container_get_children (GTK_CONTAINER (priv->box)); + for (l = g_list_last (children); l; l = l->prev) + { + GtkWidget *child = l->data; + gint rp; + + rp = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (child), "role-position")); + if (rp == 0 || rp < role_position) + { + position = g_list_index (children, child) + 1; + break; + } + } + g_list_free (children); + + if (position < 0) + position = 0; + +insert: + gtk_box_pack_start (GTK_BOX (priv->box), icon, FALSE, FALSE, 0); + gtk_box_reorder_child (GTK_BOX (priv->box), icon, position); gtk_widget_show (icon); } icon-padding.patch: Makefile.am | 18 +++++++++++++++ main.c | 40 ++++++++++++++++++++++++++++++++++- na-tray-manager.c | 41 ++++++++++++++++++++++++++++++++++++ na-tray-manager.h | 3 ++ na-tray.c | 12 ++++++++++ na-tray.h | 2 + notification_area_applet.schemas.in | 17 ++++++++++++++ 7 files changed, 132 insertions(+), 1 deletion(-) --- NEW FILE icon-padding.patch --- diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c hacked/applets/notification_area/main.c --- gnome-panel-2.28.0/applets/notification_area/main.c 2009-07-01 09:06:23.000000000 -0400 +++ hacked/applets/notification_area/main.c 2009-10-17 23:06:01.001313433 -0400 @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -34,6 +35,7 @@ #include "fixedtip.h" #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area" +#define SCHEMA_DIR "/schemas/apps/notification_area_applet/prefs" typedef struct { @@ -231,6 +233,39 @@ gtk_widget_set_name (widget, "na-tray"); } +static void +padding_changed (GConfClient *client, + guint cnxn_id, + GConfEntry *entry, + gpointer user_data) +{ + AppletData *data = user_data; + gint value; + + if (!entry->value || entry->value->type != GCONF_VALUE_INT) + return; + + value = gconf_value_get_int (entry->value); + + na_tray_set_padding (data->tray, value); +} + +static void +setup_gconf (AppletData *data) +{ + GConfClient *client; + char *key; + int value; + + client = gconf_client_get_default (); + key = panel_applet_gconf_get_full_key (data->applet, "padding"); + value = gconf_client_get_int (client, key, NULL); + na_tray_set_padding (data->tray, value); + gconf_client_notify_add (client, key, padding_changed, data, NULL, NULL); + g_free (key); + g_object_unref (client); +} + static gboolean applet_factory (PanelApplet *applet, const gchar *iid, @@ -260,9 +295,10 @@ atko = gtk_widget_get_accessible (GTK_WIDGET (applet)); atk_object_set_name (atko, _("Panel Notification Area")); + panel_applet_add_preferences (applet, SCHEMA_DIR, NULL); panel_applet_set_flags (applet, PANEL_APPLET_HAS_HANDLE|PANEL_APPLET_EXPAND_MINOR); - + g_signal_connect (applet, "change_orient", G_CALLBACK (applet_change_orientation), data); g_signal_connect (applet, "change_background", @@ -270,6 +306,8 @@ g_signal_connect (applet, "destroy", G_CALLBACK (applet_destroy), data); + setup_gconf (data); + panel_applet_set_background_widget (applet, GTK_WIDGET (applet)); gtk_container_add (GTK_CONTAINER (applet), GTK_WIDGET (tray)); diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am hacked/applets/notification_area/Makefile.am --- gnome-panel-2.28.0/applets/notification_area/Makefile.am 2009-07-21 13:25:43.000000000 -0400 +++ hacked/applets/notification_area/Makefile.am 2009-10-17 23:16:42.401072682 -0400 @@ -66,6 +66,24 @@ @INTLTOOL_SERVER_RULE@ +schemasdir = $(GCONF_SCHEMA_FILE_DIR) +schemas_in_files = notification_area_applet.schemas.in +schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) + + at INTLTOOL_SCHEMAS_RULE@ + +if GCONF_SCHEMAS_INSTALL +# don't do this if we are building in eg. rpm +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schemas_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/notification_area/$$p ; \ + done \ + fi +else +install-data-local: +endif + uidir = $(datadir)/gnome-2.0/ui ui_DATA = GNOME_NotificationAreaApplet.xml diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c hacked/applets/notification_area/na-tray.c --- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-10-17 23:22:01.095308064 -0400 +++ hacked/applets/notification_area/na-tray.c 2009-10-17 23:00:01.304062848 -0400 @@ -602,6 +602,8 @@ { trays_screens [screen_number].tray_manager = tray_manager; + na_tray_manager_set_padding (tray_manager, 0); + g_signal_connect (tray_manager, "tray_icon_added", G_CALLBACK (tray_added), &trays_screens [screen_number]); @@ -804,6 +806,16 @@ } void +na_tray_set_padding (NaTray *tray, + gint padding) +{ + NaTrayPrivate *priv = tray->priv; + + if (get_tray (priv->trays_screen) == tray) + na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding); +} + +void na_tray_force_redraw (NaTray *tray) { NaTrayPrivate *priv = tray->priv; diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.h hacked/applets/notification_area/na-tray.h --- gnome-panel-2.28.0/applets/notification_area/na-tray.h 2009-04-19 13:45:09.000000000 -0400 +++ hacked/applets/notification_area/na-tray.h 2009-10-17 23:00:30.491375187 -0400 @@ -60,6 +60,8 @@ void na_tray_set_orientation (NaTray *tray, GtkOrientation orientation); GtkOrientation na_tray_get_orientation (NaTray *tray); +void na_tray_set_padding (NaTray *tray, + gint padding); void na_tray_force_redraw (NaTray *tray); G_END_DECLS diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c hacked/applets/notification_area/na-tray-manager.c --- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c 2009-07-27 08:01:39.000000000 -0400 +++ hacked/applets/notification_area/na-tray-manager.c 2009-10-17 21:55:00.582062966 -0400 @@ -653,6 +653,32 @@ #endif } +static void +na_tray_manager_set_padding_property (NaTrayManager *manager) +{ +#ifdef GDK_WINDOWING_X11 + GdkDisplay *display; + Atom orientation_atom; + gulong data[1]; + + if (!manager->invisible || !manager->invisible->window) + return; + + display = gtk_widget_get_display (manager->invisible); + orientation_atom = gdk_x11_get_xatom_by_name_for_display (display, + "_NET_SYSTEM_TRAY_PADDING"); + + data[0] = manager->padding; + + XChangeProperty (GDK_DISPLAY_XDISPLAY (display), + GDK_WINDOW_XWINDOW (manager->invisible->window), + orientation_atom, + XA_CARDINAL, 32, + PropModeReplace, + (guchar *) &data, 1); +#endif +} + #ifdef GDK_WINDOWING_X11 static gboolean @@ -697,6 +723,7 @@ na_tray_manager_set_orientation_property (manager); na_tray_manager_set_visual_property (manager); + na_tray_manager_set_padding_property (manager); timestamp = gdk_x11_get_server_time (invisible->window); @@ -836,6 +863,20 @@ } } +void +na_tray_manager_set_padding (NaTrayManager *manager, + gint padding) +{ + g_return_if_fail (NA_IS_TRAY_MANAGER (manager)); + + if (manager->padding != padding) + { + manager->padding = padding; + + na_tray_manager_set_padding_property (manager); + } +} + GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager) { diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h hacked/applets/notification_area/na-tray-manager.h --- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h 2009-04-19 13:45:09.000000000 -0400 +++ hacked/applets/notification_area/na-tray-manager.h 2009-10-17 21:55:42.646312700 -0400 @@ -55,6 +55,7 @@ GtkWidget *invisible; GdkScreen *screen; GtkOrientation orientation; + gint padding; GList *messages; GHashTable *socket_table; @@ -91,6 +92,8 @@ void na_tray_manager_set_orientation (NaTrayManager *manager, GtkOrientation orientation); GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager); +void na_tray_manager_set_padding (NaTrayManager *manager, + gint padding); G_END_DECLS diff -u -r gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in hacked/applets/notification_area/notification_area_applet.schemas.in --- gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in 2009-10-17 23:23:41.071058057 -0400 +++ hacked/applets/notification_area/notification_area_applet.schemas.in 2009-10-17 23:21:38.588316399 -0400 @@ -0,0 +1,17 @@ + + + + + /schemas/apps/notification_area_applet/prefs/padding + notification-area-applet + int + 3 + + Padding + + This key specifies padding to be put around status icons. + + + + + panel-padding.patch: panel-profile.c | 3 ++ panel-profile.h | 5 +++- panel-toplevel.c | 44 ++++++++++++++++++++++++++++++++++++++ panel-toplevel.h | 3 ++ panel-toplevel.schemas.in | 13 +++++++++++ panel-widget.c | 52 +++++++++++++++++++++++++++++++++------------- 6 files changed, 105 insertions(+), 15 deletions(-) --- NEW FILE panel-padding.patch --- diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.c --- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding 2009-09-21 12:29:33.000000000 -0400 +++ gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-10-29 09:57:25.285484907 -0400 @@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation" TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size, int) TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand, gboolean) +TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding, int) TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide, gboolean) TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool, enable_buttons, gboolean) TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows, gboolean) @@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC else UPDATE_INT ("monitor", monitor) else UPDATE_STRING ("name", name) else UPDATE_BOOL ("expand", expand) + else UPDATE_INT ("padding", padding) else UPDATE_STRING ("orientation", orientation) else UPDATE_INT ("size", size) else UPDATE_POS ("x", x, x_right) @@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient GET_STRING ("name", name); GET_INT ("monitor", monitor); GET_BOOL ("expand", expand); + GET_INT ("padding", padding); GET_STRING ("orientation", orientation); GET_INT ("size", size); GET_BOOL ("auto_hide", auto_hide); diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.h --- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding 2009-04-19 13:45:09.000000000 -0400 +++ gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-10-29 09:57:25.285484907 -0400 @@ -92,7 +92,10 @@ void panel_profile_set_toplevel_e gboolean expand); gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel); gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel); - +void panel_profile_set_toplevel_padding (PanelToplevel *toplevel, + int padding); +int panel_profile_get_toplevel_padding (PanelToplevel *padding); +gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel); void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel, gboolean auto_hide); gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel); diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.c --- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding 2009-08-21 06:31:49.000000000 -0400 +++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-10-29 09:57:25.287500667 -0400 @@ -79,6 +79,7 @@ struct _PanelToplevelPrivate { gboolean expand; PanelOrientation orientation; int size; + int padding; /* relative to the monitor origin */ int x; @@ -213,6 +214,7 @@ enum { PROP_0, PROP_NAME, PROP_EXPAND, + PROP_PADDING, PROP_ORIENTATION, PROP_SIZE, PROP_X, @@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject case PROP_EXPAND: panel_toplevel_set_expand (toplevel, g_value_get_boolean (value)); break; + case PROP_PADDING: + panel_toplevel_set_padding (toplevel, g_value_get_int (value)); + break; case PROP_ORIENTATION: panel_toplevel_set_orientation (toplevel, g_value_get_enum (value)); break; @@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject case PROP_EXPAND: g_value_set_boolean (value, toplevel->priv->expand); break; + case PROP_PADDING: + g_value_set_int (value, toplevel->priv->padding); + break; case PROP_ORIENTATION: g_value_set_enum (value, toplevel->priv->orientation); break; @@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel g_object_class_install_property ( gobject_class, + PROP_PADDING, + g_param_spec_int ( + "padding", + "Padding", + "Padding that is inserted between objects", + 0, + G_MAXINT, + 0, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property ( + gobject_class, PROP_ORIENTATION, g_param_spec_enum ( "orientation", @@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel return toplevel->priv->expand; } +void +panel_toplevel_set_padding (PanelToplevel *toplevel, + int padding) +{ + g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel)); + + if (toplevel->priv->padding == padding) + return; + + toplevel->priv->padding = padding; + + gtk_widget_queue_resize (GTK_WIDGET (toplevel)); + + g_object_notify (G_OBJECT (toplevel), "padding"); +} + +int +panel_toplevel_get_padding (PanelToplevel *toplevel) +{ + g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0); + + return toplevel->priv->padding; +} + gboolean panel_toplevel_get_is_floating (PanelToplevel *toplevel) { diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.h --- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding 2009-08-19 11:28:09.000000000 -0400 +++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-10-29 09:57:25.288484940 -0400 @@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_ void panel_toplevel_set_expand (PanelToplevel *toplevel, gboolean expand); gboolean panel_toplevel_get_expand (PanelToplevel *toplevel); +void panel_toplevel_set_padding (PanelToplevel *toplevel, + int padding); +int panel_toplevel_get_padding (PanelToplevel *toplevel); void panel_toplevel_set_orientation (PanelToplevel *toplevel, PanelOrientation orientation); PanelOrientation panel_toplevel_get_orientation (PanelToplevel *toplevel); diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in --- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding 2009-07-01 09:06:23.000000000 -0400 +++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-10-29 09:57:25.288484940 -0400 @@ -103,6 +103,19 @@ + /schemas/apps/panel/toplevels/padding + panel + int + 0 + + Padding + + Padding that will be inserted between objects on this panel. + + + + + /schemas/apps/panel/toplevels/x panel int diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-widget.c --- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding 2009-08-11 07:32:38.000000000 -0400 +++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-10-29 10:10:43.531226534 -0400 @@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW { AppletData *ad; AppletData *nad = NULL; - + gint padding; + g_assert (list != NULL); + padding = panel_toplevel_get_padding (panel->toplevel); + ad = list->data; if (ad->constrained + ad->min_cells >= panel->size) return; @@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW if (list->next) nad = list->next->data; - if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) { - ad->pos = ad->constrained += MOVE_INCREMENT; + if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) { + ad->pos = ad->constrained += MOVE_INCREMENT + padding; gtk_widget_queue_resize (GTK_WIDGET (panel)); emit_applet_moved (panel, ad); return; @@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi { AppletData *ad; AppletData *pad = NULL; + gint padding; + + padding = panel_toplevel_get_padding (panel->toplevel); ad = list->data; if (ad->constrained <= 0) @@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi if (list->prev) pad = list->prev->data; - if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) { - ad->pos = ad->constrained -= MOVE_INCREMENT; + if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) { + ad->pos = ad->constrained -= MOVE_INCREMENT + padding; gtk_widget_queue_resize (GTK_WIDGET (panel)); emit_applet_moved (panel, ad); return; @@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel { AppletData *ad; AppletData *nad = NULL; + gint padding; g_assert (list != NULL); + padding = panel_toplevel_get_padding (panel->toplevel); + ad = list->data; if (list->next) nad = list->next->data; - if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) - return ad->constrained + MOVE_INCREMENT; + if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) + return ad->constrained + MOVE_INCREMENT + padding; if (nad->locked) return panel_widget_get_right_jump_pos (panel, @@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW { AppletData *ad; AppletData *pad = NULL; + gint padding; g_assert (list != NULL); + padding = panel_toplevel_get_padding (panel->toplevel); + ad = list->data; if (list->prev) pad = list->prev->data; - if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) - return ad->constrained - MOVE_INCREMENT; + if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) + return ad->constrained - MOVE_INCREMENT - padding; if (pad->locked) return panel_widget_get_left_jump_pos (panel, @@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid GList *list; GList *ad_with_hints; gboolean dont_fill; + gint padding; g_return_if_fail(PANEL_IS_WIDGET(widget)); g_return_if_fail(requisition!=NULL); panel = PANEL_WIDGET(widget); + padding = panel_toplevel_get_padding (panel->toplevel); + if(panel->orient == GTK_ORIENTATION_HORIZONTAL) { requisition->width = 0; requisition->height = panel->sz; @@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid ad_with_hints = g_list_prepend (ad_with_hints, ad); - else if (panel->packed) + else if (panel->packed) { + if (list != panel->applet_list) + requisition->width += padding; requisition->width += chreq.width; + } } else { if (requisition->width < chreq.width && !ad->size_constrained) requisition->width = chreq.width; @@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid ad_with_hints = g_list_prepend (ad_with_hints, ad); - else if (panel->packed) + else if (panel->packed) { + if (list != panel->applet_list) + requisition->height += padding; requisition->height += chreq.height; + } } } @@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi int i; int old_size; gboolean ltr; + gint padding; g_return_if_fail(PANEL_IS_WIDGET(widget)); g_return_if_fail(allocation!=NULL); panel = PANEL_WIDGET(widget); + padding = panel_toplevel_get_padding (panel->toplevel); + old_size = panel->size; ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR; @@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi } ad->min_cells = ad->cells; gtk_widget_size_allocate(ad->applet,&challoc); - i += ad->cells; + i += ad->cells + padding; } /* EEEEK, there might be not enough room and we don't handle @@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi if (ad->constrained < i) ad->constrained = i; - i = ad->constrained + ad->cells; + i = ad->constrained + ad->cells + padding; } /* Now expand from the right */ @@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi ad->cells = cells; } - i = ad->constrained; + i = ad->constrained - padding; } /* EEEEK, there's not enough room, so shift applets even panel-randr-crashes.patch: panel-multiscreen.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) --- NEW FILE panel-randr-crashes.patch --- >From 66b8e290bd0b767183cba583917907940b5b425a Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 6 Oct 2009 12:47:52 +0200 Subject: [PATCH] [panel] Fix crashes in various conditions with the new randr code If nothing had probed the randr screen resources before us and the X server is supporting randr 1.3, then we got no output, and therefore no monitor. The fix here is to actively probe for resources if we detect this case. See https://bugzilla.gnome.org/show_bug.cgi?id=597101 Also, in some cases, all outputs appear disconnected. See https://bugzilla.novell.com/show_bug.cgi?id=543876 To be completely on the safe side, if we get no monitor information from randr, even if it is successful, we fallback to the GTK+ method. --- gnome-panel/panel-multiscreen.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/gnome-panel/panel-multiscreen.c b/gnome-panel/panel-multiscreen.c index 8a05221..4ed76ae 100644 --- a/gnome-panel/panel-multiscreen.c +++ b/gnome-panel/panel-multiscreen.c @@ -136,9 +136,17 @@ panel_multiscreen_get_randr_monitors_for_screen (GdkScreen *screen, xroot = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)); #if (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)) - if (have_randr_1_3) + if (have_randr_1_3) { resources = XRRGetScreenResourcesCurrent (xdisplay, xroot); - else + if (resources->noutput == 0) { + /* This might happen if nothing tried to get randr + * resources from the server before, so we need an + * active probe. See comment #27 in + * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */ + XRRFreeScreenResources (resources); + resources = XRRGetScreenResources (xdisplay, xroot); + } + } else resources = XRRGetScreenResources (xdisplay, xroot); #else resources = XRRGetScreenResources (xdisplay, xroot); @@ -205,6 +213,17 @@ panel_multiscreen_get_randr_monitors_for_screen (GdkScreen *screen, return FALSE; } + if (geometries->len == 0) { + /* This can happen in at least one case: + * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all + * monitors appear disconnected (possibly because the screen + * is behing a KVM switch) -- see comment #8. + * There might be other cases too, so we stay on the safe side. + */ + g_array_free (geometries, TRUE); + return FALSE; + } + *monitors_ret = geometries->len; *geometries_ret = (GdkRectangle *) g_array_free (geometries, FALSE); @@ -238,9 +257,15 @@ panel_multiscreen_get_raw_monitors_for_screen (GdkScreen *screen, int *monitors_ret, GdkRectangle **geometries_ret) { - if (panel_multiscreen_get_randr_monitors_for_screen (screen, - monitors_ret, - geometries_ret)) + gboolean res; + + *monitors_ret = 0; + *geometries_ret = NULL; + + res = panel_multiscreen_get_randr_monitors_for_screen (screen, + monitors_ret, + geometries_ret); + if (res && *monitors_ret > 0) return; panel_multiscreen_get_gdk_monitors_for_screen (screen, -- 1.6.4.2 Index: gnome-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.370 retrieving revision 1.371 diff -u -p -r1.370 -r1.371 --- gnome-panel.spec 24 Sep 2009 00:34:44 -0000 1.370 +++ gnome-panel.spec 2 Nov 2009 04:45:40 -0000 1.371 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.28.0 -Release: 1%{?dist} +Release: 12%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2 @@ -41,6 +41,7 @@ Requires: gnome-menus >= %{gnome_menus_v Requires: evolution-data-server >= %{evolution_data_server_version} %endif Requires: gnome-session-xsession +Requires: %{name}-libs = %{version}-%{release} Requires(post): GConf2 >= %{gconf_version} Requires(post): scrollkeeper @@ -111,6 +112,21 @@ Patch35: clock-wakeups.patch # http://bugzilla.gnome.org/show_bug.cgi?id=579092 Patch38: clock-network.patch +Patch40: clock-home.patch +Patch41: bookmarks-submenu.patch + +# from upstream +Patch42: panel-randr-crashes.patch + +# http://bugzilla.gnome.org/show_bug.cgi?id=343436 +Patch43: panel-padding.patch + +# https://bugzilla.gnome.org/show_bug.cgi?id=583115 +Patch44: icon-order.patch + +# https://bugzilla.gnome.org/show_bug.cgi?id=583273 +Patch45: icon-padding.patch + Conflicts: gnome-power-manager < 2.15.3 %description @@ -156,6 +172,12 @@ Panel Applets using the libpanel-applet %patch24 -p1 -b .allow-spurious-view-done-signals %patch35 -p1 -b .clock-wakeups %patch38 -p1 -b .clock-network +%patch40 -p1 -b .clock-home +%patch41 -p1 -b .bookmarks-submenu +%patch42 -p1 -b .randr-crashes +%patch43 -p1 -b .panel-padding +%patch44 -p1 -b .icon-order +%patch45 -p1 -b .icon-padding . %{SOURCE6} @@ -261,6 +283,7 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/tasklist.schemas \ %{_sysconfdir}/gconf/schemas/window-list.schemas \ %{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \ + %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas \ > /dev/null || : # @@ -287,6 +310,10 @@ if [ "$1" -gt 1 ]; then %{_sysconfdir}/gconf/schemas/window-list.schemas \ %{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \ > /dev/null || : + if [ -f %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || : + fi fi %preun @@ -305,6 +332,10 @@ if [ "$1" -eq 0 ]; then %{_sysconfdir}/gconf/schemas/window-list.schemas \ %{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \ > /dev/null || : + if [ -f %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || : + fi fi %postun @@ -354,6 +385,39 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Thu Oct 29 2009 Matthias Clasen 2.28.0-12 +- Make padding work correctly in non-expanded panels (#529614) + +* Tue Oct 20 2009 Matthias Clasen 2.28.0-11 +- Remove a leftover debugging statement + +* Tue Oct 20 2009 Matthias Clasen 2.28.0-10 +- Reduce the inter-applet padding + +* Mon Oct 19 2009 Ray Strode 2.28.0-9 +- Add explicit libs requires (bug 525600) + +* Mon Oct 19 2009 Matthias Clasen 2.28.0-9 +- Actually set non-zero padding + +* Sat Oct 17 2009 Matthias Clasen 2.28.0-8 +- Add padding around status icons + +* Fri Oct 16 2009 Matthias Clasen 2.28.0-6 +- Put status icons in a predictable order + +* Wed Oct 14 2009 Matthias Clasen 2.28.0-5 +- Tweaks to the default panel configuration + +* Thu Oct 8 2009 Matthias Clasen 2.28.0-4 +- Fix possible crashes related to randr events + +* Thu Oct 8 2009 Matthias Clasen 2.28.0-3 +- Accept more bookmarks in the places menu before overflowing + +* Wed Oct 7 2009 Matthias Clasen 2.28.0-2 +- Add a default location to the clock applet + * Wed Sep 23 2009 Matthias Clasen 2.28.0-1 - Update to 2.28.0 Index: redhat-panel-default-setup.entries =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/devel/redhat-panel-default-setup.entries,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- redhat-panel-default-setup.entries 2 Jun 2009 04:41:12 -0000 1.18 +++ redhat-panel-default-setup.entries 2 Nov 2009 04:45:40 -0000 1.19 @@ -56,9 +56,6 @@ systray - show_desktop_button - - window_list @@ -91,6 +88,13 @@ + toplevels/top_panel/padding + /schemas/apps/panel/toplevels/padding + + 8 + + + toplevels/top_panel/orientation /schemas/apps/panel/toplevels/orientation @@ -143,6 +147,13 @@ + toplevels/bottom_panel/padding + /schemas/apps/panel/toplevels/padding + + 8 + + + toplevels/bottom_panel/orientation /schemas/apps/panel/toplevels/orientation @@ -260,7 +271,7 @@ objects/web_launcher/locked /schemas/apps/panel/objects/locked - false + true @@ -314,7 +325,7 @@ objects/email_launcher/locked /schemas/apps/panel/objects/locked - false + true @@ -361,7 +372,7 @@ applets/gnote/panel_right_stick /schemas/apps/panel/objects/panel_right_stick - true + false @@ -408,7 +419,7 @@ applets/fast_user_switch_applet/position /schemas/apps/panel/objects/position - 2 + 0 @@ -540,6 +551,13 @@ OAFIID:GNOME_SystemTrayApplet + + applets/systray/prefs/padding + /schemas/apps/notification_area_applet/prefs/padding + + 2 + + applets/systray/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id applets/systray/tooltip/schemas/apps/panel/objects/tooltip @@ -550,60 +568,6 @@ applets/systray/launcher_location/schemas/apps/panel/objects/launcher_location applets/systray/action_type/schemas/apps/panel/objects/action_type - - - - applets/show_desktop_button/object_type - /schemas/apps/panel/objects/object_type - - bonobo-applet - - - - applets/show_desktop_button/toplevel_id - /schemas/apps/panel/objects/toplevel_id - - bottom_panel - - - - applets/show_desktop_button/position - /schemas/apps/panel/objects/position - - 0 - - - - applets/show_desktop_button/panel_right_stick - /schemas/apps/panel/objects/panel_right_stick - - false - - - - applets/show_desktop_button/locked - /schemas/apps/panel/objects/locked - - true - - - - applets/show_desktop_button/bonobo_iid - /schemas/apps/panel/objects/bonobo_iid - - OAFIID:GNOME_ShowDesktopApplet - - - - applets/show_desktop_button/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id - applets/show_desktop_button/tooltip/schemas/apps/panel/objects/tooltip - applets/show_desktop_button/use_custom_icon/schemas/apps/panel/objects/use_custom_icon - applets/show_desktop_button/custom_icon/schemas/apps/panel/objects/custom_icon - applets/show_desktop_button/use_menu_path/schemas/apps/panel/objects/use_menu_path - applets/show_desktop_button/menu_path/schemas/apps/panel/objects/menu_path - applets/show_desktop_button/launcher_location/schemas/apps/panel/objects/launcher_location - applets/show_desktop_button/action_type/schemas/apps/panel/objects/action_type - @@ -704,7 +668,7 @@ applets/workspace_switcher/prefs/num_rows - /schemas/apps/panel/objects/prefes/num_rows + /schemas/apps/workspace_switcher/prefs/num_rows 1 From petersen at fedoraproject.org Mon Nov 2 04:46:00 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 2 Nov 2009 04:46:00 +0000 (UTC) Subject: comps comps-f12.xml.in,1.182,1.183 Message-ID: <20091102044600.0824011C00E8@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/extras/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25361 Modified Files: comps-f12.xml.in Log Message: @haskell - add haskell-platform as default - make ghc-utf8-string-devel default - ghc-zlib-devel typo - add ghc-tar-devel - remove obsolete haddock Index: comps-f12.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f12.xml.in,v retrieving revision 1.182 retrieving revision 1.183 diff -u -p -r1.182 -r1.183 --- comps-f12.xml.in 2 Nov 2009 02:52:38 -0000 1.182 +++ comps-f12.xml.in 2 Nov 2009 04:45:58 -0000 1.183 @@ -3046,24 +3046,31 @@ ghc ghc-doc happy + haskell-platform + ghc-cgi-devel + ghc-editline-devel + ghc-fgl-devel + ghc-GLUT-devel + ghc-haskell-platform-devel + ghc-HTTP-devel + ghc-network-devel + ghc-OpenGL-devel + ghc-time-devel + ghc-utf8-string-devel + ghc-zlib-devel cpphs - ghc-cgi-devel - ghc-editline-devel - ghc-ghc-paths-devel - ghc-gtk-devek + ghc-gtk-devel ghc-gtk2hs-doc + ghc-haskell-platform-doc + ghc-haskell-platform-prof ghc-haskell-src-exts-devel - ghc-HTTP-devel ghc-HUnit-devel - ghc-network-devel ghc-prof + ghc-tar-devel ghc-uniplate-devel - ghc-utf8-string-devel ghc-X11-devel ghc-X11-xft-devel - ghc-X11-zlib-devel ghc-xmonad-contrib-devel - haddock hscolour hugs98 hugs98-demos From whot at fedoraproject.org Mon Nov 2 04:47:27 2009 From: whot at fedoraproject.org (Peter Hutterer) Date: Mon, 2 Nov 2009 04:47:27 +0000 (UTC) Subject: rpms/xorg-x11-drv-evdev/F-12 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch, NONE, 1.1 xorg-x11-drv-evdev.spec, 1.63, 1.64 Message-ID: <20091102044727.E8EB211C00E8@cvs1.fedora.phx.redhat.com> Author: whot Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27884 Modified Files: xorg-x11-drv-evdev.spec Added Files: 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch Log Message: * Mon Nov 02 2009 Peter Hutterer 2.3.0-2 - 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch Fix property handler indexing for multiple draglock buttons (#524428). 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch: draglock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- NEW FILE 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch --- >From 11669d82790fd7c94c44c0d487d3fa5e203528e9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 2 Nov 2009 13:57:18 +1000 Subject: [PATCH] Fix drag-lock property handler for multiple draglock buttons. Parsing of the values was wrong. Given an input of 1 2 3 4, button 1 sets the lock for button 2 and button 3 sets the lock for button 4. This also means we need to return BadMatch if the property isn't a multiple of 2. Red Hat Bug 524428 Signed-off-by: Peter Hutterer --- src/draglock.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/draglock.c b/src/draglock.c index a8bf079..6157cae 100644 --- a/src/draglock.c +++ b/src/draglock.c @@ -256,7 +256,7 @@ EvdevDragLockSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, pEvdev->dragLock.meta = meta; memset(pEvdev->dragLock.lock_pair, 0, sizeof(pEvdev->dragLock.lock_pair)); } - } else + } else if ((val->size % 2) == 0) { CARD8* vals = (CARD8*)val->data; @@ -269,10 +269,11 @@ EvdevDragLockSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, pEvdev->dragLock.meta = 0; memset(pEvdev->dragLock.lock_pair, 0, sizeof(pEvdev->dragLock.lock_pair)); - for (i = 0; i < val->size && i < EVDEV_MAXBUTTONS; i++) - pEvdev->dragLock.lock_pair[i] = vals[i]; + for (i = 0; i < val->size && i < EVDEV_MAXBUTTONS; i += 2) + pEvdev->dragLock.lock_pair[vals[i] - 1] = vals[i + 1]; } - } + } else + return BadMatch; } return Success; -- 1.6.5.1 Index: xorg-x11-drv-evdev.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/xorg-x11-drv-evdev.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- xorg-x11-drv-evdev.spec 19 Oct 2009 04:24:57 -0000 1.63 +++ xorg-x11-drv-evdev.spec 2 Nov 2009 04:47:27 -0000 1.64 @@ -7,7 +7,7 @@ Summary: Xorg X11 evdev input driver Name: xorg-x11-drv-evdev Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -18,6 +18,9 @@ Source0: ftp://ftp.x.org/pub/individua Source1: make-git-snapshot.sh Source2: commitid +# Already upstream +Patch1: 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch + ExcludeArch: s390 s390x BuildRequires: autoconf automake libtool @@ -34,6 +37,8 @@ X.Org X11 evdev input driver. #%setup -q -n %{tarball}-%{gitdate} %setup -q -n %{tarball}-%{version} +%patch1 -p1 + %build autoreconf -v --install || exit 1 %configure --disable-static @@ -71,6 +76,11 @@ X.Org X11 evdev input driver development %changelog +* Mon Nov 02 2009 Peter Hutterer 2.3.0-2 +- 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch + Fix property handler indexing for multiple draglock buttons + (#524428). + * Mon Oct 19 2009 Peter Hutterer 2.3.0-1 - evdev 2.3.0 From mclasen at fedoraproject.org Mon Nov 2 04:50:46 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:50:46 +0000 (UTC) Subject: rpms/gnome-screensaver/F-12 0001-Disable-the-password-entry-when-using-non-password-a.patch, 1.1, NONE button-images.patch, 1.1, NONE fix-gtkbuilder-conversion.patch, 1.1, NONE gnome-screensaver-idle-delay.patch, 1.1, NONE use-gtkbuilder.patch, 1.1, NONE Message-ID: <20091102045046.9D2F511C049D@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-screensaver/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28078 Removed Files: 0001-Disable-the-password-entry-when-using-non-password-a.patch button-images.patch fix-gtkbuilder-conversion.patch gnome-screensaver-idle-delay.patch use-gtkbuilder.patch Log Message: Drop dead patches --- 0001-Disable-the-password-entry-when-using-non-password-a.patch DELETED --- --- button-images.patch DELETED --- --- fix-gtkbuilder-conversion.patch DELETED --- --- gnome-screensaver-idle-delay.patch DELETED --- --- use-gtkbuilder.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 04:52:16 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:52:16 +0000 (UTC) Subject: rpms/gnome-screensaver/devel ask-to-die.patch, NONE, 1.1 multihead-issues.patch, NONE, 1.1 xrandr-gamma.patch, NONE, 1.1 gnome-screensaver.spec, 1.228, 1.229 Message-ID: <20091102045216.EF62311C02BC@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-screensaver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29339 Modified Files: gnome-screensaver.spec Added Files: ask-to-die.patch multihead-issues.patch xrandr-gamma.patch Log Message: Copy F12 work over ask-to-die.patch: gnome-screensaver-dialog.c | 22 +++++++++++++++++++++- gs-window-x11.c | 24 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) --- NEW FILE ask-to-die.patch --- diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.28.0/src/gnome-screensaver-dialog.c gnome-screensaver-2.28.0.new/src/gnome-screensaver-dialog.c --- gnome-screensaver-2.28.0/src/gnome-screensaver-dialog.c 2009-08-26 17:06:12.000000000 +0100 +++ gnome-screensaver-2.28.0.new/src/gnome-screensaver-dialog.c 2009-10-18 22:00:14.563679981 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -326,6 +327,21 @@ } static gboolean +response_request_quit (void) +{ + printf ("REQUEST QUIT\n"); + fflush (stdout); + return FALSE; +} + +static gboolean +quit_timeout_cb (gpointer data) +{ + gtk_main_quit (); + return FALSE; +} + +static gboolean auth_check_idle (GSLockPlug *plug) { gboolean res; @@ -347,7 +363,11 @@ } else { gs_debug ("Authentication failed, quitting (max failures)"); again = FALSE; - gtk_main_quit (); + /* Don't quit immediately, but rather request that gnome-screensaver + * terminates us after it has finished the dialog shake. Time out + * after 5 seconds and quit anyway if this doesn't happen though */ + g_idle_add ((GSourceFunc)response_request_quit, NULL); + g_timeout_add (5000, (GSourceFunc)quit_timeout_cb, NULL); } } diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.28.0/src/gs-window-x11.c gnome-screensaver-2.28.0.new/src/gs-window-x11.c --- gnome-screensaver-2.28.0/src/gs-window-x11.c 2009-10-18 21:53:27.913386916 +0100 +++ gnome-screensaver-2.28.0.new/src/gs-window-x11.c 2009-10-18 21:53:28.835892015 +0100 @@ -91,6 +91,8 @@ gint lock_pid; gint lock_watch_id; gint dialog_response; + gboolean dialog_quit_requested; + gboolean dialog_shake_in_progress; gint keyboard_pid; gint keyboard_watch_id; @@ -1390,6 +1392,16 @@ remove_key_events (window); } +static void +maybe_kill_dialog (GSWindow *window) +{ + if (!window->priv->dialog_shake_in_progress + && window->priv->dialog_quit_requested + && window->priv->lock_pid > 0) { + kill (window->priv->lock_pid, SIGTERM); + } +} + /* very rudimentary animation for indicating an auth failure */ static void shake_dialog (GSWindow *window) @@ -1398,6 +1410,8 @@ guint left; guint right; + window->priv->dialog_shake_in_progress = TRUE; + for (i = 0; i < 9; i++) { if (i % 2 == 0) { left = 30; @@ -1422,6 +1436,9 @@ g_usleep (10000); } + + window->priv->dialog_shake_in_progress = FALSE; + maybe_kill_dialog (window); } static gboolean @@ -1464,6 +1481,10 @@ window->priv->dialog_response = DIALOG_RESPONSE_CANCEL; } finished = TRUE; + } else if (strstr (line, "REQUEST QUIT") != NULL) { + gs_debug ("Got request for quit"); + window->priv->dialog_quit_requested = TRUE; + maybe_kill_dialog (window); } break; case G_IO_STATUS_EOF: @@ -1577,6 +1598,9 @@ set_invisible_cursor (GTK_WIDGET (window)->window, FALSE); + window->priv->dialog_quit_requested = FALSE; + window->priv->dialog_shake_in_progress = FALSE; + result = spawn_on_window (window, command->str, &window->priv->lock_pid, multihead-issues.patch: gs-manager.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) --- NEW FILE multihead-issues.patch --- diff -up gnome-screensaver-2.28.0/src/gs-manager.c.multihead-issues gnome-screensaver-2.28.0/src/gs-manager.c --- gnome-screensaver-2.28.0/src/gs-manager.c.multihead-issues 2009-08-19 19:19:14.000000000 -0400 +++ gnome-screensaver-2.28.0/src/gs-manager.c 2009-10-23 19:48:08.306135389 -0400 @@ -1450,6 +1450,9 @@ gs_manager_create_window_for_monitor (GS connect_window_signals (manager, window); manager->priv->windows = g_slist_append (manager->priv->windows, window); + + if (manager->priv->active && !manager->priv->fading) + gtk_widget_show (window); } static void @@ -1471,21 +1474,25 @@ on_screen_monitors_changed (GdkScreen *s if (n_monitors > n_windows) { /* add more windows */ for (i = n_windows; i < n_monitors; i++) { - gs_manager_create_window_for_monitor (manager, screen, i - 1); + gs_manager_create_window_for_monitor (manager, screen, i); } } else { /* remove the extra windows */ - for (l = manager->priv->windows; l != NULL; l = l->next) { + l = manager->priv->windows; + while (l != NULL) { GdkScreen *this_screen; int this_monitor; + GSList *next = l->next; this_screen = gs_window_get_screen (GS_WINDOW (l->data)); this_monitor = gs_window_get_monitor (GS_WINDOW (l->data)); if (this_screen == screen && this_monitor >= n_monitors) { manager_maybe_stop_job_for_window (manager, GS_WINDOW (l->data)); + g_hash_table_remove (manager->priv->jobs, l->data); gs_window_destroy (GS_WINDOW (l->data)); manager->priv->windows = g_slist_delete_link (manager->priv->windows, l); } + l = next; } } } xrandr-gamma.patch: gs-fade.c | 570 +++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 384 insertions(+), 186 deletions(-) --- NEW FILE xrandr-gamma.patch --- diff -up gnome-screensaver-2.28.0/src/gs-fade.c.xrandr-gamma gnome-screensaver-2.28.0/src/gs-fade.c --- gnome-screensaver-2.28.0/src/gs-fade.c.xrandr-gamma 2009-08-19 19:19:14.000000000 -0400 +++ gnome-screensaver-2.28.0/src/gs-fade.c 2009-10-22 14:04:06.740384504 -0400 @@ -40,22 +40,19 @@ #include "gs-fade.h" #include "gs-debug.h" +#define GNOME_DESKTOP_USE_UNSTABLE_API + +#include "libgnomeui/gnome-rr.h" + /* XFree86 4.x+ Gamma fading */ + #ifdef HAVE_XF86VMODE_GAMMA #include #define XF86_MIN_GAMMA 0.1 -typedef struct { - XF86VidModeGamma vmg; - int size; - unsigned short *r; - unsigned short *g; - unsigned short *b; -} xf86_gamma_info; - #endif /* HAVE_XF86VMODE_GAMMA */ static void gs_fade_class_init (GSFadeClass *klass); @@ -64,6 +61,31 @@ static void gs_fade_finalize (GObj #define GS_FADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_FADE, GSFadePrivate)) +struct GSGammaInfo { + int size; + unsigned short *r; + unsigned short *g; + unsigned short *b; +}; + +struct GSFadeScreenPrivate +{ + int fade_type; + int num_ramps; + /* one per crtc in randr mode */ + struct GSGammaInfo *info; + /* one per screen in theory */ + GnomeRRScreen *rrscreen; +#ifdef HAVE_XF86VMODE_GAMMA + /* one per screen also */ + XF86VidModeGamma vmg; +#endif /* HAVE_XF86VMODE_GAMMA */ + gboolean (*fade_setup) (GSFade *fade, int screen); + gboolean (*fade_set_alpha_gamma) (GSFade *fade, + int screen, gdouble alpha); + void (*fade_finish) (GSFade *fade, int screen); +}; + struct GSFadePrivate { guint enabled : 1; @@ -78,14 +100,9 @@ struct GSFadePrivate gdouble alpha_per_iter; gdouble current_alpha; - int fade_type; - int num_screens; -#ifdef HAVE_XF86VMODE_GAMMA - xf86_gamma_info *gamma_info; -#endif /* HAVE_XF86VMODE_GAMMA */ - + struct GSFadeScreenPrivate *screen_priv; }; enum { @@ -96,7 +113,8 @@ enum { enum { FADE_TYPE_NONE, FADE_TYPE_GAMMA_NUMBER, - FADE_TYPE_GAMMA_RAMP + FADE_TYPE_GAMMA_RAMP, + FADE_TYPE_XRANDR, }; static guint signals [LAST_SIGNAL] = { 0, }; @@ -149,10 +167,16 @@ safe_XF86VidModeQueryVersion (Display *d static gboolean xf86_whack_gamma (int screen, - xf86_gamma_info *info, + struct GSFadeScreenPrivate *screen_priv, float ratio) { Bool status; + struct GSGammaInfo *gamma_info; + + gamma_info = screen_priv->info; + + if (!gamma_info) + return FALSE; if (ratio < 0) { ratio = 0; @@ -161,14 +185,14 @@ xf86_whack_gamma (int scree ratio = 1; } - if (info->size == 0) { + if (gamma_info->size == 0) { /* we only have a gamma number, not a ramp. */ XF86VidModeGamma g2; - g2.red = info->vmg.red * ratio; - g2.green = info->vmg.green * ratio; - g2.blue = info->vmg.blue * ratio; + g2.red = screen_priv->vmg.red * ratio; + g2.green = screen_priv->vmg.green * ratio; + g2.blue = screen_priv->vmg.blue * ratio; if (g2.red < XF86_MIN_GAMMA) { g2.red = XF86_MIN_GAMMA; @@ -187,21 +211,21 @@ xf86_whack_gamma (int scree unsigned short *r, *g, *b; int i; - r = g_new0 (unsigned short, info->size); - g = g_new0 (unsigned short, info->size); - b = g_new0 (unsigned short, info->size); - - for (i = 0; i < info->size; i++) { - r[i] = info->r[i] * ratio; - g[i] = info->g[i] * ratio; - b[i] = info->b[i] * ratio; + r = g_new0 (unsigned short, gamma_info->size); + g = g_new0 (unsigned short, gamma_info->size); + b = g_new0 (unsigned short, gamma_info->size); + + for (i = 0; i < gamma_info->size; i++) { + r[i] = gamma_info->r[i] * ratio; + g[i] = gamma_info->g[i] * ratio; + b[i] = gamma_info->b[i] * ratio; } - status = XF86VidModeSetGammaRamp (GDK_DISPLAY (), screen, info->size, r, g, b); + status = XF86VidModeSetGammaRamp (GDK_DISPLAY (), screen, gamma_info->size, r, g, b); - free (r); - free (g); - free (b); + g_free (r); + g_free (g); + g_free (b); # else /* !HAVE_XF86VMODE_GAMMA_RAMP */ abort (); @@ -223,44 +247,6 @@ xf86_whack_gamma (int scree # define XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR 2 # define XF86_VIDMODE_GAMMA_RAMP_MIN_MINOR 1 -static int -check_gamma_extension (void) -{ -#ifdef HAVE_XF86VMODE_GAMMA - int event; - int error; - int major; - int minor; - gboolean res; - - res = XF86VidModeQueryExtension (GDK_DISPLAY (), &event, &error); - if (! res) { - return FADE_TYPE_NONE; /* display doesn't have the extension. */ - } - - res = safe_XF86VidModeQueryVersion (GDK_DISPLAY (), &major, &minor); - if (! res) { - return FADE_TYPE_NONE; /* unable to get version number? */ - } - - if (major < XF86_VIDMODE_GAMMA_MIN_MAJOR || - (major == XF86_VIDMODE_GAMMA_MIN_MAJOR && - minor < XF86_VIDMODE_GAMMA_MIN_MINOR)) { - return FADE_TYPE_NONE; /* extension is too old for gamma. */ - } - - if (major < XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR || - (major == XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR && - minor < XF86_VIDMODE_GAMMA_RAMP_MIN_MINOR)) { - return FADE_TYPE_GAMMA_NUMBER; /* extension is too old for gamma ramps. */ - } - - /* Copacetic */ - return FADE_TYPE_GAMMA_RAMP; -#else - return FADE_TYPE_NONE; -#endif /* HAVE_XF86VMODE_GAMMA */ -} gboolean gs_fade_get_enabled (GSFade *fade) @@ -282,86 +268,80 @@ gs_fade_set_enabled (GSFade *fade, } static gboolean -gamma_info_init (GSFade *fade) +gamma_fade_setup (GSFade *fade, int screen_idx) { #ifdef HAVE_XF86VMODE_GAMMA - int screen; - xf86_gamma_info *info; gboolean res; + struct GSFadeScreenPrivate *screen_priv; + + screen_priv = &fade->priv->screen_priv[screen_idx]; + + if (screen_priv->info) + return TRUE; # ifndef HAVE_XF86VMODE_GAMMA_RAMP - if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) { + if (FADE_TYPE_GAMMA_RAMP == screen_priv->fade_type) { /* server is newer than client! */ - fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER; + screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER; } # endif - if (fade->priv->gamma_info != NULL) { - return TRUE; - } - - info = g_new0 (xf86_gamma_info, fade->priv->num_screens); - fade->priv->gamma_info = info; - - /* Get the current gamma maps for all screens. - Bug out and return -1 if we can't get them for some screen. - */ - for (screen = 0; screen < fade->priv->num_screens; screen++) { - # ifdef HAVE_XF86VMODE_GAMMA_RAMP + + screen_priv->info = g_new0(struct GSGammaInfo, 1); + screen_priv->num_ramps = 1; + + if (FADE_TYPE_GAMMA_RAMP == screen_priv->fade_type) { + /* have ramps */ + + res = XF86VidModeGetGammaRampSize (GDK_DISPLAY (), screen_idx, &screen_priv->info->size); + if (!res || screen_priv->info->size <= 0) { + screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER; + goto test_number; + } - if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) { - /* have ramps */ + screen_priv->info->r = g_new0 (unsigned short, screen_priv->info->size); + screen_priv->info->g = g_new0 (unsigned short, screen_priv->info->size); + screen_priv->info->b = g_new0 (unsigned short, screen_priv->info->size); + + if (! (screen_priv->info->r && screen_priv->info->g && screen_priv->info->b)) { + screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER; + goto test_number; + } - res = XF86VidModeGetGammaRampSize (GDK_DISPLAY (), screen, &info [screen].size); - if (! res || info [screen].size <= 0) { - fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER; - goto test_number; - } - - info [screen].r = g_new0 (unsigned short, info[screen].size); - info [screen].g = g_new0 (unsigned short, info[screen].size); - info [screen].b = g_new0 (unsigned short, info[screen].size); - - if (! (info [screen].r && info [screen].g && info [screen].b)) { - fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER; - goto test_number; - } - - res = XF86VidModeGetGammaRamp (GDK_DISPLAY (), - screen, - info [screen].size, - info [screen].r, - info [screen].g, - info [screen].b); - if (! res) { - fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER; - goto test_number; - } - gs_debug ("Initialized gamma ramp fade"); + res = XF86VidModeGetGammaRamp (GDK_DISPLAY (), + screen_idx, + screen_priv->info->size, + screen_priv->info->r, + screen_priv->info->g, + screen_priv->info->b); + if (! res) { + screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER; + goto test_number; } + gs_debug ("Initialized gamma ramp fade"); + } # endif /* HAVE_XF86VMODE_GAMMA_RAMP */ test_number: - if (FADE_TYPE_GAMMA_NUMBER == fade->priv->fade_type) { - /* only have gamma parameter, not ramps. */ - - res = XF86VidModeGetGamma (GDK_DISPLAY (), screen, &info [screen].vmg); - if (! res) { - fade->priv->fade_type = FADE_TYPE_NONE; - goto test_none; - } - gs_debug ("Initialized gamma fade for screen %d: %f %f %f", - screen, - info [screen].vmg.red, - info [screen].vmg.green, - info [screen].vmg.blue); + if (FADE_TYPE_GAMMA_NUMBER == screen_priv->fade_type) { + /* only have gamma parameter, not ramps. */ + + res = XF86VidModeGetGamma (GDK_DISPLAY (), screen_idx, &screen_priv->vmg); + if (! res) { + screen_priv->fade_type = FADE_TYPE_NONE; + goto test_none; } - + gs_debug ("Initialized gamma fade for screen %d: %f %f %f", + screen_idx, + screen_priv->vmg.red, + screen_priv->vmg.green, + screen_priv->vmg.blue); + } + test_none: - if (FADE_TYPE_NONE == fade->priv->fade_type) { - goto FAIL; - } + if (FADE_TYPE_NONE == screen_priv->fade_type) { + goto FAIL; } return TRUE; @@ -369,76 +349,263 @@ gamma_info_init (GSFade *fade) #endif /* HAVE_XF86VMODE_GAMMA */ -return FALSE; + return FALSE; } static void -gamma_info_free (GSFade *fade) +screen_fade_finish (GSFade *fade, int screen_idx) { -#ifdef HAVE_XF86VMODE_GAMMA + struct GSFadeScreenPrivate *screen_priv; + int i; + screen_priv = &fade->priv->screen_priv[screen_idx]; - if (fade->priv->gamma_info) { - int screen; + if (!screen_priv->info) + return; - for (screen = 0; screen < fade->priv->num_screens; screen++) { - if (fade->priv->gamma_info [screen].r) { - g_free (fade->priv->gamma_info[screen].r); - } - if (fade->priv->gamma_info [screen].g) { - g_free (fade->priv->gamma_info[screen].g); - } - if (fade->priv->gamma_info [screen].b) { - g_free (fade->priv->gamma_info[screen].b); - } - } + for (i = 0; i < screen_priv->num_ramps; i++) { + if (screen_priv->info[i].r) + g_free (screen_priv->info[i].r); + if (screen_priv->info[i].g) + g_free (screen_priv->info[i].g); + if (screen_priv->info[i].b) + g_free (screen_priv->info[i].b); + } + + g_free (screen_priv->info); + screen_priv->info = NULL; + screen_priv->num_ramps = 0; +} - g_free (fade->priv->gamma_info); - fade->priv->gamma_info = NULL; - } +static gboolean +gamma_fade_set_alpha_gamma (GSFade *fade, + int screen_idx, + gdouble alpha) +{ +#ifdef HAVE_XF86VMODE_GAMMA + struct GSFadeScreenPrivate *screen_priv; + gboolean res; + screen_priv = &fade->priv->screen_priv[screen_idx]; + res = xf86_whack_gamma (screen_idx, screen_priv, alpha); + + return TRUE; +#else + return FALSE; #endif /* HAVE_XF86VMODE_GAMMA */ } -static gboolean -gs_fade_set_alpha_gamma (GSFade *fade, - gdouble alpha) +static void +check_gamma_extension (GSFade *fade, int screen_idx) { #ifdef HAVE_XF86VMODE_GAMMA - int screen; + struct GSFadeScreenPrivate *screen_priv; + int event; + int error; + int major; + int minor; gboolean res; - if (fade->priv->gamma_info != NULL) { - for (screen = 0; screen < fade->priv->num_screens; screen++) { - res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha); - } + screen_priv = &fade->priv->screen_priv[screen_idx]; + + res = XF86VidModeQueryExtension (GDK_DISPLAY (), &event, &error); + if (! res) + goto fade_none; + + res = safe_XF86VidModeQueryVersion (GDK_DISPLAY (), &major, &minor); + if (! res) + goto fade_none; + + if (major < XF86_VIDMODE_GAMMA_MIN_MAJOR || + (major == XF86_VIDMODE_GAMMA_MIN_MAJOR && + minor < XF86_VIDMODE_GAMMA_MIN_MINOR)) + goto fade_none; + + screen_priv->fade_setup = gamma_fade_setup; + screen_priv->fade_finish = screen_fade_finish; + screen_priv->fade_set_alpha_gamma = gamma_fade_set_alpha_gamma; + + if (major < XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR || + (major == XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR && + minor < XF86_VIDMODE_GAMMA_RAMP_MIN_MINOR)) { + screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER; + return; } + /* Copacetic */ + screen_priv->fade_type = FADE_TYPE_GAMMA_RAMP; + return; + fade_none: +#endif + screen_priv->fade_type = FADE_TYPE_NONE; +} + +/* Xrandr support */ + +static gboolean xrandr_fade_setup (GSFade *fade, int screen_idx) +{ + struct GSFadeScreenPrivate *screen_priv; + GnomeRRCrtc *crtc; + GnomeRRCrtc **crtcs; + int crtc_count = 0; + struct GSGammaInfo *info; + gboolean res; + + screen_priv = &fade->priv->screen_priv[screen_idx]; + + if (screen_priv->info) + return TRUE; + + /* refresh the screen info */ + gnome_rr_screen_refresh (screen_priv->rrscreen, NULL); + + crtcs = gnome_rr_screen_list_crtcs (screen_priv->rrscreen); + while (*crtcs) { + crtc_count++; + crtcs++; + }; + + screen_priv->info = g_new0 (struct GSGammaInfo, crtc_count); + screen_priv->num_ramps = crtc_count; + + crtc_count = 0; + crtcs = gnome_rr_screen_list_crtcs (screen_priv->rrscreen); + while (*crtcs) + { + crtc = *crtcs; + + info = &screen_priv->info[crtc_count]; + + /* if no mode ignore crtc */ + if (!gnome_rr_crtc_get_current_mode (crtc)) { + info->size = 0; + info->r = NULL; + info->g = NULL; + info->b = NULL; + } + else { + res = gnome_rr_crtc_get_gamma (crtc, &info->size, + &info->r, &info->g, + &info->b); + if (res == FALSE) + goto fail; + } + + crtcs++; + crtc_count++; + } return TRUE; -#else + fail: return FALSE; -#endif /* HAVE_XF86VMODE_GAMMA */ +} + +static void xrandr_crtc_whack_gamma (GnomeRRCrtc *crtc, + struct GSGammaInfo *gamma_info, + float ratio) +{ + unsigned short *r, *g, *b; + int i; + + if (gamma_info->size == 0) + return; + + if (ratio < 0) { + ratio = 0; + } + if (ratio > 1) { + ratio = 1; + } + + r = g_new0 (unsigned short, gamma_info->size); + g = g_new0 (unsigned short, gamma_info->size); + b = g_new0 (unsigned short, gamma_info->size); + + for (i = 0; i < gamma_info->size; i++) { + r[i] = gamma_info->r[i] * ratio; + g[i] = gamma_info->g[i] * ratio; + b[i] = gamma_info->b[i] * ratio; + } + + gnome_rr_crtc_set_gamma (crtc, gamma_info->size, + r, g, b); + g_free (r); + g_free (g); + g_free (b); +} + +static gboolean xrandr_fade_set_alpha_gamma (GSFade *fade, + int screen_idx, + gdouble alpha) +{ + struct GSFadeScreenPrivate *screen_priv; + struct GSGammaInfo *info; + GnomeRRCrtc **crtcs; + int i; + + screen_priv = &fade->priv->screen_priv[screen_idx]; + + if (!screen_priv->info) + return FALSE; + + crtcs = gnome_rr_screen_list_crtcs (screen_priv->rrscreen); + i = 0; + + while (*crtcs) + { + info = &screen_priv->info[i]; + xrandr_crtc_whack_gamma (*crtcs, info, alpha); + i++; + crtcs++; + } + return TRUE; +} + +static void +check_randr_extension (GSFade *fade, int screen_idx) +{ + GdkDisplay *display = gdk_display_get_default (); + GdkScreen *screen = gdk_display_get_screen (display, screen_idx); + struct GSFadeScreenPrivate *screen_priv; + + screen_priv = &fade->priv->screen_priv[screen_idx]; + + screen_priv->rrscreen = gnome_rr_screen_new (screen, + NULL, + NULL, + NULL); + if (!screen_priv->rrscreen) { + screen_priv->fade_type = FADE_TYPE_NONE; + return; + } + + screen_priv->fade_type = FADE_TYPE_XRANDR; + screen_priv->fade_setup = xrandr_fade_setup; + screen_priv->fade_finish = screen_fade_finish; + screen_priv->fade_set_alpha_gamma = xrandr_fade_set_alpha_gamma; } static gboolean gs_fade_set_alpha (GSFade *fade, gdouble alpha) { - gboolean ret; + gboolean ret = FALSE; + int i; - switch (fade->priv->fade_type) { - case FADE_TYPE_GAMMA_RAMP: - case FADE_TYPE_GAMMA_NUMBER: - ret = gs_fade_set_alpha_gamma (fade, alpha); - break; - case FADE_TYPE_NONE: - ret = FALSE; - break; - default: - g_warning ("Unknown fade type"); - ret = FALSE; - break; + for (i = 0; i < fade->priv->num_screens; i++) { + switch (fade->priv->screen_priv[i].fade_type) { + case FADE_TYPE_GAMMA_RAMP: + case FADE_TYPE_GAMMA_NUMBER: + case FADE_TYPE_XRANDR: + ret = fade->priv->screen_priv[i].fade_set_alpha_gamma (fade, i, alpha); + break; + case FADE_TYPE_NONE: + ret = FALSE; + break; + default: + g_warning ("Unknown fade type"); + ret = FALSE; + break; + } } - return ret; } @@ -527,10 +694,18 @@ gs_fade_start (GSFade *fade, { guint steps_per_sec = 30; guint msecs_per_step; + struct GSFadeScreenPrivate *screen_priv; + gboolean active_fade, res; + int i; g_return_if_fail (GS_IS_FADE (fade)); - gamma_info_init (fade); + for (i = 0; i < fade->priv->num_screens; i++) { + screen_priv = &fade->priv->screen_priv[i]; + res = screen_priv->fade_setup (fade, i); + if (res == FALSE) + return; + } if (fade->priv->timer_id > 0) { gs_fade_stop (fade); @@ -540,7 +715,13 @@ gs_fade_start (GSFade *fade, gs_fade_set_timeout (fade, timeout); - if (fade->priv->fade_type != FADE_TYPE_NONE) { + active_fade = FALSE; + for (i = 0; i < fade->priv->num_screens; i++) { + screen_priv = &fade->priv->screen_priv[i]; + if (screen_priv->fade_type != FADE_TYPE_NONE) + active_fade = TRUE; + } + if (active_fade) { guint num_steps; num_steps = (fade->priv->timeout / 1000) * steps_per_sec; @@ -639,6 +820,7 @@ gs_fade_sync (GSFade *fade, void gs_fade_reset (GSFade *fade) { + int i; g_return_if_fail (GS_IS_FADE (fade)); gs_debug ("Resetting fade"); @@ -651,7 +833,8 @@ gs_fade_reset (GSFade *fade) gs_fade_set_alpha (fade, fade->priv->current_alpha); - gamma_info_free (fade); + for (i = 0; i < fade->priv->num_screens; i++) + fade->priv->screen_priv[i].fade_finish (fade, i); } static void @@ -679,28 +862,31 @@ static void gs_fade_init (GSFade *fade) { GdkDisplay *display; + int i; fade->priv = GS_FADE_GET_PRIVATE (fade); fade->priv->timeout = 1000; fade->priv->current_alpha = 1.0; - fade->priv->fade_type = check_gamma_extension (); - - gs_debug ("Fade type: %d", fade->priv->fade_type); - display = gdk_display_get_default (); fade->priv->num_screens = gdk_display_get_n_screens (display); -#ifdef HAVE_XF86VMODE_GAMMA - fade->priv->gamma_info = NULL; -#endif + fade->priv->screen_priv = g_new0 (struct GSFadeScreenPrivate, fade->priv->num_screens); + + for (i = 0; i < fade->priv->num_screens; i++) { + check_randr_extension (fade, i); + if (!fade->priv->screen_priv[i].fade_type) + check_gamma_extension (fade, i); + gs_debug ("Fade type: %d", fade->priv->screen_priv[i].fade_type); + } } static void gs_fade_finalize (GObject *object) { GSFade *fade; + int i; g_return_if_fail (object != NULL); g_return_if_fail (GS_IS_FADE (object)); @@ -709,8 +895,20 @@ gs_fade_finalize (GObject *object) g_return_if_fail (fade->priv != NULL); - gamma_info_free (fade); + for (i = 0; i < fade->priv->num_screens; i++) + fade->priv->screen_priv[i].fade_finish(fade, i); + if (fade->priv->screen_priv) { + for (i = 0; i < fade->priv->num_screens; i++) { + if (!fade->priv->screen_priv[i].rrscreen) + continue; + gnome_rr_screen_destroy (fade->priv->screen_priv[i].rrscreen); + } + + g_free (fade->priv->screen_priv); + fade->priv->screen_priv = NULL; + } + G_OBJECT_CLASS (gs_fade_parent_class)->finalize (object); } Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.228 retrieving revision 1.229 diff -u -p -r1.228 -r1.229 --- gnome-screensaver.spec 23 Sep 2009 21:56:20 -0000 1.228 +++ gnome-screensaver.spec 2 Nov 2009 04:52:16 -0000 1.229 @@ -7,14 +7,14 @@ %define gconf2_version 2.6.1 %define redhat_menus_version 5.0.1 %define gnome_menus_version 2.11.1 -%define gnome_desktop_version 2.23.2 +%define gnome_desktop_version 2.28.1-2.fc12 %define libexif_version 0.6.12 %define libgnomekbd_version 2.21 Summary: GNOME Screensaver Name: gnome-screensaver Version: 2.28.0 -Release: 1%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Amusements/Graphics Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2 @@ -25,6 +25,9 @@ Patch1: gnome-screensaver-2.20.0-default Patch2: gnome-screensaver-2.26.0-securitytoken.patch Patch7: gnome-screensaver-2.20.0-blank-by-default.patch Patch8: gnome-screensaver-2.20.0-selinux-permit.patch +Patch9: xrandr-gamma.patch +Patch10: multihead-issues.patch +Patch11: ask-to-die.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org @@ -77,6 +80,9 @@ simple, sane, secure defaults and be wel #%patch2 -p1 -b .securitytoken %patch7 -p1 -b .blank-by-default %patch8 -p1 -b .selinux-permit +%patch9 -p1 -b .xrandr-gamma +%patch10 -p1 -b .multihead-issues +%patch11 -p1 -b .ask-to-die libtoolize --force --copy @@ -151,6 +157,19 @@ fi %doc %{_mandir}/man1/*.1.gz %changelog +* Fri Oct 23 2009 Matthias Clasen 2.28.0-5 +- Make the dialog ask to be killed after 5 attempts + +* Fri Oct 23 2009 Matthias Clasen 2.28.0-4 +- Fix crashes and malfunctions in dynamic multihead situations + +* Thu Oct 22 2009 Matthias Clasen 2.28.0-3 +- Fix an oversight in the previous patch + +* Thu Oct 22 2009 Matthias Clasen 2.28.0-2 +- Use xrandr for gamma fading, if available, to fix fading in + multihead setups + * Wed Sep 23 2009 Matthias Clasen 2.28.0-1 - Update to 2.28.0 From mclasen at fedoraproject.org Mon Nov 2 04:55:07 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:55:07 +0000 (UTC) Subject: rpms/gtk2-engines/devel tooltips.patch, NONE, 1.1 gtk2-engines.spec, 1.116, 1.117 sources, 1.67, 1.68 Message-ID: <20091102045507.65D4211C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gtk2-engines/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30767 Modified Files: gtk2-engines.spec sources Added Files: tooltips.patch Log Message: Copy F12 work over tooltips.patch: gtkrc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- NEW FILE tooltips.patch --- diff -up gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc --- gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips 2009-10-23 17:28:48.131886076 -0400 +++ gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc 2009-10-23 17:29:58.968890361 -0400 @@ -1,7 +1,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F5F5B5" +gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#E7F3FD" style "default" { xthickness = 1 @@ -276,9 +276,11 @@ style "treeview_header" = "default" { } style "tooltips" { - xthickness = 4 + xthickness = 8 ythickness = 4 + GtkWidget::new-tooltip-style = 1 + bg[NORMAL] = @tooltip_bg_color fg[NORMAL] = @tooltip_fg_color } Index: gtk2-engines.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/gtk2-engines.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -p -r1.116 -r1.117 --- gtk2-engines.spec 22 Sep 2009 00:19:20 -0000 1.116 +++ gtk2-engines.spec 2 Nov 2009 04:55:06 -0000 1.117 @@ -1,7 +1,7 @@ Summary: Theme engines for GTK+ 2.0 Name: gtk2-engines -Version: 2.18.3 -Release: 1%{?dist} +Version: 2.18.4 +Release: 4%{?dist} # for details on which engines are GPL vs LGPL, see COPYING License: LGPLv2+ Group: System Environment/Libraries @@ -21,6 +21,8 @@ BuildRoot: %{_tmppath}/%{name}-%{ve # http://bugzilla.gnome.org/show_bug.cgi?id=593030 Patch0: gtk-engines-2.18.2-change-bullet.patch +Patch1: tooltips.patch + %package devel Summary: Development files for %{name} Group: Development/Libraries @@ -42,6 +44,7 @@ toolkits or operating systems. %setup -q -n gtk-engines-%{version} %patch0 -p1 -b .change-bullet +%patch1 -p1 -b .tooltips %build %configure @@ -81,6 +84,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/gtk-engines-2.pc %changelog +* Fri Oct 23 2009 Matthias Clasen - 2.18.4-4 +- Make Clearlooks opt-in to new tooltips style + +* Wed Oct 21 2009 Matthias Clasen - 2.18.4-3 +- Tweak tooltip appearance + +* Tue Oct 20 2009 Matthias Clasen - 2.18.4-2 +- New tooltip appearance + +* Tue Sep 29 2009 Matthias Clasen - 2.18.4-1 +- Update to 2.18.4 + * Mon Sep 21 2009 Matthias Clasen - 2.18.3-1 - Update to 2.18.3 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gtk2-engines/devel/sources,v retrieving revision 1.67 retrieving revision 1.68 diff -u -p -r1.67 -r1.68 --- sources 22 Sep 2009 00:19:20 -0000 1.67 +++ sources 2 Nov 2009 04:55:06 -0000 1.68 @@ -1 +1 @@ -eb50c327331396be735570190d82db81 gtk-engines-2.18.3.tar.bz2 +95748497eafdfe898588931f08b2fccc gtk-engines-2.18.4.tar.bz2 From mclasen at fedoraproject.org Mon Nov 2 04:57:00 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 04:57:00 +0000 (UTC) Subject: rpms/gnome-themes/devel gnome-themes.spec, 1.148, 1.149 sources, 1.89, 1.90 Message-ID: <20091102045700.91E0E11C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-themes/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31507 Modified Files: gnome-themes.spec sources Log Message: Copy F-12 work over Index: gnome-themes.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -p -r1.148 -r1.149 --- gnome-themes.spec 22 Sep 2009 20:34:37 -0000 1.148 +++ gnome-themes.spec 2 Nov 2009 04:56:59 -0000 1.149 @@ -1,9 +1,12 @@ Summary: Themes for GNOME Name: gnome-themes -Version: 2.28.0 -Release:1%{?dist} +Version: 2.28.1 +Release: 2%{?dist} URL: http://download.gnome.org/sources/gnome-themes/ Source: http://download.gnome.org/sources/gnome-themes/2.28/%{name}-%{version}.tar.bz2 +# Icons done by Andreas Nilsson for http://live.gnome.org/GnomeArt/ArtRequests/issue26 +# svg versions done by Maureen Duffy +Source2: mist-folders-xdg.tar.gz License: LGPLv2 and GPLv2 Group: User Interface/Desktops BuildArch: noarch @@ -51,6 +54,12 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/themes/ # Remove the test theme rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/ClearlooksTest/ +# Put extra Mist folder icons in place +tar xzf %{SOURCE2} +cp mist-folders-xdg/16x16/*.png $RPM_BUILD_ROOT%{_datadir}/icons/Mist/16x16/places +cp mist-folders-xdg/24x24/*.png $RPM_BUILD_ROOT%{_datadir}/icons/Mist/24x24/places +cp mist-folders-xdg/scalable/*.svg $RPM_BUILD_ROOT%{_datadir}/icons/Mist/scalable/places + # we want to own the icon caches for dir in $RPM_BUILD_ROOT%{_datadir}/icons/*; do touch $dir/icon-theme.cache @@ -97,6 +106,15 @@ done %doc AUTHORS COPYING NEWS README %changelog +* Tue Oct 20 2009 Matthias Clasen - 2.28.1-2 +- Add scalable versions of the xdg folder icons to Mist + +* Mon Oct 19 2009 Matthias Clasen - 2.28.1-1 +- Update to 2.28.1 + +* Sun Oct 18 2009 Matthias Clasen - 2.28.0-2 +- Add xdg folder icons to Mist + * Tue Sep 22 2009 Matthias Clasen - 2.28.0-1 - Update to 2.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- sources 22 Sep 2009 20:34:37 -0000 1.89 +++ sources 2 Nov 2009 04:56:59 -0000 1.90 @@ -1 +1,2 @@ -c89c3e08e45c4e94d76a9a7d40b74214 gnome-themes-2.28.0.tar.bz2 +7ab4fcb568c768dd8818bb1caf097998 mist-folders-xdg.tar.gz +0159b27d7f72c74ae9595486fc13814b gnome-themes-2.28.1.tar.bz2 From mclasen at fedoraproject.org Mon Nov 2 05:00:25 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:00:25 +0000 (UTC) Subject: rpms/gnome-utils/devel 0001-gsearchtool-Backport-the-version-fix.patch, NONE, 1.1 spinner.patch, NONE, 1.1 gnome-utils.spec, 1.203, 1.204 sources, 1.81, 1.82 dupe-id.patch, 1.1, NONE Message-ID: <20091102050025.D178311C0417@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv341 Modified Files: gnome-utils.spec sources Added Files: 0001-gsearchtool-Backport-the-version-fix.patch spinner.patch Removed Files: dupe-id.patch Log Message: Copy F12 work over 0001-gsearchtool-Backport-the-version-fix.patch: ChangeLog | 7 +++++++ gsearchtool-callbacks.c | 11 +++++++++++ gsearchtool-callbacks.h | 5 +++++ gsearchtool-support.c | 2 +- gsearchtool.c | 4 ++-- 5 files changed, 26 insertions(+), 3 deletions(-) --- NEW FILE 0001-gsearchtool-Backport-the-version-fix.patch --- >From d300c1a0d6c53f46b96363068713c1a14aaa77ab Mon Sep 17 00:00:00 2001 From: Dennis Cranston Date: Wed, 21 Oct 2009 14:43:43 -0700 Subject: [PATCH 1/3] [gsearchtool] Backport the "--version" fix Backport the "--version" command line fix without introducting a new string. Also, fix a compiler warning. --- gsearchtool/ChangeLog | 7 +++++++ gsearchtool/gsearchtool-callbacks.c | 11 +++++++++++ gsearchtool/gsearchtool-callbacks.h | 5 +++++ gsearchtool/gsearchtool-support.c | 2 +- gsearchtool/gsearchtool.c | 3 ++- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/gsearchtool/ChangeLog b/gsearchtool/ChangeLog index ff2f4af..7397146 100644 --- a/gsearchtool/ChangeLog +++ b/gsearchtool/ChangeLog @@ -1,3 +1,10 @@ +2009-10-21 Dennis Cranston + + * gsearchtool.c, gsearchtool-callbacks.[ch]: Backport the + "--version" command line argument fix without introducing + a new string. + * gsearchtool-support.c: Fix compiler warning. + 2009-09-30 Dennis Cranston * gsearchtool.c: Remove new string from previous commit. diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c index 1496b8d..62cb86a 100644 --- a/gsearchtool/gsearchtool-callbacks.c +++ b/gsearchtool/gsearchtool-callbacks.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -94,6 +95,16 @@ quit_application (GSearchWindow * gsearch) } void +version_cb (const gchar * option_name, + const gchar * value, + gpointer data, + GError ** error) +{ + g_print ("%s %s\n", g_get_application_name (), VERSION); + exit (0); +} + +void quit_session_cb (EggSMClient * client, gpointer data) { diff --git a/gsearchtool/gsearchtool-callbacks.h b/gsearchtool/gsearchtool-callbacks.h index 604eed6..191cc94 100644 --- a/gsearchtool/gsearchtool-callbacks.h +++ b/gsearchtool/gsearchtool-callbacks.h @@ -36,6 +36,11 @@ extern "C" { #include "eggsmclient.h" void +version_cb (const gchar * option_name, + const gchar * value, + gpointer data, + GError ** error); +void quit_session_cb (EggSMClient * client, gpointer data); void diff --git a/gsearchtool/gsearchtool-support.c b/gsearchtool/gsearchtool-support.c index 0e1bc46..3852178 100644 --- a/gsearchtool/gsearchtool-support.c +++ b/gsearchtool/gsearchtool-support.c @@ -1195,7 +1195,7 @@ open_file_with_filemanager (GtkWidget * window, { GDesktopAppInfo * d_app_info; GKeyFile * key_file; - GdkAppLaunchContext *ctx; + GdkAppLaunchContext * ctx = NULL; GList * list = NULL; GAppInfo * g_app_info; GFile * g_file; diff --git a/gsearchtool/gsearchtool.c b/gsearchtool/gsearchtool.c index 37c5a88..0afc8b0 100644 --- a/gsearchtool/gsearchtool.c +++ b/gsearchtool/gsearchtool.c @@ -154,6 +154,7 @@ struct _GSearchGOptionArguments { } GSearchGOptionArguments; static GOptionEntry GSearchGOptionEntries[] = { + { "version", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, version_cb, NULL, NULL}, { "named", 0, 0, G_OPTION_ARG_STRING, &GSearchGOptionArguments.name, NULL, N_("STRING") }, { "path", 0, 0, G_OPTION_ARG_STRING, &GSearchGOptionArguments.path, NULL, N_("PATH") }, { "sortby", 0, 0, G_OPTION_ARG_STRING, &GSearchGOptionArguments.sortby, NULL, N_("VALUE") }, @@ -1281,7 +1282,7 @@ add_atk_relation (GtkWidget * obj1, static void gsearch_setup_goption_descriptions (void) { - gint i = 0; + gint i = 1; gint j; GSearchGOptionEntries[i++].description = g_strdup (_("Set the text of \"Name contains\" search option")); -- 1.6.5.1 spinner.patch: gsearchtool-spinner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE spinner.patch --- diff -up gnome-utils-2.28.1/gsearchtool/gsearchtool-spinner.c.spinnger gnome-utils-2.28.1/gsearchtool/gsearchtool-spinner.c --- gnome-utils-2.28.1/gsearchtool/gsearchtool-spinner.c.spinnger 2009-10-23 23:17:47.027129886 -0400 +++ gnome-utils-2.28.1/gsearchtool/gsearchtool-spinner.c 2009-10-23 23:17:59.375132425 -0400 @@ -194,7 +194,7 @@ gsearch_spinner_cache_data_load (GSearch /* Load the animation */ icon_info = gtk_icon_theme_lookup_icon (data->icon_theme, - "process-working", -1, 0); + "process-working", 16, 0); if (icon_info == NULL) { g_warning ("Throbber animation not found\n"); Index: gnome-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.203 retrieving revision 1.204 diff -u -p -r1.203 -r1.204 --- gnome-utils.spec 22 Sep 2009 02:52:01 -0000 1.203 +++ gnome-utils.spec 2 Nov 2009 05:00:21 -0000 1.204 @@ -8,8 +8,8 @@ %define gnome_panel_version 2.9.4 Name: gnome-utils -Version: 2.28.0 -Release: 1%{?dist} +Version: 2.28.1 +Release: 3%{?dist} Epoch: 1 Summary: GNOME utility programs @@ -17,10 +17,11 @@ Group: Applications/System License: GPLv2+ URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-utils/2.28/gnome-utils-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# http://bugzilla.gnome.org/show_bug.cgi?id=592661 -Patch0: dupe-id.patch +Patch0: spinner.patch +Patch1: 0001-gsearchtool-Backport-the-version-fix.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -38,8 +39,6 @@ BuildRequires: intltool BuildRequires: gnome-common BuildRequires: automake autoconf libtool -Requires: usermode - Requires(post): scrollkeeper Requires(post): desktop-file-utils >= %{desktop_file_utils_version} Requires(post): GConf2 >= 2.14 @@ -81,6 +80,7 @@ This package contains libraries provided Summary: A log file viewer for the GNOME desktop Group: Applications/System Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: usermode %description -n gnome-system-log The gnome-system-log package contains an application that lets you @@ -88,7 +88,8 @@ view various system log files. %prep %setup -q -%patch0 -p1 -b .dupe-id +%patch0 -p1 -b .spinner +%patch1 -p1 -b .version # Hide from menus pushd gsearchtool @@ -317,6 +318,18 @@ fi %{_mandir}/man1/gnome-system-log.1.gz %changelog +* Sun Oct 25 2009 Matthias Clasen - 1:2.28.1-3 +- Fxi the --version command (#516491) + +* Fri Oct 23 2009 Matthias Clasen - 1:2.28.1-2 +- Fix the gsearchtool spinner + +* Fri Oct 23 2009 Matthias Clasen - 1:2.28.1-1 +- Update to 2.28.1 + +* Mon Oct 5 2009 Matthias Clasen - 1:2.28.0-2 +- Move the usermode dep to the gnome-system-log package (#527295) + * Mon Sep 21 2009 Matthias Clasen - 1:2.28.0-1 - Update to 2.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-utils/devel/sources,v retrieving revision 1.81 retrieving revision 1.82 diff -u -p -r1.81 -r1.82 --- sources 22 Sep 2009 02:52:01 -0000 1.81 +++ sources 2 Nov 2009 05:00:21 -0000 1.82 @@ -1 +1 @@ -156e38fdf348bf2db4fcb7b84ddcc2aa gnome-utils-2.28.0.tar.bz2 +3c811993191ae0bbf8666405a504288a gnome-utils-2.28.1.tar.bz2 --- dupe-id.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:03:58 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:03:58 +0000 (UTC) Subject: rpms/gnome-session/F-12 gnome-session.spec, 1.253, 1.254 polkit1.patch, 1.4, NONE watch-spew.patch, 1.2, NONE Message-ID: <20091102050358.2556E11C02A3@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-session/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1776 Modified Files: gnome-session.spec Removed Files: polkit1.patch watch-spew.patch Log Message: Drop dead patches Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/F-12/gnome-session.spec,v retrieving revision 1.253 retrieving revision 1.254 diff -u -p -r1.253 -r1.254 --- gnome-session.spec 24 Oct 2009 03:41:46 -0000 1.253 +++ gnome-session.spec 2 Nov 2009 05:03:57 -0000 1.254 @@ -68,9 +68,9 @@ Requires(post): GConf2 >= %{gconf2_versi Requires(preun): GConf2 >= %{gconf2_version} # https://bugzilla.gnome.org/show_bug.cgi?id=592520 -#Patch0: unresponsive-timeout.patch +Patch0: unresponsive-timeout.patch # https://bugzilla.gnome.org/show_bug.cgi?id=592519 -#Patch1: show-lock.patch +Patch1: show-lock.patch # https://bugzilla.gnome.org/show_bug.cgi?id=598211 Patch2: xsmp-stop.patch --- polkit1.patch DELETED --- --- watch-spew.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:04:56 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:04:56 +0000 (UTC) Subject: rpms/gnome-session/F-12 gnome-session.spec,1.254,1.255 Message-ID: <20091102050456.DCFB311C02A3@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-session/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2145 Modified Files: gnome-session.spec Log Message: Fix spec Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/F-12/gnome-session.spec,v retrieving revision 1.254 retrieving revision 1.255 diff -u -p -r1.254 -r1.255 --- gnome-session.spec 2 Nov 2009 05:03:57 -0000 1.254 +++ gnome-session.spec 2 Nov 2009 05:04:56 -0000 1.255 @@ -68,9 +68,9 @@ Requires(post): GConf2 >= %{gconf2_versi Requires(preun): GConf2 >= %{gconf2_version} # https://bugzilla.gnome.org/show_bug.cgi?id=592520 -Patch0: unresponsive-timeout.patch +#Patch0: unresponsive-timeout.patch # https://bugzilla.gnome.org/show_bug.cgi?id=592519 -Patch1: show-lock.patch +#Patch1: show-lock.patch # https://bugzilla.gnome.org/show_bug.cgi?id=598211 Patch2: xsmp-stop.patch From mclasen at fedoraproject.org Mon Nov 2 05:06:56 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:06:56 +0000 (UTC) Subject: rpms/gnome-session/devel show-lock.patch, NONE, 1.1 unresponsive-timeout.patch, NONE, 1.1 xsmp-stop.patch, NONE, 1.1 gnome-session.spec, 1.252, 1.253 polkit1.patch, 1.4, NONE watch-spew.patch, 1.2, NONE Message-ID: <20091102050656.74AAC11C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-session/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2984 Modified Files: gnome-session.spec Added Files: show-lock.patch unresponsive-timeout.patch xsmp-stop.patch Removed Files: polkit1.patch watch-spew.patch Log Message: copy F12 work over show-lock.patch: gsm-inhibit-dialog.c | 38 ++++++++++++++++++++++++++++++++++---- gsm-manager.c | 1 + 2 files changed, 35 insertions(+), 4 deletions(-) --- NEW FILE show-lock.patch --- diff -up gnome-session-2.28.0/gnome-session/gsm-inhibit-dialog.c.show-lock gnome-session-2.28.0/gnome-session/gsm-inhibit-dialog.c --- gnome-session-2.28.0/gnome-session/gsm-inhibit-dialog.c.show-lock 2009-08-25 04:03:42.000000000 -0400 +++ gnome-session-2.28.0/gnome-session/gsm-inhibit-dialog.c 2009-10-14 10:50:42.337489281 -0400 @@ -71,13 +71,16 @@ struct GsmInhibitDialogPrivate gboolean have_xrender; int xrender_event_base; int xrender_error_base; + gboolean show_lock; + GtkWidget *lock_button; }; enum { PROP_0, PROP_ACTION, PROP_INHIBITOR_STORE, - PROP_CLIENT_STORE + PROP_CLIENT_STORE, + PROP_SHOW_LOCK }; enum { @@ -134,6 +137,15 @@ gsm_inhibit_dialog_set_action (GsmInhibi dialog->priv->action = action; } +static void +gsm_inhibit_dialog_set_show_lock (GsmInhibitDialog *dialog, + gboolean show_lock) +{ + dialog->priv->show_lock = show_lock; + gtk_widget_set_no_show_all (dialog->priv->lock_button, TRUE); + gtk_widget_set_visible (dialog->priv->lock_button, show_lock); +} + static gboolean find_inhibitor (GsmInhibitDialog *dialog, const char *id, @@ -809,6 +821,9 @@ gsm_inhibit_dialog_set_property (GObject case PROP_CLIENT_STORE: gsm_inhibit_dialog_set_client_store (dialog, g_value_get_object (value)); break; + case PROP_SHOW_LOCK: + gsm_inhibit_dialog_set_show_lock (dialog, g_value_get_boolean (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -833,6 +848,9 @@ gsm_inhibit_dialog_get_property (GObject case PROP_CLIENT_STORE: g_value_set_object (value, dialog->priv->clients); break; + case PROP_SHOW_LOCK: + g_value_set_boolean (value, dialog->priv->show_lock); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -920,9 +938,10 @@ setup_dialog (GsmInhibitDialog *dialog) break; } - gtk_dialog_add_button (GTK_DIALOG (dialog), - _("Lock Screen"), - DIALOG_RESPONSE_LOCK_SCREEN); + dialog->priv->lock_button = + gtk_dialog_add_button (GTK_DIALOG (dialog), + _("Lock Screen"), + DIALOG_RESPONSE_LOCK_SCREEN); gtk_dialog_add_button (GTK_DIALOG (dialog), _("Cancel"), GTK_RESPONSE_CANCEL); @@ -1006,6 +1025,7 @@ gsm_inhibit_dialog_constructor (GType setup_dialog (dialog); gtk_widget_show_all (GTK_WIDGET (dialog)); + gsm_inhibit_dialog_set_show_lock (dialog, TRUE); return G_OBJECT (dialog); } @@ -1082,6 +1102,14 @@ gsm_inhibit_dialog_class_init (GsmInhibi GSM_TYPE_STORE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, + PROP_SHOW_LOCK, + g_param_spec_boolean ("show-lock", + NULL, + NULL, + TRUE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_type_class_add_private (klass, sizeof (GsmInhibitDialogPrivate)); } @@ -1094,6 +1122,8 @@ gsm_inhibit_dialog_init (GsmInhibitDialo dialog->priv = GSM_INHIBIT_DIALOG_GET_PRIVATE (dialog); + dialog->priv->show_lock = TRUE; + dialog->priv->xml = gtk_builder_new (); gtk_builder_set_translation_domain (dialog->priv->xml, GETTEXT_PACKAGE); diff -up gnome-session-2.28.0/gnome-session/gsm-manager.c.show-lock gnome-session-2.28.0/gnome-session/gsm-manager.c --- gnome-session-2.28.0/gnome-session/gsm-manager.c.show-lock 2009-10-14 10:50:42.313467505 -0400 +++ gnome-session-2.28.0/gnome-session/gsm-manager.c 2009-10-14 10:51:32.889465604 -0400 @@ -1200,6 +1200,7 @@ query_end_session_complete (GsmManager * G_CALLBACK (inhibit_dialog_response), manager); if (! gsm_manager_has_responsive_inhibitor (manager)) { + g_object_set (manager->priv->inhibit_dialog, "show-lock", FALSE, NULL); manager->priv->inhibit_timeout_id = g_timeout_add_seconds (120, on_inhibit_dialog_timeout, manager); } unresponsive-timeout.patch: gsm-manager.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) --- NEW FILE unresponsive-timeout.patch --- diff -up gnome-session-2.28.0/gnome-session/gsm-manager.c.unresponsive-timeout gnome-session-2.28.0/gnome-session/gsm-manager.c --- gnome-session-2.28.0/gnome-session/gsm-manager.c.unresponsive-timeout 2009-09-18 12:36:04.000000000 -0400 +++ gnome-session-2.28.0/gnome-session/gsm-manager.c 2009-10-14 10:49:34.724468379 -0400 @@ -122,6 +122,7 @@ struct GsmManagerPrivate GsmManagerLogoutType logout_type; GtkWidget *inhibit_dialog; + guint inhibit_timeout_id; /* List of clients which were disconnected due to disabled condition * and shouldn't be automatically restarted */ @@ -797,6 +798,24 @@ inhibitor_has_flag (gpointer key, } static gboolean +is_responsive_inhibitor (gpointer key, + GsmInhibitor *inhibitor, + gpointer data) +{ + guint flag; + guint flags; + const gchar *reason; + + flag = GPOINTER_TO_UINT (data); + + flags = gsm_inhibitor_peek_flags (inhibitor); + reason = gsm_inhibitor_peek_reason (inhibitor); + + return (flags & flag) && + g_strcmp0 (_("Not responding"), reason) != 0; +} + +static gboolean gsm_manager_is_logout_inhibited (GsmManager *manager) { GsmInhibitor *inhibitor; @@ -833,6 +852,24 @@ gsm_manager_is_idle_inhibited (GsmManage } static gboolean +gsm_manager_has_responsive_inhibitor (GsmManager *manager) +{ + GsmInhibitor *inhibitor; + + if (manager->priv->inhibitors == NULL) { + return FALSE; + } + + inhibitor = (GsmInhibitor *)gsm_store_find (manager->priv->inhibitors, + (GsmStoreFunc)is_responsive_inhibitor, + GUINT_TO_POINTER (GSM_INHIBITOR_FLAG_LOGOUT)); + if (inhibitor == NULL) { + return FALSE; + } + return TRUE; +} + +static gboolean _client_cancel_end_session (const char *id, GsmClient *client, GsmManager *manager) @@ -1055,6 +1092,11 @@ inhibit_dialog_response (GsmInhibitDialo g_debug ("GsmManager: Inhibit dialog response: %d", response_id); + if (manager->priv->inhibit_timeout_id > 0) { + g_source_remove (manager->priv->inhibit_timeout_id); + manager->priv->inhibit_timeout_id = 0; + } + /* must destroy dialog before cancelling since we'll remove JIT inhibitors and we don't want to trigger action. */ @@ -1085,6 +1127,20 @@ inhibit_dialog_response (GsmInhibitDialo } } +static gboolean +on_inhibit_dialog_timeout (gpointer data) +{ + GsmManager *manager = data; + + manager->priv->inhibit_timeout_id = 0; + + inhibit_dialog_response (GSM_INHIBIT_DIALOG (manager->priv->inhibit_dialog), + GTK_RESPONSE_ACCEPT, + manager); + + return FALSE; +} + static void query_end_session_complete (GsmManager *manager) { @@ -1143,8 +1199,11 @@ query_end_session_complete (GsmManager * "response", G_CALLBACK (inhibit_dialog_response), manager); + if (! gsm_manager_has_responsive_inhibitor (manager)) { + manager->priv->inhibit_timeout_id = + g_timeout_add_seconds (120, on_inhibit_dialog_timeout, manager); + } gtk_widget_show (manager->priv->inhibit_dialog); - } static guint32 @@ -2459,6 +2518,11 @@ gsm_manager_finalize (GObject *object) g_return_if_fail (manager->priv != NULL); + if (manager->priv->inhibit_timeout_id > 0) { + g_source_remove (manager->priv->inhibit_timeout_id); + manager->priv->inhibit_timeout_id = 0; + } + G_OBJECT_CLASS (gsm_manager_parent_class)->finalize (object); } xsmp-stop.patch: gsm-xsmp-client.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- NEW FILE xsmp-stop.patch --- diff -up gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c.xsmp-stop gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c --- gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c.xsmp-stop 2009-10-23 10:47:51.555179151 -0400 +++ gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c 2009-10-23 10:47:10.255456283 -0400 @@ -713,6 +713,17 @@ xsmp_stop (GsmClient *client, g_debug ("GsmXSMPClient: xsmp_stop ('%s')", xsmp->priv->description); + /*FIXME: What do we do if the client can't be stoped ? + * (probably a cleaner solution exists...) + */ + if (xsmp->priv->conn == NULL) { + g_set_error (error, + GSM_CLIENT_ERROR, + GSM_CLIENT_ERROR_NOT_REGISTERED, + "Client is not registered"); + return FALSE; + } + SmsDie (xsmp->priv->conn); return TRUE; Index: gnome-session.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.252 retrieving revision 1.253 diff -u -p -r1.252 -r1.253 --- gnome-session.spec 24 Sep 2009 00:55:22 -0000 1.252 +++ gnome-session.spec 2 Nov 2009 05:06:55 -0000 1.253 @@ -10,7 +10,7 @@ Summary: GNOME session manager Name: gnome-session Version: 2.28.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-session/2.28/%{name}-%{version}.tar.bz2 Source2: gnome.desktop @@ -67,6 +67,12 @@ Requires(pre): GConf2 >= %{gconf2_versio Requires(post): GConf2 >= %{gconf2_version} Requires(preun): GConf2 >= %{gconf2_version} +# https://bugzilla.gnome.org/show_bug.cgi?id=592520 +#Patch0: unresponsive-timeout.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=592519 +#Patch1: show-lock.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=598211 +Patch2: xsmp-stop.patch %description gnome-session manages a GNOME desktop or GDM login session. It starts up @@ -82,6 +88,9 @@ Desktop file to add GNOME to display man %prep %setup -q +#%patch0 -p1 -b .unresponsive-timeout +#%patch1 -p1 -b .show-lock +%patch2 -p1 -b .xsmp-stop echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am @@ -169,6 +178,9 @@ fi %changelog +* Fri Oct 23 2009 Matthias Clasen - 2.28.0-2 +- Avoid a crash on certain xsmp error conditions + * Wed Sep 23 2009 Matthias Clasen - 2.28.0-1 - Update to 2.28.0 --- polkit1.patch DELETED --- --- watch-spew.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:09:34 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:09:34 +0000 (UTC) Subject: rpms/gnome-power-manager/devel 0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch, NONE, 1.1 0001-Use-gnome-settings-daemon-popup-code.patch, NONE, 1.1 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch, NONE, 1.1 hibernate-button.patch, NONE, 1.1 gnome-power-manager.spec, 1.175, 1.176 sources, 1.70, 1.71 Message-ID: <20091102050934.4174011C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-power-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3903 Modified Files: gnome-power-manager.spec sources Added Files: 0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch 0001-Use-gnome-settings-daemon-popup-code.patch 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch hibernate-button.patch Log Message: Copy F12 work over 0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch: gpm-tray-icon.c | 92 -------------------------------------------------------- 1 file changed, 92 deletions(-) --- NEW FILE 0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch --- >From fd51095da94ce4043126893d28663dd729af83fc Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 22 Oct 2009 09:12:16 +0100 Subject: [PATCH 1/2] Do not show 'About' and 'Help' menu items on the panel icon --- src/gpm-tray-icon.c | 91 --------------------------------------------------- 1 files changed, 0 insertions(+), 91 deletions(-) diff --git a/src/gpm-tray-icon.c b/src/gpm-tray-icon.c index b90ecbe..65e8e0b 100644 --- a/src/gpm-tray-icon.c +++ b/src/gpm-tray-icon.c @@ -283,77 +283,6 @@ gpm_tray_icon_show_preferences_cb (GtkMenuItem *item, gpointer data) } /** - * gpm_tray_icon_show_help_cb: - * @action: A valid GtkAction - **/ -static void -gpm_tray_icon_show_help_cb (GtkMenuItem *item, gpointer data) -{ - gpm_help_display (NULL); -} - -/** - * gpm_tray_icon_show_about_cb: - * @action: A valid GtkAction - **/ -static void -gpm_tray_icon_show_about_cb (GtkMenuItem *item, gpointer data) -{ - const char *authors[] = { - "Richard Hughes ", - "William Jon McCann ", - "Jaap A. Haitsma ", - NULL}; - const char *documenters[] = { - "Richard Hughes ", - NULL}; - const char *artists[] = { - "Diana Fong ", - "Jakub Steiner ", - NULL}; - const char *license[] = { - N_("Licensed under the GNU General Public License Version 2"), - N_("Power Manager is free software; you can redistribute it and/or\n" - "modify it under the terms of the GNU General Public License\n" - "as published by the Free Software Foundation; either version 2\n" - "of the License, or (at your option) any later version."), - N_("Power Manager is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details."), - N_("You should have received a copy of the GNU General Public License\n" - "along with this program; if not, write to the Free Software\n" - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n" - "02110-1301, USA.") - }; - const char *translators = _("translator-credits"); - char *license_trans; - - /* Translators comment: put your own name here to appear in the about dialog. */ - if (!strcmp (translators, "translator-credits")) - translators = NULL; - - license_trans = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", - _(license[2]), "\n\n", _(license[3]), "\n", NULL); - - gtk_window_set_default_icon_name (GPM_STOCK_APP_ICON); - gtk_show_about_dialog (NULL, - "version", VERSION, - "copyright", "Copyright \xc2\xa9 2005-2007 Richard Hughes", - "license", license_trans, - "website-label", _("GNOME Power Manager Website"), - "website", GPM_HOMEPAGE_URL, - "comments", GPM_DESCRIPTION, - "authors", authors, - "documenters", documenters, - "artists", artists, - "translator-credits", translators, - "logo-icon-name", GPM_STOCK_APP_ICON, - NULL); - g_free (license_trans); -} - -/** * gpm_tray_icon_popup_cleared_cd: * @widget: The popup Gtkwidget * @@ -439,26 +368,6 @@ gpm_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint32 t gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); } - /* separator for HIG */ - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - /* help */ - item = gtk_image_menu_item_new_with_mnemonic (_("_Help")); - image = gtk_image_new_from_icon_name (GTK_STOCK_HELP, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (gpm_tray_icon_show_help_cb), icon); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - /* about */ - item = gtk_image_menu_item_new_with_mnemonic (_("_About")); - image = gtk_image_new_from_icon_name (GTK_STOCK_ABOUT, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (gpm_tray_icon_show_about_cb), icon); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - /* show the menu */ gtk_widget_show_all (GTK_WIDGET (menu)); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, -- 1.6.5.rc2 0001-Use-gnome-settings-daemon-popup-code.patch: b/data/Makefile.am | 3 b/data/acme.ui | 41 + b/src/Makefile.am | 5 b/src/gpm-backlight.c | 108 +++- b/src/gsd-media-keys-window.c | 1109 ++++++++++++++++++++++++++++++++++++++++++ b/src/gsd-media-keys-window.h | 70 ++ src/gpm-popup-window.c | 725 --------------------------- src/gpm-popup-window.h | 61 -- 8 files changed, 1322 insertions(+), 800 deletions(-) --- NEW FILE 0001-Use-gnome-settings-daemon-popup-code.patch --- >From 72cfffc3638de64192ff2323450da26e9125fb89 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 27 Oct 2009 23:33:46 +0000 Subject: [PATCH] Use gnome-settings-daemon popup code Instead of forking it. Also make sure the location of the popup matches that used by gnome-settings-daemon. https://bugzilla.gnome.org/show_bug.cgi?id=594664 --- data/Makefile.am | 3 +- data/acme.ui | 41 ++ src/Makefile.am | 5 +- src/gpm-backlight.c | 108 ++++- src/gpm-popup-window.c | 725 ---------------------------- src/gpm-popup-window.h | 61 --- src/gsd-media-keys-window.c | 1109 +++++++++++++++++++++++++++++++++++++++++++ src/gsd-media-keys-window.h | 69 +++ 8 files changed, 1322 insertions(+), 799 deletions(-) create mode 100644 data/acme.ui delete mode 100644 src/gpm-popup-window.c delete mode 100644 src/gpm-popup-window.h create mode 100644 src/gsd-media-keys-window.c create mode 100644 src/gsd-media-keys-window.h diff --git a/data/Makefile.am b/data/Makefile.am index 1a76ac8..99df812 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -26,7 +26,8 @@ $(service_DATA): $(service_in_files) Makefile pkgdata_DATA = \ gpm-statistics.ui \ gpm-feedback-widget.ui \ - gpm-prefs.ui + gpm-prefs.ui \ + acme.ui EXTRA_DIST = \ gnome-power-manager.schemas.in \ diff --git a/data/acme.ui b/data/acme.ui new file mode 100644 index 0000000..3222ecb --- /dev/null +++ b/data/acme.ui @@ -0,0 +1,41 @@ + + + + + + + + True + 0 + out + + + True + 12 + 6 + + + True + audio-volume-high + 6 + + + 0 + + + + + True + + + False + False + 1 + + + + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index b41da1f..b038669 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,6 +28,7 @@ INCLUDES = \ -DLIBDIR=\""$(libdir)"\" \ -DVERSION="\"$(VERSION)\"" \ -DGPM_DATA=\"$(pkgdatadir)\" \ + -DGTKBUILDERDIR=\"$(pkgdatadir)\" \ -DDKP_DISABLE_DEPRECATED \ -DEGG_LOG_FILE=\""/tmp/gpm.log"\" \ -DEGG_VERBOSE="\"GPM_VERBOSE\"" \ @@ -161,8 +162,8 @@ gnome_power_manager_SOURCES = \ gpm-networkmanager.h \ gpm-networkmanager.c \ gpm-stock-icons.h \ - gpm-popup-window.h \ - gpm-popup-window.c \ + gsd-media-keys-window.h \ + gsd-media-keys-window.c \ gpm-engine.h \ gpm-engine.c \ $(NULL) diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c index 7714bcc..5c2e453 100644 --- a/src/gpm-backlight.c +++ b/src/gpm-backlight.c @@ -48,7 +48,7 @@ #include "gpm-control.h" #include "gpm-common.h" #include "egg-debug.h" -#include "gpm-popup-window.h" +#include "gsd-media-keys-window.h" #include "gpm-dpms.h" #include "gpm-idle.h" #include "gpm-marshal.h" @@ -167,6 +167,88 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError } /** + * gpm_backlight_dialog_init: + * + * Initialises the popup, and makes sure that it matches the compositing of the screen. + **/ +static void +gpm_backlight_dialog_init (GpmBacklight *backlight) +{ + if (backlight->priv->popup != NULL + && !gsd_media_keys_window_is_valid (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup))) { + gtk_widget_destroy (backlight->priv->popup); + backlight->priv->popup = NULL; + } + + if (backlight->priv->popup == NULL) { + backlight->priv->popup= gsd_media_keys_window_new (); + } +} + +/** + * gpm_backlight_dialog_show: + * + * Show the brightness popup, and place it nicely on the screen. + **/ +static void +gpm_backlight_dialog_show (GpmBacklight *backlight) +{ + int orig_w; + int orig_h; + int screen_w; + int screen_h; + int x; + int y; + int pointer_x; + int pointer_y; + GtkRequisition win_req; + GdkScreen *pointer_screen; + GdkRectangle geometry; + int monitor; + + /* + * get the window size + * if the window hasn't been mapped, it doesn't necessarily + * know its true size, yet, so we need to jump through hoops + */ + gtk_window_get_default_size (GTK_WINDOW (backlight->priv->popup), &orig_w, &orig_h); + gtk_widget_size_request (backlight->priv->popup, &win_req); + + if (win_req.width > orig_w) { + orig_w = win_req.width; + } + if (win_req.height > orig_h) { + orig_h = win_req.height; + } + + pointer_screen = NULL; + gdk_display_get_pointer (gtk_widget_get_display (backlight->priv->popup), + &pointer_screen, + &pointer_x, + &pointer_y, + NULL); + monitor = gdk_screen_get_monitor_at_point (pointer_screen, + pointer_x, + pointer_y); + + gdk_screen_get_monitor_geometry (pointer_screen, + monitor, + &geometry); + + screen_w = geometry.width; + screen_h = geometry.height; + [...1858 lines suppressed...] +{ + GdkColormap *colormap; + GtkAllocation allocation; + GdkBitmap *mask; + cairo_t *cr; + + colormap = gdk_screen_get_rgba_colormap (gtk_widget_get_screen (widget)); + + if (colormap != NULL) { + gtk_widget_set_colormap (widget, colormap); + } + + if (GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->realize) { + GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->realize (widget); + } + + gtk_widget_get_allocation (widget, &allocation); + mask = gdk_pixmap_new (gtk_widget_get_window (widget), + allocation.width, + allocation.height, + 1); + cr = gdk_cairo_create (mask); + + cairo_set_source_rgba (cr, 1., 1., 1., 0.); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + cairo_paint (cr); + + /* make the whole window ignore events */ + gdk_window_input_shape_combine_mask (gtk_widget_get_window (widget), mask, 0, 0); + g_object_unref (mask); + cairo_destroy (cr); +} + +static void +gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass) +{ + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + widget_class->show = gsd_media_keys_window_real_show; + widget_class->hide = gsd_media_keys_window_real_hide; + widget_class->realize = gsd_media_keys_window_real_realize; + + g_type_class_add_private (klass, sizeof (GsdMediaKeysWindowPrivate)); +} + +gboolean +gsd_media_keys_window_is_valid (GsdMediaKeysWindow *window) +{ + GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window)); + return gdk_screen_is_composited (screen) == window->priv->is_composited; +} + +static void +gsd_media_keys_window_init (GsdMediaKeysWindow *window) +{ + GdkScreen *screen; + + window->priv = GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE (window); + + screen = gtk_widget_get_screen (GTK_WIDGET (window)); + + window->priv->is_composited = gdk_screen_is_composited (screen); + + if (window->priv->is_composited) { + gdouble scalew, scaleh, scale; + gint size; + + gtk_window_set_decorated (GTK_WINDOW (window), FALSE); + gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE); + + /* assume 130x130 on a 640x480 display and scale from there */ + scalew = gdk_screen_get_width (screen) / 640.0; + scaleh = gdk_screen_get_height (screen) / 480.0; + scale = MIN (scalew, scaleh); + size = 130 * MAX (1, scale); + + gtk_window_set_default_size (GTK_WINDOW (window), size, size); + g_signal_connect (window, "expose-event", G_CALLBACK (on_expose_event), window); + + window->priv->fade_out_alpha = 1.0; + } else { + GtkBuilder *builder; + const gchar *objects[] = {"acme_frame", NULL}; + GtkWidget *frame; + + builder = gtk_builder_new (); + gtk_builder_add_objects_from_file (builder, + GTKBUILDERDIR "/acme.ui", + (char **) objects, + NULL); + + window->priv->image = GTK_IMAGE (gtk_builder_get_object (builder, "acme_image")); + window->priv->progress = GTK_WIDGET (gtk_builder_get_object (builder, "acme_volume_progressbar")); + frame = GTK_WIDGET (gtk_builder_get_object (builder, + "acme_frame")); + + if (frame != NULL) { + gtk_container_add (GTK_CONTAINER (window), frame); + gtk_widget_show_all (frame); + } + + /* The builder needs to stay alive until the window + takes ownership of the frame (and its children) */ + g_object_unref (builder); + } +} + +GtkWidget * +gsd_media_keys_window_new (void) +{ + GObject *object; + + object = g_object_new (GSD_TYPE_MEDIA_KEYS_WINDOW, + "type", GTK_WINDOW_POPUP, + "type-hint", GDK_WINDOW_TYPE_HINT_NOTIFICATION, + "skip-taskbar-hint", TRUE, + "skip-pager-hint", TRUE, + "focus-on-map", FALSE, + NULL); + + return GTK_WIDGET (object); +} diff --git a/src/gsd-media-keys-window.h b/src/gsd-media-keys-window.h new file mode 100644 index 0000000..dd4ae90 --- /dev/null +++ b/src/gsd-media-keys-window.h @@ -0,0 +1,69 @@ +/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*- + * + * Copyright (C) 2006 William Jon McCann + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ + +#ifndef GSD_MEDIA_KEYS_WINDOW_H +#define GSD_MEDIA_KEYS_WINDOW_H + +#include +#include + +G_BEGIN_DECLS + +#define GSD_TYPE_MEDIA_KEYS_WINDOW (gsd_media_keys_window_get_type ()) +#define GSD_MEDIA_KEYS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindow)) +#define GSD_MEDIA_KEYS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindowClass)) +#define GSD_IS_MEDIA_KEYS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_MEDIA_KEYS_WINDOW)) +#define GSD_IS_MEDIA_KEYS_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), GSD_TYPE_MEDIA_KEYS_WINDOW)) + +typedef struct GsdMediaKeysWindow GsdMediaKeysWindow; +typedef struct GsdMediaKeysWindowClass GsdMediaKeysWindowClass; +typedef struct GsdMediaKeysWindowPrivate GsdMediaKeysWindowPrivate; + +struct GsdMediaKeysWindow { + GtkWindow parent; + + GsdMediaKeysWindowPrivate *priv; +}; + +struct GsdMediaKeysWindowClass { + GtkWindowClass parent_class; +}; + +typedef enum { + GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME, + GSD_MEDIA_KEYS_WINDOW_ACTION_EJECT, + GSD_MEDIA_KEYS_WINDOW_ACTION_BRIGHTNESS +} GsdMediaKeysWindowAction; + +GType gsd_media_keys_window_get_type (void); + +GtkWidget * gsd_media_keys_window_new (void); +void gsd_media_keys_window_set_action (GsdMediaKeysWindow *window, + GsdMediaKeysWindowAction action); +void gsd_media_keys_window_set_volume_muted (GsdMediaKeysWindow *window, + gboolean muted); +void gsd_media_keys_window_set_volume_level (GsdMediaKeysWindow *window, + int level); +gboolean gsd_media_keys_window_is_valid (GsdMediaKeysWindow *window); + +G_END_DECLS + +#endif -- 1.6.5.1 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch: gpm-tray-icon.c | 103 +++++++++++++++++++++++--------------------------------- 1 file changed, 44 insertions(+), 59 deletions(-) --- NEW FILE 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch --- >From ab519b6aad73e9b0d738d4ddb0ee2cd3774b5884 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 22 Oct 2009 09:20:42 +0100 Subject: [PATCH 2/2] Make the left and right buttons on the status icon bring up the same menu, UI copied from git master --- src/gpm-tray-icon.c | 102 ++++++++++++++++++++++----------------------------- 1 files changed, 44 insertions(+), 58 deletions(-) diff --git a/src/gpm-tray-icon.c b/src/gpm-tray-icon.c index 65e8e0b..96bf8cc 100644 --- a/src/gpm-tray-icon.c +++ b/src/gpm-tray-icon.c @@ -326,6 +326,9 @@ gpm_tray_icon_class_init (GpmTrayIconClass *klass) 0); } +/* prototype to avoid moving a huge function and bloating the patch */ +static guint gpm_tray_icon_add_device (GpmTrayIcon *icon, GtkMenu *menu, const GPtrArray *array, DkpDeviceType type); + /** * gpm_tray_icon_popup_menu_cb: * @@ -339,11 +342,47 @@ gpm_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint32 t GtkWidget *image; gchar *path; gboolean ret; + guint dev_cnt = 0; + GPtrArray *array; - egg_debug ("icon right clicked"); + /* add all device types to the drop down menu */ + array = gpm_engine_get_devices (icon->priv->engine); + dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_BATTERY); + dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_UPS); + dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_MOUSE); + dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_KEYBOARD); + dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_PDA); + dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_PHONE); + g_ptr_array_unref (array); + + /* only do the seporator if we have at least one device and can do an action */ + if (dev_cnt != 0 && (icon->priv->show_suspend || icon->priv->show_hibernate || icon->priv->show_context_menu)) { + item = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } + + /* Suspend if available */ + if (icon->priv->show_suspend) { + item = gtk_image_menu_item_new_with_mnemonic (_("_Suspend")); + image = gtk_image_new_from_icon_name (GPM_STOCK_SUSPEND, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (gpm_tray_icon_suspend_cb), icon); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } + + /* Hibernate if available */ + if (icon->priv->show_hibernate) { + item = gtk_image_menu_item_new_with_mnemonic (_("Hi_bernate")); + image = gtk_image_new_from_icon_name (GPM_STOCK_HIBERNATE, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (gpm_tray_icon_hibernate_cb), icon); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } if (!icon->priv->show_context_menu) - return; + goto show; /* preferences */ item = gtk_image_menu_item_new_with_mnemonic (_("_Preferences")); @@ -367,7 +406,7 @@ gpm_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint32 t G_CALLBACK (gpm_tray_icon_show_statistics_cb), icon); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); } - +show: /* show the menu */ gtk_widget_show_all (GTK_WIDGET (menu)); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, @@ -446,61 +485,8 @@ gpm_tray_icon_add_device (GpmTrayIcon *icon, GtkMenu *menu, const GPtrArray *arr static void gpm_tray_icon_activate_cb (GtkStatusIcon *status_icon, GpmTrayIcon *icon) { - GtkMenu *menu = (GtkMenu*) gtk_menu_new (); - GtkWidget *item; - GtkWidget *image; - guint dev_cnt = 0; - GPtrArray *array; - egg_debug ("icon left clicked"); - - /* add all device types to the drop down menu */ - array = gpm_engine_get_devices (icon->priv->engine); - dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_BATTERY); - dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_UPS); - dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_MOUSE); - dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_KEYBOARD); - dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_PDA); - dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_PHONE); - g_ptr_array_unref (array); - - /* nothing to display! */ - if (dev_cnt == 0 && !icon->priv->show_suspend && !icon->priv->show_hibernate) - return; - - /* only do the seporator if we have at least one device and can do an action */ - if (dev_cnt != 0 && (icon->priv->show_suspend || icon->priv->show_hibernate)) { - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - } - - /* Suspend if available */ - if (icon->priv->show_suspend) { - item = gtk_image_menu_item_new_with_mnemonic (_("_Suspend")); - image = gtk_image_new_from_icon_name (GPM_STOCK_SUSPEND, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (gpm_tray_icon_suspend_cb), icon); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - } - - /* Hibernate if available */ - if (icon->priv->show_hibernate) { - item = gtk_image_menu_item_new_with_mnemonic (_("Hi_bernate")); - image = gtk_image_new_from_icon_name (GPM_STOCK_HIBERNATE, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - g_signal_connect (G_OBJECT (item), "activate", - G_CALLBACK (gpm_tray_icon_hibernate_cb), icon); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - } - - /* show the menu */ - gtk_widget_show_all (GTK_WIDGET (menu)); - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, - gtk_status_icon_position_menu, status_icon, - 1, gtk_get_current_event_time()); - - g_signal_connect (GTK_WIDGET (menu), "hide", - G_CALLBACK (gpm_tray_icon_popup_cleared_cd), icon); + /* fake this (coming from a left click, now) */ + gpm_tray_icon_popup_menu_cb (status_icon, 1, gtk_get_current_event_time(), icon); } /** -- 1.6.5.rc2 hibernate-button.patch: gpm-button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE hibernate-button.patch --- diff -up gnome-power-manager-2.28.0/src/gpm-button.c.hibernate-button gnome-power-manager-2.28.0/src/gpm-button.c --- gnome-power-manager-2.28.0/src/gpm-button.c.hibernate-button 2009-10-06 08:39:56.121292563 -0400 +++ gnome-power-manager-2.28.0/src/gpm-button.c 2009-10-06 08:40:15.856520942 -0400 @@ -324,7 +324,7 @@ gpm_button_init (GpmButton *button) /* register the brightness keys */ gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER); #ifdef HAVE_XF86XK_SUSPEND - gpm_button_xevent_key (button, XF86XK_Suspend, GPM_BUTTON_SUSPEND); + gpm_button_xevent_key (button, XF86XK_Suspend, GPM_BUTTON_HIBERNATE); #endif gpm_button_xevent_key (button, XF86XK_Sleep, GPM_BUTTON_SUSPEND); /* should be configurable */ #ifdef HAVE_XF86XK_HIBERNATE Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -p -r1.175 -r1.176 --- gnome-power-manager.spec 21 Sep 2009 12:43:33 -0000 1.175 +++ gnome-power-manager.spec 2 Nov 2009 05:09:33 -0000 1.176 @@ -4,8 +4,8 @@ Summary: GNOME power management service Name: gnome-power-manager -Version: 2.28.0 -Release: 1%{?dist} +Version: 2.28.1 +Release: 4%{?dist} #Release: 0.5.%{?alphatag}git%{?dist} License: GPLv2+ and GFDL Group: Applications/System @@ -15,6 +15,17 @@ Source: http://download.gnome.org/source BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://projects.gnome.org/gnome-power-manager/ +# Fedora-specific backport, already same UI in git master +Patch1: 0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch + +# Fedora-specific backport, already same UI in git master +Patch2: 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch + +# https://bugzilla.gnome.org/show_bug.cgi?id=594664 +%define _default_patch_fuzz 2 +BuildRequires: autoconf automake libtool +Patch3: 0001-Use-gnome-settings-daemon-popup-code.patch + BuildRequires: libwnck-devel BuildRequires: hal-devel >= %{hal_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -28,7 +39,6 @@ BuildRequires: libtool BuildRequires: cairo-devel BuildRequires: libcanberra-devel BuildRequires: unique-devel -BuildRequires: DeviceKit-devel >= 002 BuildRequires: DeviceKit-power-devel >= 008 BuildRequires: intltool Requires: gtk2 >= 2.10.0 @@ -63,6 +73,10 @@ Extra GNOME power management application %prep %setup -q #%setup -q -n %{?name}-%{?version}-%{?alphatag} +%patch1 -p1 -b .remove-help +%patch2 -p1 -b .uni-menu +%patch3 -p1 -b .osd +autoreconf -i %build %configure \ @@ -151,6 +165,7 @@ fi %{_bindir}/gnome-power-manager %{_bindir}/gnome-power-preferences %dir %{_datadir}/gnome-power-manager +%{_datadir}/gnome-power-manager/acme.ui %{_datadir}/gnome-power-manager/gpm-prefs.ui %{_datadir}/gnome-power-manager/gpm-feedback-widget.ui %{_mandir}/man1/gnome-power-manager.1.gz @@ -181,6 +196,27 @@ fi %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.* %changelog +* Wed Oct 28 2009 Bastien Nocera 2.28.1-4 +- Match gnome-settings-daemon's positioning for the OSD + +* Tue Oct 27 2009 Bastien Nocera 2.28.1-3 +- Update OSD to match gnome-settings-daemon's + +* Thu Oct 22 2009 Richard Hughes - 2.28.1-2 +- Backport two patches from git master to polish the UI for F12. + +* Mon Oct 19 2009 Richard Hughes - 2.28.1-1 +- Update to 2.28.1 +- Translation updates +- Remove upstreamed patch +- Help the kernel through its sleep key confusion +- Correctly set the focus on the last used device in gnome-power-statistics +- Do not hide some radio buttons depending on the current machine state +- Throttle screensaver before suspend/hibernate + +* Tue Oct 13 2009 Matthias Clasen - 2.28.0-2 +- Fix possible segfault + * Mon Sep 21 2009 Richard Hughes - 2.28.0-1 - Update to 2.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -p -r1.70 -r1.71 --- sources 21 Sep 2009 12:43:33 -0000 1.70 +++ sources 2 Nov 2009 05:09:33 -0000 1.71 @@ -1 +1 @@ -c1107f8d88cbd6a3d8a44ec70c990d74 gnome-power-manager-2.28.0.tar.bz2 +552945dd50671cdf9cd11ba4bd544bfa gnome-power-manager-2.28.1.tar.bz2 From mclasen at fedoraproject.org Mon Nov 2 05:13:43 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:13:43 +0000 (UTC) Subject: rpms/gnome-games/F-12 0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch, 1.1, NONE gcc43.patch, 1.1, NONE gnome-games-2.19.3-dupe.patch, 1.1, NONE gnome-games-2.20-gnobots-crash.patch, 1.1, NONE gnome-games-2.22.1.1-fix-icons.patch, 1.3, NONE mines-cosmetics.patch, 1.1, NONE mines-fixes.patch, 1.1, NONE mines-keys-fix.patch, 1.1, NONE mines-redraw-fix.patch, 1.1, NONE mines-sensitive-fix.patch, 1.1, NONE mines-visible-fix.patch, 1.1, NONE sudoku-saved-data.patch, 1.1, NONE Message-ID: <20091102051344.4B19611C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-games/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5452 Removed Files: 0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch gcc43.patch gnome-games-2.19.3-dupe.patch gnome-games-2.20-gnobots-crash.patch gnome-games-2.22.1.1-fix-icons.patch mines-cosmetics.patch mines-fixes.patch mines-keys-fix.patch mines-redraw-fix.patch mines-sensitive-fix.patch mines-visible-fix.patch sudoku-saved-data.patch Log Message: drop dead patches --- 0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch DELETED --- --- gcc43.patch DELETED --- --- gnome-games-2.19.3-dupe.patch DELETED --- --- gnome-games-2.20-gnobots-crash.patch DELETED --- --- gnome-games-2.22.1.1-fix-icons.patch DELETED --- --- mines-cosmetics.patch DELETED --- --- mines-fixes.patch DELETED --- --- mines-keys-fix.patch DELETED --- --- mines-redraw-fix.patch DELETED --- --- mines-sensitive-fix.patch DELETED --- --- mines-visible-fix.patch DELETED --- --- sudoku-saved-data.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:14:58 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:14:58 +0000 (UTC) Subject: rpms/gnome-games/devel gnome-games.spec, 1.231, 1.232 sources, 1.110, 1.111 0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch, 1.1, NONE gcc43.patch, 1.1, NONE gnome-games-2.19.3-dupe.patch, 1.1, NONE gnome-games-2.20-gnobots-crash.patch, 1.1, NONE gnome-games-2.22.1.1-fix-icons.patch, 1.3, NONE mines-cosmetics.patch, 1.1, NONE mines-fixes.patch, 1.1, NONE mines-keys-fix.patch, 1.1, NONE mines-redraw-fix.patch, 1.1, NONE mines-sensitive-fix.patch, 1.1, NONE mines-visible-fix.patch, 1.1, NONE sudoku-saved-data.patch, 1.1, NONE Message-ID: <20091102051458.A569C11C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-games/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5957 Modified Files: gnome-games.spec sources Removed Files: 0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch gcc43.patch gnome-games-2.19.3-dupe.patch gnome-games-2.20-gnobots-crash.patch gnome-games-2.22.1.1-fix-icons.patch mines-cosmetics.patch mines-fixes.patch mines-keys-fix.patch mines-redraw-fix.patch mines-sensitive-fix.patch mines-visible-fix.patch sudoku-saved-data.patch Log Message: Copy F12 work over Index: gnome-games.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.231 retrieving revision 1.232 diff -u -p -r1.231 -r1.232 --- gnome-games.spec 22 Sep 2009 05:21:36 -0000 1.231 +++ gnome-games.spec 2 Nov 2009 05:14:57 -0000 1.232 @@ -45,7 +45,7 @@ Summary: Games for the GNOME desktop Name: gnome-games -Version: 2.28.0 +Version: 2.28.1 Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL @@ -502,6 +502,9 @@ fi %changelog +* Mon Oct 19 2009 Matthias Clasen 2.28.1-1 +- Update to 2.28.1 + * Mon Sep 22 2009 Matthias Clasen 2.28.0-1 - Update to 2.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v retrieving revision 1.110 retrieving revision 1.111 diff -u -p -r1.110 -r1.111 --- sources 22 Sep 2009 04:57:14 -0000 1.110 +++ sources 2 Nov 2009 05:14:57 -0000 1.111 @@ -1 +1 @@ -39101397625e931a74f40854eeb1d182 gnome-games-2.28.0.tar.bz2 +c67497debd70aa8847874616660dae48 gnome-games-2.28.1.tar.bz2 --- 0001-Require-stable-versions-of-clutter-and-clutter-gtk.patch DELETED --- --- gcc43.patch DELETED --- --- gnome-games-2.19.3-dupe.patch DELETED --- --- gnome-games-2.20-gnobots-crash.patch DELETED --- --- gnome-games-2.22.1.1-fix-icons.patch DELETED --- --- mines-cosmetics.patch DELETED --- --- mines-fixes.patch DELETED --- --- mines-keys-fix.patch DELETED --- --- mines-redraw-fix.patch DELETED --- --- mines-sensitive-fix.patch DELETED --- --- mines-visible-fix.patch DELETED --- --- sudoku-saved-data.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:21:27 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:21:27 +0000 (UTC) Subject: rpms/notification-daemon/devel browser.patch, NONE, 1.1 monitor-stacks.patch, NONE, 1.1 notification-daemon-rtl.patch, NONE, 1.1 screensaver-check.patch, NONE, 1.1 variable-monitors.patch, NONE, 1.1 notification-daemon.spec, 1.35, 1.36 Message-ID: <20091102052127.D689A11C02BA@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/notification-daemon/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9532 Modified Files: notification-daemon.spec Added Files: browser.patch monitor-stacks.patch notification-daemon-rtl.patch screensaver-check.patch variable-monitors.patch Log Message: Copy F12 work over browser.patch: daemon.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) --- NEW FILE browser.patch --- diff -up notification-daemon-0.4.1/src/daemon/daemon.c.browser notification-daemon-0.4.1/src/daemon/daemon.c --- notification-daemon-0.4.1/src/daemon/daemon.c.browser 2009-10-15 17:25:08.816399825 -0400 +++ notification-daemon-0.4.1/src/daemon/daemon.c 2009-10-15 17:30:10.680399278 -0400 @@ -845,27 +845,18 @@ url_clicked_cb(GtkWindow *nw, const char escaped_url = g_shell_quote(url); - /* - * We can't actually check for GNOME_DESKTOP_SESSION_ID, because it's - * not in the environment for this program :( - */ - if (/*g_getenv("GNOME_DESKTOP_SESSION_ID") != NULL &&*/ - g_find_program_in_path("gnome-open") != NULL) + if (g_find_program_in_path("gvfs-open") != NULL) { - cmd = g_strdup_printf("gnome-open %s", escaped_url); + cmd = g_strdup_printf("gvfs-open %s", escaped_url); } - else if (g_find_program_in_path("mozilla-firefox") != NULL) + else if (g_find_program_in_path("xdg-open") != NULL) { - cmd = g_strdup_printf("mozilla-firefox %s", escaped_url); + cmd = g_strdup_printf("xdg-open %s", escaped_url); } else if (g_find_program_in_path("firefox") != NULL) { cmd = g_strdup_printf("firefox %s", escaped_url); } - else if (g_find_program_in_path("mozilla") != NULL) - { - cmd = g_strdup_printf("mozilla %s", escaped_url); - } else { g_warning("Unable to find a browser."); monitor-stacks.patch: stack.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- NEW FILE monitor-stacks.patch --- --- notification-daemon-0.4.1/src/daemon/stack.c 2009-09-23 01:47:50.000000000 -0400 +++ hacked-foo/src/daemon/stack.c 2009-10-15 21:26:03.269041656 -0400 @@ -199,17 +199,21 @@ static void notify_stack_shift_notifications(NotifyStack *stack, GtkWindow *nw, - GSList **nw_l, + GSList **nw_l, gint init_width, gint init_height, gint *nw_x, gint *nw_y) { GdkRectangle workarea; + GdkRectangle monitor; GSList *l; gint x, y, shiftx = 0, shifty = 0, index = 1; get_work_area(GTK_WIDGET(nw), &workarea); + gdk_screen_get_monitor_geometry (stack->screen, stack->monitor, &monitor); + gdk_rectangle_intersect (&monitor, &workarea, &workarea); + get_origin_coordinates(stack->location, &workarea, &x, &y, &shiftx, &shifty, init_width, init_height); notification-daemon-rtl.patch: theme.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- NEW FILE notification-daemon-rtl.patch --- diff -Naur notification-daemon-svn3009.pos.orig/src/themes/standard/theme.c notification-daemon-svn3009/src/themes/standard/theme.c --- notification-daemon-svn3009.pos.orig/src/themes/standard/theme.c 2008-12-09 13:28:46.000000000 +0200 +++ notification-daemon-svn3009/src/themes/standard/theme.c 2008-12-09 15:26:22.000000000 +0200 @@ -48,7 +48,7 @@ glong remaining; UrlClickedCb url_clicked; - + int is_rtl; } WindowData; enum @@ -134,6 +134,7 @@ GdkColor color; int stripe_x = windata->main_hbox->allocation.x + 1; int stripe_y = windata->main_hbox->allocation.y + 1; + if (windata->is_rtl) stripe_x=windata->width-STRIPE_WIDTH-stripe_x; int stripe_height = windata->main_hbox->allocation.height - 2; #ifdef ENABLE_GRADIENT_LOOK cairo_pattern_t *gradient; @@ -587,6 +588,7 @@ windata->url_clicked = url_clicked; win = gtk_window_new(GTK_WINDOW_POPUP); + windata->is_rtl=pango_context_get_base_dir(gtk_widget_get_pango_context(win)) & ( PANGO_DIRECTION_RTL | PANGO_DIRECTION_WEAK_RTL ); windata->win = win; windata->enable_transparency = FALSE; screensaver-check.patch: daemon.c | 55 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 25 deletions(-) --- NEW FILE screensaver-check.patch --- --- notification-daemon-0.4.1/src/daemon/daemon.c 2009-10-15 17:21:49.127672315 -0400 +++ hacked/src/daemon/daemon.c 2009-10-15 17:21:34.683409674 -0400 @@ -883,33 +883,38 @@ static gboolean screensaver_active(GtkWidget *nw) { - GdkDisplay *display = gdk_drawable_get_display(GDK_DRAWABLE(nw->window)); - Atom type; - int format; - unsigned long nitems, bytes_after; - unsigned char *temp_data; - gboolean active = FALSE; - Atom XA_BLANK = gdk_x11_get_xatom_by_name_for_display(display, "BLANK"); - Atom XA_LOCK = gdk_x11_get_xatom_by_name_for_display(display, "LOCK"); - - /* Check for a screensaver first. */ - if (XGetWindowProperty( - GDK_DISPLAY_XDISPLAY(display), - GDK_ROOT_WINDOW(), - gdk_x11_get_xatom_by_name_for_display(display, "_SCREENSAVER_STATUS"), - 0, G_MAXLONG, False, XA_INTEGER, &type, &format, &nitems, - &bytes_after, &temp_data) == Success && - type && temp_data != NULL) - { - CARD32 *data = (CARD32 *)temp_data; - - active = (type == XA_INTEGER && nitems >= 3 && - (time_t)data[1] > (time_t)666000000L && - (data[0] == XA_BLANK || data[0] == XA_LOCK)); + DBusGConnection *connection; + DBusGProxy *gs_proxy; + GError *error; + gboolean active; + + active = FALSE; + + error = NULL; + connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); + if (connection == NULL) + { + g_warning ("Failed to get dbus connection: %s", error->message); + g_error_free(error); + goto out; + } + gs_proxy = dbus_g_proxy_new_for_name(connection, + "org.gnome.ScreenSaver", + "/", + "org.gnome.ScreenSaver"); + + if (!dbus_g_proxy_call(gs_proxy, "GetActive", &error, + G_TYPE_INVALID, + G_TYPE_BOOLEAN, &active, + G_TYPE_INVALID)) + { + g_warning("Failed to call gnome-screensaver: %s", error->message); + g_error_free(error); + } + g_object_unref (gs_proxy); +out: - if (temp_data != NULL) - XFree(temp_data); return active; } variable-monitors.patch: daemon.c | 59 ++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 21 deletions(-) --- NEW FILE variable-monitors.patch --- --- notification-daemon-0.4.1/src/daemon/daemon.c 2009-10-15 21:22:24.598052888 -0400 +++ hacked-foo/src/daemon/daemon.c 2009-10-15 21:26:56.380290516 -0400 @@ -162,44 +162,59 @@ } static void -notify_daemon_init(NotifyDaemon *daemon) +reallocate_stacks (NotifyDaemon *daemon) { - NotifyStackLocation location; - GConfClient *client = get_gconf_client(); GdkDisplay *display; GdkScreen *screen; + gint old_stacks_size; + GConfClient *client = get_gconf_client(); + NotifyStackLocation location; gchar *slocation; gint i; + display = gdk_display_get_default(); + screen = gdk_display_get_default_screen(display); + + if (daemon->priv->stacks_size < gdk_screen_get_n_monitors (screen)) { + slocation = gconf_client_get_string(client, GCONF_KEY_POPUP_LOCATION, + NULL); + location = get_stack_location_from_string(slocation); + g_free(slocation); + + old_stacks_size = daemon->priv->stacks_size; + daemon->priv->stacks_size = gdk_screen_get_n_monitors(screen); + daemon->priv->stacks = g_renew(NotifyStack *, daemon->priv->stacks, daemon->priv->stacks_size); + for (i = old_stacks_size; i < daemon->priv->stacks_size; i++) { + daemon->priv->stacks[i] = notify_stack_new(daemon, + screen, + i, + location); + } + } + + +} + +static void +notify_daemon_init(NotifyDaemon *daemon) +{ daemon->priv = G_TYPE_INSTANCE_GET_PRIVATE(daemon, NOTIFY_TYPE_DAEMON, - NotifyDaemonPrivate); + NotifyDaemonPrivate); daemon->priv->next_id = 1; daemon->priv->timeout_source = 0; - slocation = gconf_client_get_string(client, GCONF_KEY_POPUP_LOCATION, - NULL); - location = get_stack_location_from_string(slocation); - g_free(slocation); + daemon->priv->stacks_size = 0; + daemon->priv->stacks = NULL; - display = gdk_display_get_default(); - screen = gdk_display_get_default_screen(display); - daemon->priv->stacks_size = gdk_screen_get_n_monitors(screen); - daemon->priv->stacks = g_new0(NotifyStack *, daemon->priv->stacks_size); + reallocate_stacks (daemon); daemon->priv->idle_reposition_notify_ids = g_hash_table_new(NULL, NULL); daemon->priv->monitored_window_hash = g_hash_table_new(NULL, NULL); gdk_window_add_filter(NULL, _notify_x11_filter, daemon); - - for (i = 0; i < daemon->priv->stacks_size; i++) - { - daemon->priv->stacks[i] = notify_stack_new(daemon, screen, - i, location); - } - daemon->priv->notification_hash = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, - (GDestroyNotify)_notify_timeout_destroy); + (GDestroyNotify)_notify_timeout_destroy); } static void @@ -1308,7 +1323,9 @@ gdk_display_get_pointer(gdk_display_get_default(), &screen, &x, &y, NULL); monitor = gdk_screen_get_monitor_at_point(screen, x, y); - g_assert(monitor >= 0 && monitor < priv->stacks_size); + if (monitor >= priv->stacks_size) { + reallocate_stacks (daemon); + } notify_stack_add_window(priv->stacks[monitor], nw, new_notification); } Index: notification-daemon.spec =================================================================== RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- notification-daemon.spec 25 Sep 2009 00:33:58 -0000 1.35 +++ notification-daemon.spec 2 Nov 2009 05:21:25 -0000 1.36 @@ -7,7 +7,7 @@ Summary: Desktop Notification Daemon Name: notification-daemon Version: 0.4.1 -Release: 0.20090923.2%{?dist} +Release: 0.20090923.4%{?dist} URL: http://www.galago-project.org/specs/notification/ License: GPLv2+ Group: System Environment/Libraries @@ -41,6 +41,15 @@ Patch1: default-theme.patch Patch2: location.patch Patch10: notification-daemon-always-stack.patch +# Cut down on crazy browser choices +Patch11: browser.patch +# A working screensaver check +Patch12: screensaver-check.patch +# Make per-monitor stacks work as intended +Patch13: monitor-stacks.patch +# Don't crash if new monitors appear +Patch14: variable-monitors.patch + %description notification-daemon is the server implementation of the freedesktop.org desktop notification specification. Notifications can be used to inform the user @@ -53,6 +62,10 @@ user's way. %patch1 -p1 -b .default-theme %patch2 -p1 -b .location %patch10 -p1 -b .always-stack +%patch11 -p1 -b .browser +%patch12 -p1 -b .screensaver-check +%patch13 -p1 -b .monitor-stacks +%patch14 -p1 -b .variable-monitors autoreconf -i -f @@ -113,6 +126,14 @@ gconftool-2 --makefile-install-rule \ %changelog +* Fri Oct 23 2009 Matthias Clasen - 0.4.1-1.20090923.4 +- Don't abort if gnome-screensaver is not running (#529592) + +* Thu Oct 15 2009 Matthias Clasen - 0.4.1-1.20090923.3 +- Fix issues with the multi-monitor support +- Make screensaver check work +- Use gvfs-open instead of gnome-open + * Thu Sep 24 2009 Matthias Clasen - 0.4.1-1.20090923.2 - Change default theme to 'slider' From mclasen at fedoraproject.org Mon Nov 2 05:25:55 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:25:55 +0000 (UTC) Subject: rpms/gnome-desktop/devel gnome-desktop.spec, 1.226, 1.227 sources, 1.90, 1.91 pnpids.patch, 1.1, NONE slideshow-api.patch, 1.1, NONE Message-ID: <20091102052555.55B2511C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-desktop/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11397 Modified Files: gnome-desktop.spec sources Removed Files: pnpids.patch slideshow-api.patch Log Message: Copy F-12 work over Index: gnome-desktop.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.226 retrieving revision 1.227 diff -u -p -r1.226 -r1.227 --- gnome-desktop.spec 22 Sep 2009 01:59:39 -0000 1.226 +++ gnome-desktop.spec 2 Nov 2009 05:25:53 -0000 1.227 @@ -11,11 +11,13 @@ Summary: Shared code among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop -Version: 2.28.0 -Release: 1%{?dist} +Version: 2.28.1 +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2 Patch1: concatenate-edid-descriptors.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=597874 +Patch2: randr-gamma.patch License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries @@ -75,6 +77,7 @@ libgnomedesktop. %prep %setup -q %patch1 -p1 -b .concatenate-edid-descriptors +%patch2 -p1 -b .randr-gamma %build %configure --with-gnome-distributor="Red Hat, Inc" \ @@ -122,6 +125,12 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Thu Oct 22 2009 Matthias Clasen - 2.28.1-2 +- Support proper gamma setting in multihead setups + +* Thu Oct 22 2009 Matthias Clasen - 2.28.1-1 +- Update to 2.28.1, translation updates + * Mon Sep 21 2009 Matthias Clasen - 2.28.0-1 - Update to 2.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v retrieving revision 1.90 retrieving revision 1.91 diff -u -p -r1.90 -r1.91 --- sources 22 Sep 2009 01:59:40 -0000 1.90 +++ sources 2 Nov 2009 05:25:53 -0000 1.91 @@ -1 +1 @@ -73927d3c43d783f5d7d6cdbb4359d7d6 gnome-desktop-2.28.0.tar.bz2 +6870b71b564dc902af65ddee176e603f gnome-desktop-2.28.1.tar.bz2 --- pnpids.patch DELETED --- --- slideshow-api.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:29:00 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:29:00 +0000 (UTC) Subject: rpms/metacity/F-12 default-theme.patch, 1.2, NONE metacity-canberra.patch, 1.1, NONE metacity-dont-force-bell.patch, 1.1, NONE metacity-option-to-force-fullscreen.patch, 1.1, NONE metacity-struts.patch, 1.1, NONE Message-ID: <20091102052900.D712A11C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/metacity/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12646 Removed Files: default-theme.patch metacity-canberra.patch metacity-dont-force-bell.patch metacity-option-to-force-fullscreen.patch metacity-struts.patch Log Message: Drop dead patches --- default-theme.patch DELETED --- --- metacity-canberra.patch DELETED --- --- metacity-dont-force-bell.patch DELETED --- --- metacity-option-to-force-fullscreen.patch DELETED --- --- metacity-struts.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:31:28 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:31:28 +0000 (UTC) Subject: rpms/libxklavier/F-12 xklavier-handle-baddrawable.patch,1.1,NONE Message-ID: <20091102053128.1EF5511C02BA@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/libxklavier/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13552 Removed Files: xklavier-handle-baddrawable.patch Log Message: Drop dead patches --- xklavier-handle-baddrawable.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:33:14 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:33:14 +0000 (UTC) Subject: rpms/libxklavier/devel xinput-fixes.patch, NONE, 1.1 libxklavier.spec, 1.52, 1.53 Message-ID: <20091102053314.19B9911C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/libxklavier/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14147 Modified Files: libxklavier.spec Added Files: xinput-fixes.patch Log Message: Copy F12 work over xinput-fixes.patch: xklavier_evt.c | 129 +++++++++++++++++++++++++++++++++---------------- xklavier_evt_xkb.c | 15 +++++ xklavier_private.h | 7 ++ xklavier_private_xkb.h | 6 +- xklavier_toplevel.c | 16 ++++++ xklavier_xkb.c | 29 +++++++---- xklavier_xmm.c | 1 7 files changed, 152 insertions(+), 51 deletions(-) --- NEW FILE xinput-fixes.patch --- ? xinput-fixes.patch Index: libxklavier/xklavier_evt.c =================================================================== RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_evt.c,v retrieving revision 1.26 retrieving revision 1.29 diff -u -r1.26 -r1.29 --- libxklavier/xklavier_evt.c 24 Apr 2009 22:10:19 -0000 1.26 +++ libxklavier/xklavier_evt.c 30 Sep 2009 09:49:57 -0000 1.29 @@ -50,7 +50,8 @@ break; case CreateNotify: xkl_engine_process_create_window_evt(engine, - &xev->xcreatewindow); + &xev-> + xcreatewindow); break; case DestroyNotify: xkl_debug(150, @@ -100,6 +101,8 @@ XFocusChangeEvent * fev) { Window win; + Window prev_toplevel_win = + xkl_engine_priv(engine, curr_toplvl_win); Window toplevel_win; XklState selected_window_state; @@ -135,36 +138,51 @@ if (xkl_engine_get_toplevel_window_state (engine, toplevel_win, &selected_window_state)) { - if (xkl_engine_priv(engine, curr_toplvl_win) != - toplevel_win) { - gboolean old_win_transparent, new_win_transparent; - XklState tmp_state; - - old_win_transparent = - xkl_engine_is_toplevel_window_transparent - (engine, - xkl_engine_priv(engine, curr_toplvl_win)); - if (old_win_transparent) - xkl_debug(150, - "Leaving transparent window\n"); + if (prev_toplevel_win != toplevel_win) { + gboolean new_win_transparent; + Window parent = (Window) NULL, root = + (Window) NULL, *children = NULL; + guint nchildren = 0; /* - * Reload the current state from the current window. - * Do not do it for transparent window - we keep the state from - * the _previous_ window. + * If previous focused window exists - handle transparency and state + * (optional) */ - if (!old_win_transparent && - xkl_engine_get_toplevel_window_state(engine, - xkl_engine_priv - (engine, - curr_toplvl_win), - &tmp_state)) - { - xkl_engine_update_current_state(engine, - tmp_state.group, - tmp_state.indicators, - "Loading current (previous) state from the current (previous) window"); - } + if (xkl_engine_query_tree + (engine, prev_toplevel_win, &root, &parent, + &children, &nchildren) == Success) { + XklState tmp_state; + gboolean old_win_transparent = + xkl_engine_is_toplevel_window_transparent + (engine, prev_toplevel_win); + + if (children != NULL) + XFree(children); + + if (old_win_transparent) + xkl_debug(150, + "Leaving transparent window\n"); + /* + * Reload the current state from the current window. + * Do not do it for transparent window - we keep the state from + * the _previous_ window. + */ + if (!old_win_transparent + && + xkl_engine_get_toplevel_window_state + (engine, prev_toplevel_win, + &tmp_state)) { + xkl_engine_update_current_state + (engine, tmp_state.group, + tmp_state.indicators, + "Loading current (previous) state from the current (previous) window"); + } + } else + xkl_debug(150, + "Current (previous) window " + WINID_FORMAT + " does not exist any more, so transparency/state are not analyzed\n", + prev_toplevel_win); xkl_engine_priv(engine, curr_toplvl_win) = toplevel_win; @@ -216,8 +234,10 @@ "Restoring the group from %d to %d after gaining focus\n", xkl_engine_priv (engine, - curr_state).group, - selected_window_state.group); + curr_state). + group, + selected_window_state. + group); /* * For fast mouse movements - the state is probably not updated yet * (because of the group change notification being late). @@ -225,17 +245,21 @@ */ xkl_engine_update_current_state (engine, - selected_window_state.group, - selected_window_state.indicators, + selected_window_state. + group, + selected_window_state. + indicators, "Enforcing fast update of the current state"); xkl_engine_lock_group (engine, - selected_window_state.group); + selected_window_state. + group); } else { xkl_debug(150, "Both old and new focused window " "have group %d so no point restoring it\n", - selected_window_state.group); + selected_window_state. + group); xkl_engine_one_switch_to_secondary_group_performed (engine); } @@ -249,8 +273,10 @@ xkl_debug(150, "Restoring the indicators from %X to %X after gaining focus\n", xkl_engine_priv(engine, - curr_state).indicators, - selected_window_state.indicators); + curr_state). + indicators, + selected_window_state. + indicators); xkl_engine_ensure_vtable_inited (engine); xkl_engine_vcall(engine, @@ -261,12 +287,14 @@ xkl_debug(150, "Not restoring the indicators %X after gaining focus: indicator handling is not enabled\n", xkl_engine_priv(engine, - curr_state).indicators); + curr_state). + indicators); } else xkl_debug(150, "Not restoring the group %d after gaining focus: global layout (xor transparent window)\n", xkl_engine_priv(engine, - curr_state).group); + curr_state). + group); } else xkl_debug(150, "Same app window - just do nothing\n"); @@ -392,11 +420,13 @@ "Something (%d) happened to WM_STATE of window 0x%x\n", pev->state, pev->window); xkl_engine_select_input_merging(engine, - pev->window, + pev-> + window, PropertyChangeMask); if (has_xkl_state) { xkl_engine_delete_state(engine, - pev->window); + pev-> + window); } } } /* XKLL_MANAGE_WINDOW_STATES */ @@ -475,8 +505,9 @@ xkl_engine_priv(engine, last_error_code) = evt->error_code; switch (evt->error_code) { - case BadWindow: case BadAccess: + case BadDrawable: + case BadWindow: { XGetErrorText(evt->display, evt->error_code, buf, sizeof(buf)); @@ -491,6 +522,22 @@ break; } default: + if (engine != NULL + && xkl_engine_priv(engine, process_x_error)) { + if (xkl_engine_priv(engine, process_x_error) + (engine, evt)) { + xkl_debug(200, + "X ERROR processed by the engine: %p, " + WINID_FORMAT ", %d [%s], " + "X11 request: %d, minor code: %d\n", + dpy, + (unsigned long) evt->resourceid, + (int) evt->error_code, buf, + (int) evt->request_code, + (int) evt->minor_code); + break; + } + } xkl_debug(200, "Unexpected by libxklavier X ERROR: %p, " WINID_FORMAT ", %d [%s], " Index: libxklavier/xklavier_evt_xkb.c =================================================================== RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_evt_xkb.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libxklavier/xklavier_evt_xkb.c 17 Nov 2008 00:19:27 -0000 1.11 +++ libxklavier/xklavier_evt_xkb.c 30 Sep 2009 09:49:57 -0000 1.12 @@ -162,6 +162,21 @@ #endif } +/* + * XKB error handler + */ +gint +xkl_xkb_process_x_error(XklEngine * engine, XErrorEvent * xerev) +{ +#ifdef HAVE_XINPUT + /* Ignore XInput errors */ + if (xerev->error_code == xkl_engine_backend(engine, XklXkb, xi_error_code)) + return 1; +#endif + + return 0; +} + void xkl_xkb_set_indicators(XklEngine * engine, const XklState * window_state) { Index: libxklavier/xklavier_private.h =================================================================== RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_private.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- libxklavier/xklavier_private.h 23 Jun 2009 23:18:38 -0000 1.38 +++ libxklavier/xklavier_private.h 30 Sep 2009 09:49:57 -0000 1.39 @@ -157,6 +157,13 @@ gint(*process_x_event) (XklEngine * engine, XEvent * xev); /* + * Handles X errors. + * return 0 if further processing is needed + * 1 if error was handled + */ + gint(*process_x_error) (XklEngine * engine, XErrorEvent * xerev); + + /* * Flushes the cached server config info. * xkb: frees XkbDesc * xmodmap: frees internal XklConfigRec Index: libxklavier/xklavier_private_xkb.h =================================================================== RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_private_xkb.h,v retrieving revision 1.18 retrieving revision 1.20 diff -u -r1.18 -r1.20 --- libxklavier/xklavier_private_xkb.h 23 Jun 2009 21:33:00 -0000 1.18 +++ libxklavier/xklavier_private_xkb.h 30 Sep 2009 09:49:57 -0000 1.20 @@ -48,6 +48,8 @@ #ifdef HAVE_XINPUT gint xi_event_type; + + gint xi_error_code; #endif } XklXkb; @@ -86,7 +88,9 @@ const XklConfigRec * data, const gboolean binary); -extern gint xkl_xkb_process_x_event(XklEngine * engine, XEvent * kev); +extern gint xkl_xkb_process_x_event(XklEngine * engine, XEvent * xev); + +extern gint xkl_xkb_process_x_error(XklEngine * engine, XErrorEvent * xerev); extern void xkl_xkb_free_all_info(XklEngine * engine); Index: libxklavier/xklavier_toplevel.c =================================================================== RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_toplevel.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libxklavier/xklavier_toplevel.c 1 Mar 2008 21:43:19 -0000 1.6 +++ libxklavier/xklavier_toplevel.c 12 Oct 2009 20:28:55 -0000 1.7 @@ -114,6 +114,22 @@ g_signal_lookup("new-toplevel-window", xkl_engine_get_type()); g_signal_emitv(params, signal_id, 0, &rv); default_group_to_use = g_value_get_int(&rv); + + if (default_group_to_use == -1) { + Window transient_for = 0; + if (XGetTransientForHint(xkl_engine_get_display(engine), toplevel_win, &transient_for)) { + if (transient_for) { + XklState trans_state; + gboolean have_state = + xkl_engine_get_toplevel_window_state(engine, + transient_for, + &trans_state); + if (have_state) { + default_group_to_use = trans_state.group; + } + } + } + } if (default_group_to_use == -1) default_group_to_use = Index: libxklavier/xklavier_xkb.c =================================================================== RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_xkb.c,v retrieving revision 1.33 retrieving revision 1.37 diff -u -r1.33 -r1.37 --- libxklavier/xklavier_xkb.c 24 Apr 2009 22:10:19 -0000 1.33 +++ libxklavier/xklavier_xkb.c 30 Sep 2009 09:49:57 -0000 1.37 @@ -96,7 +96,7 @@ XkbNamesNotify, XKB_NAMES_EVT_DTL_MASK, XKB_NAMES_EVT_DTL_MASK); #ifdef HAVE_XINPUT - if (xkl_engine_priv(engine, features) | XKLF_DEVICE_DISCOVERY) { + if (xkl_engine_priv(engine, features) & XKLF_DEVICE_DISCOVERY) { DevicePresence(display, xitype, xiclass); XSelectExtensionEvent(display, xkl_engine_priv(engine, root_window), @@ -353,8 +353,8 @@ ¤t_state_out->indicators)) current_state_out->indicators &= xkl_engine_backend(engine, XklXkb, - cached_desc)-> - indicators->phys_indicators; + cached_desc)->indicators-> + phys_indicators; else current_state_out->indicators = 0; } @@ -402,8 +402,8 @@ xkl_engine_backend (engine, XklXkb, device_id), - cached-> - names->indicators + cached->names-> + indicators [indicator_num], set, False, NULL); else { @@ -541,7 +541,7 @@ #ifdef LIBXKBFILE_PRESENT gint opcode; gboolean xkl_xkb_ext_present; - int xi_opc, xi_event_type, xi_error_code; + int xi_opc; xkl_engine_priv(engine, backend_id) = "XKB"; xkl_engine_priv(engine, features) = XKLF_CAN_TOGGLE_INDICATORS | @@ -564,6 +564,7 @@ xkl_engine_priv(engine, get_num_groups) = xkl_xkb_get_num_groups; xkl_engine_priv(engine, lock_group) = xkl_xkb_lock_group; xkl_engine_priv(engine, process_x_event) = xkl_xkb_process_x_event; + xkl_engine_priv(engine, process_x_error) = xkl_xkb_process_x_error; xkl_engine_priv(engine, free_all_info) = xkl_xkb_free_all_info; xkl_engine_priv(engine, if_cached_info_equals_actual) = xkl_xkb_if_cached_info_equals_actual; @@ -615,14 +616,24 @@ xkl_engine_priv(engine, features) |= XKLF_MULTIPLE_LAYOUTS_SUPPORTED; +#if HAVE_XINPUT if (XQueryExtension (display, "XInputExtension", &xi_opc, - &xi_event_type, &xi_error_code)) { + &xkl_engine_backend(engine, XklXkb, xi_event_type), + &xkl_engine_backend(engine, XklXkb, xi_error_code))) { xkl_debug(150, "XInputExtension found (%d, %d, %d)\n", - xi_opc, xi_event_type, xi_error_code); + xi_opc, + xkl_engine_backend(engine, XklXkb, + xi_event_type), + xkl_engine_backend(engine, XklXkb, + xi_error_code)); xkl_engine_priv(engine, features) |= XKLF_DEVICE_DISCOVERY; - } else + } else { xkl_debug(0, "XInputExtension not found\n"); + xkl_engine_backend(engine, XklXkb, xi_event_type) = -1; + xkl_engine_backend(engine, XklXkb, xi_error_code) = -1; + } +#endif return 0; #else xkl_debug(160, Index: libxklavier/xklavier_xmm.c =================================================================== RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_xmm.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libxklavier/xklavier_xmm.c 27 Apr 2008 14:59:55 -0000 1.14 +++ libxklavier/xklavier_xmm.c 30 Sep 2009 09:49:57 -0000 1.15 @@ -327,6 +327,7 @@ xkl_engine_priv(engine, lock_group) = xkl_xmm_lock_group; xkl_engine_priv(engine, process_x_event) = xkl_xmm_process_x_event; + xkl_engine_priv(engine, process_x_error) = NULL; xkl_engine_priv(engine, free_all_info) = xkl_xmm_free_all_info; xkl_engine_priv(engine, if_cached_info_equals_actual) = xkl_xmm_if_cached_info_equals_actual; Index: libxklavier.spec =================================================================== RCS file: /cvs/pkgs/rpms/libxklavier/devel/libxklavier.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -p -r1.52 -r1.53 --- libxklavier.spec 25 Jul 2009 08:58:13 -0000 1.52 +++ libxklavier.spec 2 Nov 2009 05:33:13 -0000 1.53 @@ -1,7 +1,7 @@ Summary: High-level API for X Keyboard Extension Name: libxklavier Version: 4.0 -Release: 4%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://gswitchit.sourceforge.net/ @@ -16,6 +16,7 @@ Source: http://download.gnome.org/source BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # http://bugs.freedesktop.org/show_bug.cgi?id=22687 Patch0: flags.patch +Patch1: xinput-fixes.patch %description libxklavier is a library providing a high-level API for the X Keyboard @@ -38,6 +39,7 @@ needed to develop libxklavier applicatio %prep %setup -q %patch0 -p1 -b .flags +%patch1 -p0 -b .xinput %build @@ -78,6 +80,12 @@ rm -rf %{buildroot} %{_datadir}/gtk-doc/html/libxklavier/ %changelog +* Thu Oct 15 2009 Matthias Clasen - 4.0-6 +- Incorporate upstream fixes for XInput error handling + +* Fri Oct 2 2009 Matthias Clasen - 4.0-5 +- Handle BadDrawable errors gracefully + * Sat Jul 25 2009 Fedora Release Engineering - 4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From mclasen at fedoraproject.org Mon Nov 2 05:38:12 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:38:12 +0000 (UTC) Subject: rpms/gdm/devel 0001-Don-t-show-lock-screen-option-if-locked-down.patch, NONE, 1.1 fix-clock.patch, NONE, 1.1 fix-computer-info.patch, NONE, 1.1 fix-na-tray.patch, NONE, 1.1 fix-run-dir-permissions.patch, NONE, 1.1 fix-timer.patch, NONE, 1.1 gdm-2.28.1-move-shutdown-functions.patch, NONE, 1.1 gdm-bubble-location.patch, NONE, 1.1 make-user-list-animation-smoother.patch, NONE, 1.1 tray-padding.patch, NONE, 1.1 gdm-multistack.patch, 1.1, 1.2 gdm-system-keyboard.patch, 1.4, 1.5 gdm.spec, 1.491, 1.492 sources, 1.114, 1.115 0001-Fix-gdm_slave_get_timed_login_details.patch, 1.1, NONE gdm-2.27.4-multistack.patch, 1.3, NONE gdm-2.28.0-use-devicekit-power.patch, 1.1, NONE Message-ID: <20091102053812.525A711C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gdm/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15236 Modified Files: gdm-multistack.patch gdm-system-keyboard.patch gdm.spec sources Added Files: 0001-Don-t-show-lock-screen-option-if-locked-down.patch fix-clock.patch fix-computer-info.patch fix-na-tray.patch fix-run-dir-permissions.patch fix-timer.patch gdm-2.28.1-move-shutdown-functions.patch gdm-bubble-location.patch make-user-list-animation-smoother.patch tray-padding.patch Removed Files: 0001-Fix-gdm_slave_get_timed_login_details.patch gdm-2.27.4-multistack.patch gdm-2.28.0-use-devicekit-power.patch Log Message: Copy F12 work over 0001-Don-t-show-lock-screen-option-if-locked-down.patch: applet.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) --- NEW FILE 0001-Don-t-show-lock-screen-option-if-locked-down.patch --- diff -up gdm-2.28.1/gui/user-switch-applet/applet.c.dont-show-lock-screen-if-locked-down gdm-2.28.1/gui/user-switch-applet/applet.c --- gdm-2.28.1/gui/user-switch-applet/applet.c.dont-show-lock-screen-if-locked-down 2009-10-19 18:12:45.000000000 -0400 +++ gdm-2.28.1/gui/user-switch-applet/applet.c 2009-10-31 19:57:21.700544070 -0400 @@ -44,7 +44,9 @@ #include "gdm-entry-menu-item.h" #define LOCKDOWN_DIR "/desktop/gnome/lockdown" -#define LOCKDOWN_KEY LOCKDOWN_DIR "/disable_user_switching" +#define LOCKDOWN_USER_SWITCHING_KEY LOCKDOWN_DIR "/disable_user_switching" +#define LOCKDOWN_LOCK_SCREEN_KEY LOCKDOWN_DIR "/disable_lock_screen" +#define LOCKDOWN_COMMAND_LINE_KEY LOCKDOWN_DIR "/disable_command_line" typedef enum { GSM_PRESENCE_STATUS_AVAILABLE = 0, @@ -1163,7 +1165,11 @@ create_sub_menu (GdmAppletData *adata) G_CALLBACK (menuitem_style_set_cb), adata); g_signal_connect (adata->lock_screen_item, "activate", G_CALLBACK (on_lock_screen_activate), adata); - gtk_widget_show (adata->lock_screen_item); + if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) { + gtk_widget_hide (adata->lock_screen_item); + } else { + gtk_widget_show (adata->lock_screen_item); + } adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Switch User")); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item), @@ -1174,7 +1180,7 @@ create_sub_menu (GdmAppletData *adata) G_CALLBACK (menuitem_style_set_cb), adata); g_signal_connect (adata->login_screen_item, "activate", G_CALLBACK (on_login_screen_activate), adata); - /* Only show switch user if there are other users */ + update_switch_user (adata); adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quit...")); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->quit_session_item), @@ -1229,11 +1235,17 @@ client_notify_lockdown_func (GConfClient return; } - if (strcmp (key, LOCKDOWN_KEY) == 0) { + if (strcmp (key, LOCKDOWN_USER_SWITCHING_KEY) == 0) { if (gconf_value_get_bool (value)) { - set_menu_visibility (adata, FALSE); + gtk_widget_hide (adata->login_screen_item); } else { - set_menu_visibility (adata, TRUE); + gtk_widget_show (adata->login_screen_item); + } + } else if (strcmp (key, LOCKDOWN_LOCK_SCREEN_KEY) == 0) { + if (gconf_value_get_bool (value)) { + gtk_widget_hide (adata->lock_screen_item); + } else { + gtk_widget_show (adata->lock_screen_item); } } } @@ -1430,7 +1442,7 @@ fill_applet (PanelApplet *applet) /* Hide the admin context menu items if locked down or no cmd-line */ if (gconf_client_get_bool (adata->client, - "/desktop/gnome/lockdown/inhibit_command_line", + LOCKDOWN_COMMAND_LINE_KEY, NULL) || panel_applet_get_locked_down (applet)) { bonobo_ui_component_set_prop (popup_component, @@ -1502,14 +1514,19 @@ fill_applet (PanelApplet *applet) adata->manager = gdm_user_manager_ref_default (); setup_current_user (adata); + gconf_client_add_dir (adata->client, + LOCKDOWN_DIR, + GCONF_CLIENT_PRELOAD_ONELEVEL, + NULL); + adata->client_notify_lockdown_id = gconf_client_notify_add (adata->client, - LOCKDOWN_KEY, + LOCKDOWN_DIR, (GConfClientNotifyFunc)client_notify_lockdown_func, adata, NULL, NULL); - if (gconf_client_get_bool (adata->client, LOCKDOWN_KEY, NULL)) { + if (gconf_client_get_bool (adata->client, LOCKDOWN_USER_SWITCHING_KEY, NULL)) { set_menu_visibility (adata, FALSE); } else { set_menu_visibility (adata, TRUE); fix-clock.patch: gdm-clock-widget.c | 98 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 31 deletions(-) --- NEW FILE fix-clock.patch --- >From 87248d5c3e0a90c3b0748c7be05a9e6eac231737 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 21 Oct 2009 10:57:59 -0400 Subject: [PATCH] Move date to tooltip in panel clock It's a bit long at the moment. Dropping the date makes the screen look a little cleaner, and putting the date in the tooltip makes it still available for those people who want to see it. --- gui/simple-greeter/gdm-clock-widget.c | 97 +++++++++++++++++++++++---------- 1 files changed, 67 insertions(+), 30 deletions(-) diff --git a/gui/simple-greeter/gdm-clock-widget.c b/gui/simple-greeter/gdm-clock-widget.c index a3816d2..9008e6d 100644 --- a/gui/simple-greeter/gdm-clock-widget.c +++ b/gui/simple-greeter/gdm-clock-widget.c @@ -44,8 +44,10 @@ struct GdmClockWidgetPrivate { GtkWidget *label; char *time_format; + char *tooltip_format; guint update_clock_id; guint should_show_seconds : 1; + guint should_show_date : 1; }; static void gdm_clock_widget_class_init (GdmClockWidgetClass *klass); @@ -55,38 +57,59 @@ static gboolean update_timeout_cb (GdmClockWidget *clock); G_DEFINE_TYPE (GdmClockWidget, gdm_clock_widget, GTK_TYPE_ALIGNMENT) -static char * -get_time_format (GdmClockWidget *clock) +static void +update_time_format (GdmClockWidget *clock) { - const char *time_format; - const char *date_format; char *clock_format; - char *result; - - time_format = clock->priv->should_show_seconds ? _("%l:%M:%S %p") : _("%l:%M %p"); - /* translators: replace %e with %d if, when the day of the - * month as a decimal number is a single digit, it - * should begin with a 0 in your locale (e.g. "May - * 01" instead of "May 1"). - */ - date_format = _("%a %b %e"); - /* translators: reverse the order of these arguments - * if the time should come before the - * date on a clock in your locale. - */ - clock_format = g_strdup_printf (_("%1$s, %2$s"), - date_format, - time_format); - - result = g_locale_from_utf8 (clock_format, -1, NULL, NULL, NULL); - g_free (clock_format); - - return result; + char *tooltip_format; + + if (clock->priv->should_show_date && clock->priv->should_show_seconds) { + /* translators: This is the time format to use when both + * the date and time with seconds are being shown together. + */ + clock_format = _("%a %b %e, %l:%M:%S %p"); + tooltip_format = NULL; + } else if (clock->priv->should_show_date && !clock->priv->should_show_seconds) { + /* translators: This is the time format to use when both + * the date and time without seconds are being shown together. + */ + clock_format = _("%a %b %e, %l:%M %p"); + + tooltip_format = NULL; + } else if (!clock->priv->should_show_date && clock->priv->should_show_seconds) { + /* translators: This is the time format to use when there is + * no date, just weekday and time with seconds. + */ + clock_format = _("%a %l:%M:%S %p"); + + /* translators: This is the time format to use for the date + */ + tooltip_format = _("%x"); + } else { + /* translators: This is the time format to use when there is + * no date, just weekday and time without seconds. + */ + clock_format = _("%a %l:%M %p"); + + tooltip_format = _("%x"); + } + + g_free (clock->priv->time_format); + clock->priv->time_format = g_locale_from_utf8 (clock_format, -1, NULL, NULL, NULL); + + g_free (clock->priv->tooltip_format); + + if (tooltip_format != NULL) { + clock->priv->tooltip_format = g_locale_from_utf8 (tooltip_format, -1, NULL, NULL, NULL); + } else { + clock->priv->tooltip_format = NULL; + } } static void update_clock (GtkLabel *label, - const char *format) + const char *clock_format, + const char *tooltip_format) { time_t t; struct tm *tm; @@ -99,13 +122,25 @@ update_clock (GtkLabel *label, g_warning ("Unable to get broken down local time"); return; } - if (strftime (buf, sizeof (buf), format, tm) == 0) { - g_warning ("Couldn't format time: %s", format); + if (strftime (buf, sizeof (buf), clock_format, tm) == 0) { + g_warning ("Couldn't format time: %s", clock_format); strcpy (buf, "???"); } utf8 = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL); gtk_label_set_text (label, utf8); g_free (utf8); + + if (tooltip_format != NULL) { + if (strftime (buf, sizeof (buf), tooltip_format, tm) == 0) { + g_warning ("Couldn't format tooltip date: %s", tooltip_format); + strcpy (buf, "???"); + } + utf8 = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL); + gtk_widget_set_tooltip_text (GTK_WIDGET (label), utf8); + g_free (utf8); + } else { + gtk_widget_set_has_tooltip (GTK_WIDGET (label), FALSE); + } } static void @@ -142,7 +177,8 @@ update_timeout_cb (GdmClockWidget *clock) if (clock->priv->label != NULL) { update_clock (GTK_LABEL (clock->priv->label), - clock->priv->time_format); + clock->priv->time_format, + clock->priv->tooltip_format); } set_clock_timeout (clock, new_time); @@ -214,10 +250,11 @@ gdm_clock_widget_init (GdmClockWidget *widget) gtk_container_add (GTK_CONTAINER (widget), box); widget->priv->label = gtk_label_new (""); + gtk_widget_show (widget->priv->label); gtk_box_pack_start (GTK_BOX (box), widget->priv->label, FALSE, FALSE, 0); - widget->priv->time_format = get_time_format (widget); + update_time_format (widget); update_timeout_cb (widget); } -- 1.6.5.rc2 fix-computer-info.patch: b/gui/simple-greeter/gdm-greeter-login-window.c | 7 ++++-- gui/simple-greeter/gdm-greeter-login-window.c | 28 ++++++++++++++++++------ 2 files changed, 26 insertions(+), 9 deletions(-) --- NEW FILE fix-computer-info.patch --- >From 18bf08d14ed77db00a17e74c5ce04c812ef251af Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 26 Oct 2009 10:45:49 -0400 Subject: [PATCH 1/2] Use gethostname instead of g_get_host_name in greeter The latter is unreliable when the hostname changes at runtime. --- gui/simple-greeter/gdm-greeter-login-window.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c index 9a29a2e..9d75b8c 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -996,7 +996,11 @@ create_computer_info (GdmGreeterLoginWindow *login_window) label = glade_xml_get_widget (login_window->priv->xml, "computer-info-name-label"); if (label != NULL) { - gtk_label_set_text (GTK_LABEL (label), g_get_host_name ()); + char localhost[HOST_NAME_MAX + 1] = "";? + + if (gethostname (localhost, HOST_NAME_MAX) == 0) {? + gtk_label_set_text (GTK_LABEL (label), localhost); + } } label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label"); -- 1.6.5.1 >From 03e01936f5c11580a1485c492355eb0a468ea0f6 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 26 Oct 2009 10:53:25 -0400 Subject: [PATCH 2/2] Don't bother showing hostname if it's not unique The advantage of showing hostname by default is it is a unique identifier for people who have multiple machines. If it only says "localhost" or "localhost.localdomain" that advantage is mitigated, and it's probably better to show OS release. --- gui/simple-greeter/gdm-greeter-login-window.c | 27 +++++++++++++++++++----- 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c index 9d75b8c..8de74df 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -887,10 +887,8 @@ on_user_unchosen (GdmUserChooserWidget *user_chooser, do_cancel (login_window); } -static gboolean -on_computer_info_label_button_press (GtkWidget *widget, - GdkEventButton *event, - GdmGreeterLoginWindow *login_window) +static void +rotate_computer_info (GdmGreeterLoginWindow *login_window) { GtkWidget *notebook; int current_page; @@ -907,6 +905,14 @@ on_computer_info_label_button_press (GtkWidget *widget, gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0); } +} + +static gboolean +on_computer_info_label_button_press (GtkWidget *widget, + GdkEventButton *event, + GdmGreeterLoginWindow *login_window) +{ + rotate_computer_info (login_window); return FALSE; } @@ -996,11 +1002,20 @@ create_computer_info (GdmGreeterLoginWindow *login_window) label = glade_xml_get_widget (login_window->priv->xml, "computer-info-name-label"); if (label != NULL) { - char localhost[HOST_NAME_MAX + 1] = "";? + char localhost[HOST_NAME_MAX + 1] = ""; - if (gethostname (localhost, HOST_NAME_MAX) == 0) {? + if (gethostname (localhost, HOST_NAME_MAX) == 0) { gtk_label_set_text (GTK_LABEL (label), localhost); } + + /* If this isn't actually unique identifier for the computer, then + * don't bother showing it by default. + */ + if (strcmp (localhost, "localhost") == 0 || + strcmp (localhost, "localhost.localdomain") == 0) { + + rotate_computer_info (login_window); + } } label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label"); -- 1.6.5.1 fix-na-tray.patch: b/gui/simple-greeter/gdm-greeter-panel.c | 6 b/gui/simple-greeter/libnotificationarea/Makefile.am | 2 b/gui/simple-greeter/libnotificationarea/fixedtip.c | 1 b/gui/simple-greeter/libnotificationarea/na-tray-child.c | 430 +++++++++++++ b/gui/simple-greeter/libnotificationarea/na-tray-child.h | 68 ++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.c | 264 +++---- b/gui/simple-greeter/libnotificationarea/na-tray-manager.h | 15 b/gui/simple-greeter/libnotificationarea/na-tray.c | 76 +- b/gui/simple-greeter/libnotificationarea/na-tray.h | 3 b/gui/simple-greeter/libnotificationarea/testtray.c | 3 gui/simple-greeter/libnotificationarea/na-tray-child.c | 81 ++ gui/simple-greeter/libnotificationarea/na-tray-child.h | 5 gui/simple-greeter/libnotificationarea/na-tray-manager.c | 41 + gui/simple-greeter/libnotificationarea/na-tray-manager.h | 3 gui/simple-greeter/libnotificationarea/na-tray.c | 102 ++- gui/simple-greeter/libnotificationarea/na-tray.h | 3 16 files changed, 909 insertions(+), 194 deletions(-) --- NEW FILE fix-na-tray.patch --- >From f304eec1bf7dd80e255092b3cdaade10827fd320 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 22 Oct 2009 22:02:51 -0400 Subject: [PATCH 1/4] Update na-tray to latest upstream code It's a copy and paste from the panel. --- gui/simple-greeter/libnotificationarea/Makefile.am | 2 + gui/simple-greeter/libnotificationarea/fixedtip.c | 1 + .../libnotificationarea/na-tray-child.c | 430 ++++++++++++++++++++ .../libnotificationarea/na-tray-child.h | 68 +++ .../libnotificationarea/na-tray-manager.c | 264 +++++-------- .../libnotificationarea/na-tray-manager.h | 15 +- gui/simple-greeter/libnotificationarea/na-tray.c | 76 +++- gui/simple-greeter/libnotificationarea/na-tray.h | 3 +- gui/simple-greeter/libnotificationarea/testtray.c | 2 +- 9 files changed, 674 insertions(+), 187 deletions(-) create mode 100644 gui/simple-greeter/libnotificationarea/na-tray-child.c create mode 100644 gui/simple-greeter/libnotificationarea/na-tray-child.h diff --git a/gui/simple-greeter/libnotificationarea/Makefile.am b/gui/simple-greeter/libnotificationarea/Makefile.am index e3a6a1f..4009aaf 100644 --- a/gui/simple-greeter/libnotificationarea/Makefile.am +++ b/gui/simple-greeter/libnotificationarea/Makefile.am @@ -29,6 +29,8 @@ libnotificationarea_la_SOURCES = \ obox.h \ na-tray.c \ na-tray.h \ + na-tray-child.c \ + na-tray-child.h \ na-tray-manager.c \ na-tray-manager.h \ na-marshal.c \ diff --git a/gui/simple-greeter/libnotificationarea/fixedtip.c b/gui/simple-greeter/libnotificationarea/fixedtip.c index cc90e26..53ac923 100644 --- a/gui/simple-greeter/libnotificationarea/fixedtip.c +++ b/gui/simple-greeter/libnotificationarea/fixedtip.c @@ -81,6 +81,7 @@ na_fixed_tip_class_init (NaFixedTipClass *class) g_type_class_add_private (class, sizeof (NaFixedTipPrivate)); } +/* Did you already see this code? Yes, it's gtk_tooltips_ force_window() ;-) */ static void na_fixed_tip_init (NaFixedTip *fixedtip) { diff --git a/gui/simple-greeter/libnotificationarea/na-tray-child.c b/gui/simple-greeter/libnotificationarea/na-tray-child.c new file mode 100644 index 0000000..c7e3f61 --- /dev/null +++ b/gui/simple-greeter/libnotificationarea/na-tray-child.c @@ -0,0 +1,430 @@ +/* na-tray-child.c + * Copyright (C) 2002 Anders Carlsson + * Copyright (C) 2003-2006 Vincent Untz + * Copyright (C) 2008 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include +#include + +#include "na-tray-child.h" + +#include +#include +#include +#include + +G_DEFINE_TYPE (NaTrayChild, na_tray_child, GTK_TYPE_SOCKET) + +static void +na_tray_child_finalize (GObject *object) +{ + G_OBJECT_CLASS (na_tray_child_parent_class)->finalize (object); +} + +static void +na_tray_child_realize (GtkWidget *widget) +{ + NaTrayChild *child = NA_TRAY_CHILD (widget); + GdkVisual *visual = gtk_widget_get_visual (widget); + + GTK_WIDGET_CLASS (na_tray_child_parent_class)->realize (widget); + + if (child->has_alpha) + { + /* We have real transparency with an ARGB visual and the Composite + * extension. */ + + /* Set a transparent background */ + GdkColor transparent = { 0, 0, 0, 0 }; /* only pixel=0 matters */ + gdk_window_set_background (widget->window, &transparent); + gdk_window_set_composited (widget->window, TRUE); + + child->parent_relative_bg = FALSE; + } + else if (visual == gdk_drawable_get_visual (GDK_DRAWABLE (gdk_window_get_parent (widget->window)))) + { + /* Otherwise, if the visual matches the visual of the parent window, we + * can use a parent-relative background and fake transparency. */ + gdk_window_set_back_pixmap (widget->window, NULL, TRUE); + + child->parent_relative_bg = TRUE; + } + else + { + /* Nothing to do; the icon will sit on top of an ugly gray box */ + child->parent_relative_bg = FALSE; + } + + gdk_window_set_composited (widget->window, child->composited); + + gtk_widget_set_app_paintable (GTK_WIDGET (child), + child->parent_relative_bg || child->has_alpha); + + /* Double-buffering will interfere with the parent-relative-background fake + * transparency, since the double-buffer code doesn't know how to fill in the + * background of the double-buffer correctly. + */ + gtk_widget_set_double_buffered (GTK_WIDGET (child), + child->parent_relative_bg); +} + +static void +na_tray_child_style_set (GtkWidget *widget, + GtkStyle *previous_style) +{ + /* The default handler resets the background according to the new style. + * We either use a transparent background or a parent-relative background + * and ignore the style background. So, just don't chain up. + */ +} + +#if 0 +/* This is adapted from code that was commented out in na-tray-manager.c; the + * code in na-tray-manager.c wouldn't have worked reliably, this will. So maybe + * it can be reenabled. On other hand, things seem to be working fine without + * it. + * + * If reenabling, you need to hook it up in na_tray_child_class_init(). + */ +static void +na_tray_child_size_request (GtkWidget *widget, + GtkRequisition *request) +{ + GTK_WIDGET_CLASS (na_tray_child_parent_class)->size_request (widget, request); + + /* + * Make sure the icons have a meaningful size .. + */ + if ((request->width < 16) || (request->height < 16)) + { + gint nw = MAX (24, request->width); + gint nh = MAX (24, request->height); + g_warning ("Tray icon has requested a size of (%ix%i), resizing to (%ix%i)", + req.width, req.height, nw, nh); + request->width = nw; + request->height = nh; + } +} +#endif + +static void +na_tray_child_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + NaTrayChild *child = NA_TRAY_CHILD (widget); + + gboolean moved = allocation->x != widget->allocation.x || + allocation->y != widget->allocation.y; + gboolean resized = allocation->width != widget->allocation.width || + allocation->height != widget->allocation.height; + + /* When we are allocating the widget while mapped we need special handling + * for both real and fake transparency. + * + * Real transparency: we need to invalidate and trigger a redraw of the old + * and new areas. (GDK really should handle this for us, but doesn't as of + * GTK+-2.14) + * + * Fake transparency: if the widget moved, we need to force the contents to + * be redrawn with the new offset for the parent-relative background. + */ + if ((moved || resized) && GTK_WIDGET_MAPPED (widget)) + { + if (na_tray_child_has_alpha (child)) + gdk_window_invalidate_rect (gdk_window_get_parent (widget->window), + &widget->allocation, FALSE); + } + + GTK_WIDGET_CLASS (na_tray_child_parent_class)->size_allocate (widget, + allocation); + + if ((moved || resized) && GTK_WIDGET_MAPPED (widget)) + { + if (na_tray_child_has_alpha (NA_TRAY_CHILD (widget))) + gdk_window_invalidate_rect (gdk_window_get_parent (widget->window), + &widget->allocation, FALSE); + else if (moved && child->parent_relative_bg) + na_tray_child_force_redraw (child); + } +} + +/* The plug window should completely occupy the area of the child, so we won't + * get an expose event. But in case we do (the plug unmaps itself, say), this + * expose handler draws with real or fake transparency. + */ +static gboolean +na_tray_child_expose_event (GtkWidget *widget, + GdkEventExpose *event) +{ + NaTrayChild *child = NA_TRAY_CHILD (widget); + + if (na_tray_child_has_alpha (child)) + { + /* Clear to transparent */ + cairo_t *cr = gdk_cairo_create (widget->window); + cairo_set_source_rgba (cr, 0, 0, 0, 0); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + gdk_cairo_region (cr, event->region); + cairo_fill (cr); + cairo_destroy (cr); + } + else if (child->parent_relative_bg) + { + /* Clear to parent-relative pixmap */ + gdk_window_clear_area (widget->window, + event->area.x, event->area.y, + event->area.width, event->area.height); + } + + return FALSE; +} + +static void +na_tray_child_init (NaTrayChild *child) +{ +} + +static void +na_tray_child_class_init (NaTrayChildClass *klass) +{ + GObjectClass *gobject_class; + GtkWidgetClass *widget_class; + + gobject_class = (GObjectClass *)klass; + widget_class = (GtkWidgetClass *)klass; + + gobject_class->finalize = na_tray_child_finalize; + widget_class->style_set = na_tray_child_style_set; + widget_class->realize = na_tray_child_realize; + widget_class->size_allocate = na_tray_child_size_allocate; + widget_class->expose_event = na_tray_child_expose_event; +} + +GtkWidget * +na_tray_child_new (GdkScreen *screen, + Window icon_window) +{ + XWindowAttributes window_attributes; + Display *xdisplay; + NaTrayChild *child; + GdkVisual *visual; + gboolean visual_has_alpha; + GdkColormap *colormap; + gboolean new_colormap; + int result; + + g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); + g_return_val_if_fail (icon_window != None, NULL); + + xdisplay = GDK_SCREEN_XDISPLAY (screen); + + /* We need to determine the visual of the window we are embedding and create + * the socket in the same visual. + */ + + gdk_error_trap_push (); + result = XGetWindowAttributes (xdisplay, icon_window, + &window_attributes); + gdk_error_trap_pop (); + + if (!result) /* Window already gone */ + return NULL; + + visual = gdk_x11_screen_lookup_visual (screen, + window_attributes.visual->visualid); + if (!visual) /* Icon window is on another screen? */ + return NULL; + + new_colormap = FALSE; + + if (visual == gdk_screen_get_rgb_visual (screen)) + colormap = gdk_screen_get_rgb_colormap (screen); + else if (visual == gdk_screen_get_rgba_visual (screen)) + colormap = gdk_screen_get_rgba_colormap (screen); + else if (visual == gdk_screen_get_system_visual (screen)) + colormap = gdk_screen_get_system_colormap (screen); + else + { + colormap = gdk_colormap_new (visual, FALSE); + new_colormap = TRUE; + } + + child = g_object_new (NA_TYPE_TRAY_CHILD, NULL); + child->icon_window = icon_window; + + gtk_widget_set_colormap (GTK_WIDGET (child), colormap); + + /* We have alpha if the visual has something other than red, green, + * and blue */ + visual_has_alpha = visual->red_prec + visual->blue_prec + visual->green_prec < visual->depth; + child->has_alpha = (visual_has_alpha && + gdk_display_supports_composite (gdk_screen_get_display (screen))); + + child->composited = child->has_alpha; + + if (new_colormap) + g_object_unref (colormap); + + return GTK_WIDGET (child); +} + +char * +na_tray_child_get_title (NaTrayChild *child) +{ + char *retval = NULL; + GdkDisplay *display; + Atom utf8_string, atom, type; + int result; + int format; + gulong nitems; + gulong bytes_after; + gchar *val; + + g_return_val_if_fail (NA_IS_TRAY_CHILD (child), NULL); + + display = gtk_widget_get_display (GTK_WIDGET (child)); + + utf8_string = gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"); + atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME"); + + gdk_error_trap_push (); + + result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), + child->icon_window, + atom, + 0, G_MAXLONG, + False, utf8_string, + &type, &format, &nitems, + &bytes_after, (guchar **)&val); + + if (gdk_error_trap_pop () || result != Success) + return NULL; + + if (type != utf8_string || + format != 8 || + nitems == 0) + { + if (val) + XFree (val); + return NULL; + } + + if (!g_utf8_validate (val, nitems, NULL)) + { + XFree (val); + return NULL; + } + + retval = g_strndup (val, nitems); + + XFree (val); + + return retval; +} + +/** + * na_tray_child_has_alpha; + * @child: a #NaTrayChild + * + * Checks if the child has an ARGB visual and real alpha transparence. + * (as opposed to faked alpha transparency with an parent-relative + * background) + * + * Return value: %TRUE if the child has an alpha transparency + */ +gboolean +na_tray_child_has_alpha (NaTrayChild *child) +{ + g_return_val_if_fail (NA_IS_TRAY_CHILD (child), FALSE); + + return child->has_alpha; +} + +/** + * na_tray_child_set_composited; + * @child: a #NaTrayChild + * @composited: %TRUE if the child's window should be redirected + * + * Sets whether the #GdkWindow of the child should be set redirected + * using gdk_window_set_composited(). By default this is based off of + * na_tray_child_has_alpha(), but it may be useful to override it in + * certain circumstances; for example, if the #NaTrayChild is added + * to a parent window and that parent window is composited against the + * background. + */ +void +na_tray_child_set_composited (NaTrayChild *child, + gboolean composited) +{ + g_return_if_fail (NA_IS_TRAY_CHILD (child)); + + if (child->composited == composited) + return; + + child->composited = composited; + if (GTK_WIDGET_REALIZED (child)) + gdk_window_set_composited (GTK_WIDGET (child)->window, composited); +} + +/* If we are faking transparency with a window-relative background, force a + * redraw of the icon. This should be called if the background changes or if + * the child is shifted with respect to the background. + */ +void +na_tray_child_force_redraw (NaTrayChild *child) +{ + GtkWidget *widget = GTK_WIDGET (child); + + if (GTK_WIDGET_MAPPED (child) && child->parent_relative_bg) + { +#if 1 + /* Sending an ExposeEvent might cause redraw problems if the + * icon is expecting the server to clear-to-background before + * the redraw. It should be ok for GtkStatusIcon or EggTrayIcon. + */ + Display *xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)); + XEvent xev; + + xev.xexpose.type = Expose; + xev.xexpose.window = GDK_WINDOW_XWINDOW (GTK_SOCKET (child)->plug_window); + xev.xexpose.x = 0; + xev.xexpose.y = 0; + xev.xexpose.width = widget->allocation.width; + xev.xexpose.height = widget->allocation.height; + xev.xexpose.count = 0; + + gdk_error_trap_push (); + XSendEvent (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)), + xev.xexpose.window, + False, ExposureMask, + &xev); + /* We have to sync to reliably catch errors from the XSendEvent(), + * since that is asynchronous. + */ + XSync (xdisplay, False); + gdk_error_trap_pop (); +#else + /* Hiding and showing is the safe way to do it, but can result in more + * flickering. + */ + gdk_window_hide (widget->window); + gdk_window_show (widget->window); +#endif + } +} diff --git a/gui/simple-greeter/libnotificationarea/na-tray-child.h b/gui/simple-greeter/libnotificationarea/na-tray-child.h new file mode 100644 index 0000000..c174abe --- /dev/null +++ b/gui/simple-greeter/libnotificationarea/na-tray-child.h @@ -0,0 +1,68 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* na-tray-child.h + * Copyright (C) 2002 Anders Carlsson + * Copyright (C) 2003-2006 Vincent Untz + * Copyright (C) 2008 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __NA_TRAY_CHILD_H__ +#define __NA_TRAY_CHILD_H__ + +#include +#include + +G_BEGIN_DECLS + +#define NA_TYPE_TRAY_CHILD (na_tray_child_get_type ()) +#define NA_TRAY_CHILD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NA_TYPE_TRAY_CHILD, NaTrayChild)) +#define NA_TRAY_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NA_TYPE_TRAY_CHILD, NaTrayChildClass)) +#define NA_IS_TRAY_CHILD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NA_TYPE_TRAY_CHILD)) +#define NA_IS_TRAY_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NA_TYPE_TRAY_CHILD)) +#define NA_TRAY_CHILD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NA_TYPE_TRAY_CHILD, NaTrayChildClass)) + +typedef struct _NaTrayChild NaTrayChild; +typedef struct _NaTrayChildClass NaTrayChildClass; +typedef struct _NaTrayChildChild NaTrayChildChild; + +struct _NaTrayChild +{ + GtkSocket parent_instance; + Window icon_window; + guint has_alpha : 1; + guint composited : 1; + guint parent_relative_bg : 1; +}; + +struct _NaTrayChildClass +{ + GtkSocketClass parent_class; +}; + +GType na_tray_child_get_type (void); + +GtkWidget *na_tray_child_new (GdkScreen *screen, + Window icon_window); +char *na_tray_child_get_title (NaTrayChild *child); +gboolean na_tray_child_has_alpha (NaTrayChild *child); +void na_tray_child_set_composited (NaTrayChild *child, + gboolean composited); +void na_tray_child_force_redraw (NaTrayChild *child); + +G_END_DECLS + +#endif /* __NA_TRAY_CHILD_H__ */ diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.c b/gui/simple-greeter/libnotificationarea/na-tray-manager.c index 4842a91..1bf54f1 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray-manager.c +++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.c @@ -252,120 +252,61 @@ static gboolean na_tray_manager_plug_removed (GtkSocket *socket, NaTrayManager *manager) { - Window *window; + NaTrayChild *child = NA_TRAY_CHILD (socket); - window = g_object_get_data (G_OBJECT (socket), "na-tray-child-window"); - - g_hash_table_remove (manager->socket_table, GINT_TO_POINTER (*window)); - g_object_set_data (G_OBJECT (socket), "na-tray-child-window", - NULL); - - g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, socket); + g_hash_table_remove (manager->socket_table, + GINT_TO_POINTER (child->icon_window)); + g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, child); /* This destroys the socket. */ return FALSE; } static void -na_tray_manager_make_socket_transparent (GtkWidget *widget, - gpointer user_data) +na_tray_manager_handle_dock_request (NaTrayManager *manager, + XClientMessageEvent *xevent) { - if (GTK_WIDGET_NO_WINDOW (widget)) - return; + Window icon_window = xevent->data.l[2]; + GtkWidget *child; - gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -} - -static gboolean -na_tray_manager_socket_exposed (GtkWidget *widget, - GdkEventExpose *event, - gpointer user_data) -{ - gdk_window_clear_area (widget->window, - event->area.x, event->area.y, - event->area.width, event->area.height); - return FALSE; -} + if (g_hash_table_lookup (manager->socket_table, + GINT_TO_POINTER (icon_window))) + { + /* We already got this notification earlier, ignore this one */ + return; + } -static void -na_tray_manager_socket_style_set (GtkWidget *widget, - GtkStyle *previous_style, - gpointer user_data) -{ - if (widget->window == NULL) + child = na_tray_child_new (manager->screen, icon_window); + if (child == NULL) /* already gone or other error */ return; - na_tray_manager_make_socket_transparent (widget, user_data); -} + g_signal_emit (manager, manager_signals[TRAY_ICON_ADDED], 0, + child); -static void -na_tray_manager_handle_dock_request (NaTrayManager *manager, - XClientMessageEvent *xevent) -{ - GtkWidget *socket; - Window *window; - GtkRequisition req; + /* If the child wasn't attached, then destroy it */ - if (g_hash_table_lookup (manager->socket_table, GINT_TO_POINTER (xevent->data.l[2]))) + if (!GTK_IS_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (child)))) { - /* We already got this notification earlier, ignore this one */ + gtk_widget_destroy (child); return; } - - socket = gtk_socket_new (); - - gtk_widget_set_app_paintable (socket, TRUE); - //FIXME: need to find a theme where this (and expose event) is needed - gtk_widget_set_double_buffered (socket, FALSE); - g_signal_connect (socket, "realize", - G_CALLBACK (na_tray_manager_make_socket_transparent), NULL); - g_signal_connect (socket, "expose_event", - G_CALLBACK (na_tray_manager_socket_exposed), NULL); - g_signal_connect_after (socket, "style_set", - G_CALLBACK (na_tray_manager_socket_style_set), NULL); - - /* We need to set the child window here - * so that the client can call _get functions - * in the signal handler - */ - window = g_new (Window, 1); - *window = xevent->data.l[2]; - - g_object_set_data_full (G_OBJECT (socket), - "na-tray-child-window", - window, g_free); - g_signal_emit (manager, manager_signals[TRAY_ICON_ADDED], 0, - socket); - /* Add the socket only if it's been attached */ - if (GTK_IS_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (socket)))) + g_signal_connect (child, "plug_removed", + G_CALLBACK (na_tray_manager_plug_removed), manager); + + gtk_socket_add_id (GTK_SOCKET (child), icon_window); + + if (!GTK_SOCKET (child)->plug_window) { - g_signal_connect (socket, "plug_removed", - G_CALLBACK (na_tray_manager_plug_removed), manager); - - gtk_socket_add_id (GTK_SOCKET (socket), *window); - - g_hash_table_insert (manager->socket_table, GINT_TO_POINTER (*window), socket); - - /* - * Make sure the icons have a meaningfull size ... - */ - req.width = req.height = 1; - gtk_widget_size_request (socket, &req); - /* - if ((req.width < 16) || (req.height < 16)) - { - gint nw = MAX (24, req.width); - gint nh = MAX (24, req.height); - g_warning (_("tray icon has requested a size of (%i x %i), resizing to (%i x %i)"), - req.width, req.height, nw, nh); - gtk_widget_set_size_request(icon, nw, nh); - } - */ - gtk_widget_show(socket); + /* Embedding failed, we won't get a plug-removed signal */ + g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, child); + gtk_widget_destroy (child); + return; } - else - gtk_widget_destroy (socket); + + g_hash_table_insert (manager->socket_table, + GINT_TO_POINTER (icon_window), child); + gtk_widget_show (child); } static void @@ -445,13 +386,13 @@ na_tray_manager_handle_begin_message (NaTrayManager *manager, /* Check if the same message is already in the queue and remove it if so */ for (p = manager->messages; p; p = p->next) { - PendingMessage *message = p->data; + PendingMessage *pmsg = p->data; - if (xevent->window == message->window && - xevent->data.l[4] == message->id) + if (xevent->window == pmsg->window && + xevent->data.l[4] == pmsg->id) { /* Hmm, we found it, now remove it */ - pending_message_free (message); + pending_message_free (pmsg); manager->messages = g_list_remove_link (manager->messages, p); g_list_free_1 (p); break; @@ -660,6 +601,58 @@ na_tray_manager_set_orientation_property (NaTrayManager *manager) #endif } +static void +na_tray_manager_set_visual_property (NaTrayManager *manager) +{ +#ifdef GDK_WINDOWING_X11 + GdkDisplay *display; + Visual *xvisual; + Atom visual_atom; + gulong data[1]; + + if (!manager->invisible || !manager->invisible->window) + return; + + /* The visual property is a hint to the tray icons as to what visual they + * should use for their windows. If the X server has RGBA colormaps, then + * we tell the tray icons to use a RGBA colormap and we'll composite the + * icon onto its parents with real transparency. Otherwise, we just tell + * the icon to use our colormap, and we'll do some hacks with parent + * relative backgrounds to simulate transparency. + */ + + display = gtk_widget_get_display (manager->invisible); + visual_atom = gdk_x11_get_xatom_by_name_for_display (display, + "_NET_SYSTEM_TRAY_VISUAL"); + + if (gdk_screen_get_rgba_visual (manager->screen) != NULL && + gdk_display_supports_composite (display)) + { + xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (manager->screen)); + } + else + { + /* We actually want the visual of the tray where the icons will + * be embedded. In almost all cases, this will be the same as the visual + * of the screen. + */ + GdkColormap *colormap; + + colormap = gdk_screen_get_default_colormap (manager->screen); + xvisual = GDK_VISUAL_XVISUAL (gdk_colormap_get_visual (colormap)); + } + + data[0] = XVisualIDFromVisual (xvisual); + + XChangeProperty (GDK_DISPLAY_XDISPLAY (display), + GDK_WINDOW_XWINDOW (manager->invisible->window), + visual_atom, + XA_VISUALID, 32, + PropModeReplace, + (guchar *) &data, 1); +#endif +} + #ifdef GDK_WINDOWING_X11 static gboolean @@ -682,6 +675,9 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager, if (na_tray_manager_check_running_screen_x11 (screen)) return FALSE; #endif + + manager->screen = screen; + display = gdk_screen_get_display (screen); xscreen = GDK_SCREEN_XSCREEN (screen); @@ -696,7 +692,11 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager, manager->selection_atom = gdk_atom_intern (selection_atom_name, FALSE); g_free (selection_atom_name); + manager->invisible = invisible; + g_object_ref (G_OBJECT (manager->invisible)); + na_tray_manager_set_orientation_property (manager); + na_tray_manager_set_visual_property (manager); timestamp = gdk_x11_get_server_time (invisible->window); @@ -728,9 +728,6 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager, RootWindowOfScreen (xscreen), False, StructureNotifyMask, (XEvent *)&xev); - manager->invisible = invisible; - g_object_ref (G_OBJECT (manager->invisible)); - opcode_atom = gdk_atom_intern ("_NET_SYSTEM_TRAY_OPCODE", FALSE); manager->opcode_atom = gdk_x11_atom_to_xatom_for_display (display, opcode_atom); @@ -761,6 +758,10 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager, else { gtk_widget_destroy (invisible); + g_object_unref (invisible); + manager->invisible = NULL; + + manager->screen = NULL; return FALSE; } @@ -819,67 +820,6 @@ na_tray_manager_check_running (GdkScreen *screen) #endif } -char * -na_tray_manager_get_child_title (NaTrayManager *manager, - NaTrayManagerChild *child) -{ - char *retval = NULL; -#ifdef GDK_WINDOWING_X11 - GdkDisplay *display; - Window *child_window; - Atom utf8_string, atom, type; - int result; - int format; - gulong nitems; - gulong bytes_after; - gchar *val; - - g_return_val_if_fail (NA_IS_TRAY_MANAGER (manager), NULL); - g_return_val_if_fail (GTK_IS_SOCKET (child), NULL); - - display = gdk_screen_get_display (manager->screen); - - child_window = g_object_get_data (G_OBJECT (child), - "na-tray-child-window"); - - utf8_string = gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"); - atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME"); - - gdk_error_trap_push (); - - result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), - *child_window, - atom, - 0, G_MAXLONG, - False, utf8_string, - &type, &format, &nitems, - &bytes_after, (guchar **)&val); - - if (gdk_error_trap_pop () || result != Success) - return NULL; - - if (type != utf8_string || - format != 8 || - nitems == 0) - { - if (val) - XFree (val); - return NULL; - } - - if (!g_utf8_validate (val, nitems, NULL)) - { - XFree (val); - return NULL; - } - - retval = g_strndup (val, nitems); - - XFree (val); -#endif - return retval; -} - void na_tray_manager_set_orientation (NaTrayManager *manager, GtkOrientation orientation) diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.h b/gui/simple-greeter/libnotificationarea/na-tray-manager.h index a1781a7..f325453 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray-manager.h +++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.h @@ -24,10 +24,12 @@ #ifndef __NA_TRAY_MANAGER_H__ #define __NA_TRAY_MANAGER_H__ -#include #ifdef GDK_WINDOWING_X11 #include #endif +#include + +#include "na-tray-child.h" G_BEGIN_DECLS @@ -40,7 +42,6 @@ G_BEGIN_DECLS typedef struct _NaTrayManager NaTrayManager; typedef struct _NaTrayManagerClass NaTrayManagerClass; -typedef struct _NaTrayManagerChild NaTrayManagerChild; struct _NaTrayManager { @@ -64,18 +65,18 @@ struct _NaTrayManagerClass GObjectClass parent_class; void (* tray_icon_added) (NaTrayManager *manager, - NaTrayManagerChild *child); + NaTrayChild *child); void (* tray_icon_removed) (NaTrayManager *manager, - NaTrayManagerChild *child); + NaTrayChild *child); void (* message_sent) (NaTrayManager *manager, - NaTrayManagerChild *child, + NaTrayChild *child, const gchar *message, glong id, glong timeout); void (* message_cancelled) (NaTrayManager *manager, - NaTrayManagerChild *child, + NaTrayChild *child, glong id); void (* lost_selection) (NaTrayManager *manager); @@ -87,8 +88,6 @@ gboolean na_tray_manager_check_running (GdkScreen *screen); NaTrayManager *na_tray_manager_new (void); gboolean na_tray_manager_manage_screen (NaTrayManager *manager, GdkScreen *screen); -char *na_tray_manager_get_child_title (NaTrayManager *manager, - NaTrayManagerChild *child); void na_tray_manager_set_orientation (NaTrayManager *manager, GtkOrientation orientation); GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager); diff --git a/gui/simple-greeter/libnotificationarea/na-tray.c b/gui/simple-greeter/libnotificationarea/na-tray.c index 7192717..051a811 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray.c +++ b/gui/simple-greeter/libnotificationarea/na-tray.c @@ -12,7 +12,7 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -26,7 +26,6 @@ #include "na-tray-manager.h" #include "fixedtip.h" -#include "obox.h" #include "na-tray.h" @@ -83,6 +82,27 @@ static TraysScreen *trays_screens = NULL; static void icon_tip_show_next (IconTip *icontip); +/* NaBox, an instantiable GtkBox */ + +typedef GtkBox NaBox; +typedef GtkBoxClass NaBoxClass; + +static GType na_box_get_type (void); + +G_DEFINE_TYPE (NaBox, na_box, GTK_TYPE_BOX) + +static void +na_box_init (NaBox *box) +{ +} + +static void +na_box_class_init (NaBoxClass *klass) +{ +} + +/* NaTray */ + G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN) static NaTray * @@ -115,7 +135,6 @@ tray_added (NaTrayManager *manager, gtk_box_pack_end (GTK_BOX (priv->box), icon, FALSE, FALSE, 0); gtk_widget_show (icon); - na_tray_force_redraw (tray); } static void @@ -131,8 +150,6 @@ tray_removed (NaTrayManager *manager, g_assert (tray->priv->trays_screen == trays_screen); - na_tray_force_redraw (tray); - g_hash_table_remove (trays_screen->icon_table, icon); /* this will also destroy the tip associated to this icon */ g_hash_table_remove (trays_screen->tip_table, icon); @@ -247,8 +264,9 @@ icon_tip_show_next (IconTip *icontip) icontip->id = buffer->id; if (buffer->timeout > 0) - icontip->source_id = g_timeout_add (buffer->timeout * 1000, - icon_tip_show_next_timeout, icontip); + icontip->source_id = g_timeout_add_seconds (buffer->timeout, + icon_tip_show_next_timeout, + icontip); icon_tip_buffer_free (buffer, NULL); } @@ -375,7 +393,7 @@ update_size_and_orientation (NaTray *tray) { NaTrayPrivate *priv = tray->priv; - na_obox_set_orientation (NA_OBOX (priv->box), priv->orientation); + gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), priv->orientation); /* This only happens when setting the property during object construction */ if (!priv->trays_screen) @@ -399,8 +417,38 @@ update_size_and_orientation (NaTray *tray) gtk_widget_set_size_request (priv->box, -1, MIN_BOX_SIZE); break; } +} - na_tray_force_redraw (tray); +/* Children with alpha channels have been set to be composited by calling + * gdk_window_set_composited(). We need to paint these children ourselves. + */ +static void +na_tray_expose_icon (GtkWidget *widget, + gpointer data) +{ + cairo_t *cr = data; + + if (na_tray_child_has_alpha (NA_TRAY_CHILD (widget))) + { + gdk_cairo_set_source_pixmap (cr, widget->window, + widget->allocation.x, + widget->allocation.y); + cairo_paint (cr); + } +} + +static void +na_tray_expose_box (GtkWidget *box, + GdkEventExpose *event) +{ + cairo_t *cr = gdk_cairo_create (box->window); + + gdk_cairo_region (cr, event->region); + cairo_clip (cr); + + gtk_container_foreach (GTK_CONTAINER (box), na_tray_expose_icon, cr); + + cairo_destroy (cr); } static void @@ -417,7 +465,9 @@ na_tray_init (NaTray *tray) gtk_container_add (GTK_CONTAINER (tray), priv->frame); gtk_widget_show (priv->frame); - priv->box = na_obox_new (); + priv->box = g_object_new (na_box_get_type (), NULL); + g_signal_connect (priv->box, "expose-event", + G_CALLBACK (na_tray_expose_box), tray); gtk_box_set_spacing (GTK_BOX (priv->box), ICON_SPACING); gtk_container_add (GTK_CONTAINER (priv->frame), priv->box); gtk_widget_show (priv->box); @@ -658,9 +708,9 @@ idle_redraw_cb (NaTray *tray) { NaTrayPrivate *priv = tray->priv; + gtk_container_foreach (GTK_CONTAINER (priv->box), (GtkCallback)na_tray_child_force_redraw, tray); + priv->idle_redraw_id = 0; - gtk_widget_hide (priv->box); - gtk_widget_show (priv->box); return FALSE; } @@ -671,8 +721,6 @@ na_tray_force_redraw (NaTray *tray) NaTrayPrivate *priv = tray->priv; /* Force the icons to redraw their backgrounds. - * gtk_widget_queue_draw() doesn't work across process boundaries, - * so we do this instead. */ if (priv->idle_redraw_id == 0) priv->idle_redraw_id = g_idle_add ((GSourceFunc) idle_redraw_cb, tray); diff --git a/gui/simple-greeter/libnotificationarea/na-tray.h b/gui/simple-greeter/libnotificationarea/na-tray.h index f67062b..57baddd 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray.h +++ b/gui/simple-greeter/libnotificationarea/na-tray.h @@ -24,10 +24,10 @@ #ifndef __NA_TRAY_H__ #define __NA_TRAY_H__ -#include #ifdef GDK_WINDOWING_X11 #include #endif +#include G_BEGIN_DECLS @@ -41,7 +41,6 @@ G_BEGIN_DECLS typedef struct _NaTray NaTray; typedef struct _NaTrayPrivate NaTrayPrivate; typedef struct _NaTrayClass NaTrayClass; -typedef struct _NaTrayChild NaTrayChild; struct _NaTray { diff --git a/gui/simple-greeter/libnotificationarea/testtray.c b/gui/simple-greeter/libnotificationarea/testtray.c index 42d3732..c0300b6 100644 --- a/gui/simple-greeter/libnotificationarea/testtray.c +++ b/gui/simple-greeter/libnotificationarea/testtray.c @@ -66,7 +66,7 @@ static void tray_added_cb (GtkContainer *box, GtkWidget *icon, TrayData *data) { g_print ("[Screen %u tray %p] Child %p added to tray: \"%s\"\n", - data->screen_num, data->tray, icon, "XXX");//na_tray_manager_get_child_title (manager, icon)); + data->screen_num, data->tray, icon, "XXX");//na_tray_child_get_title (icon)); update_child_count (data); } -- 1.6.5.rc2 >From b2bd208cd0057e25b0aac380d519376b243537e0 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 22 Oct 2009 22:07:52 -0400 Subject: [PATCH 2/4] Add ordering patch to na-tray This makes sure system utilities come up in the right order. --- .../libnotificationarea/na-tray-child.c | 81 ++++++++++++++++++ .../libnotificationarea/na-tray-child.h | 5 +- gui/simple-greeter/libnotificationarea/na-tray.c | 89 +++++++++++++++++++- 3 files changed, 172 insertions(+), 3 deletions(-) diff --git a/gui/simple-greeter/libnotificationarea/na-tray-child.c b/gui/simple-greeter/libnotificationarea/na-tray-child.c index c7e3f61..98769bd 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray-child.c +++ b/gui/simple-greeter/libnotificationarea/na-tray-child.c @@ -428,3 +428,84 @@ na_tray_child_force_redraw (NaTrayChild *child) #endif } } + + +/* from libwnck xutils.c */ +static char * +latin1_to_utf8 (const char *latin1) +{ + GString *str; + const char *p; + + str = g_string_new (NULL); + + p = latin1; + while (*p) + { + g_string_append_unichar (str, (gunichar) *p); + ++p; + } + + return g_string_free (str, FALSE); +} + +/* derived from libwnck xutils.c */ +static void +_get_wmclass (Display *xdisplay, + Window xwindow, + char **res_class, + char **res_name) +{ + XClassHint ch; + char *retval; + + gdk_error_trap_push (); + + ch.res_name = NULL; + ch.res_class = NULL; + + XGetClassHint (xdisplay, xwindow, &ch); + + gdk_error_trap_pop (); + + retval = NULL; + + if (res_class) + *res_class = NULL; + + if (res_name) + *res_name = NULL; + + if (ch.res_name) + { + if (res_name) + *res_name = latin1_to_utf8 (ch.res_name); + + XFree (ch.res_name); + } + + if (ch.res_class) + { + if (res_class) + *res_class = latin1_to_utf8 (ch.res_class); + + XFree (ch.res_class); + } +} + +void +na_tray_child_get_wm_class (NaTrayChild *child, + char **res_name, + char **res_class) +{ + GdkDisplay *display; + + g_return_if_fail (NA_IS_TRAY_CHILD (child)); + + display = gtk_widget_get_display (GTK_WIDGET (child)); + + _get_wmclass (GDK_DISPLAY_XDISPLAY (display), + child->icon_window, + res_class, + res_name); +} diff --git a/gui/simple-greeter/libnotificationarea/na-tray-child.h b/gui/simple-greeter/libnotificationarea/na-tray-child.h index c174abe..ff036a7 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray-child.h +++ b/gui/simple-greeter/libnotificationarea/na-tray-child.h @@ -61,7 +61,10 @@ char *na_tray_child_get_title (NaTrayChild *child); gboolean na_tray_child_has_alpha (NaTrayChild *child); void na_tray_child_set_composited (NaTrayChild *child, gboolean composited); -void na_tray_child_force_redraw (NaTrayChild *child); +void na_tray_child_force_redraw (NaTrayChild *child); +void na_tray_child_get_wm_class (NaTrayChild *child, + char **res_name, + char **res_class); G_END_DECLS diff --git a/gui/simple-greeter/libnotificationarea/na-tray.c b/gui/simple-greeter/libnotificationarea/na-tray.c index 051a811..3bd1258 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray.c +++ b/gui/simple-greeter/libnotificationarea/na-tray.c @@ -114,6 +114,51 @@ get_tray (TraysScreen *trays_screen) return trays_screen->all_trays->data; } +const char *roles[] = { + "keyboard", + "volume", + "bluetooth", + "network", + "battery", + NULL +}; + +const char *wmclass_roles[] = { + "Bluetooth-applet", "bluetooth", + "Gnome-volume-control-applet", "volume", + "Nm-applet", "network", + "Gnome-power-manager", "battery", + NULL, +}; + +static const char * +find_role (const char *wmclass) +{ + int i; + + for (i = 0; wmclass_roles[i]; i += 2) + { + if (strcmp (wmclass, wmclass_roles[i]) == 0) + return wmclass_roles[i + 1]; + } + + return NULL; +} + +static int +find_role_pos (const char *role) +{ + int i; + + for (i = 0; roles[i]; i++) + { + if (strcmp (role, roles[i]) == 0) + break; + } + + return i + 1; +} + static void tray_added (NaTrayManager *manager, GtkWidget *icon, @@ -121,6 +166,11 @@ tray_added (NaTrayManager *manager, { NaTray *tray; NaTrayPrivate *priv; + GList *l, *children; + int position; + char *class_a; + const char *role; + int role_position; tray = get_tray (trays_screen); if (tray == NULL) @@ -129,10 +179,45 @@ tray_added (NaTrayManager *manager, priv = tray->priv; g_assert (priv->trays_screen == trays_screen); - + g_hash_table_insert (trays_screen->icon_table, icon, tray); - gtk_box_pack_end (GTK_BOX (priv->box), icon, FALSE, FALSE, 0); + position = 0; + + class_a = NULL; + na_tray_child_get_wm_class (NA_TRAY_CHILD (icon), NULL, &class_a); + if (!class_a) + goto insert; + + role = find_role (class_a); + g_free (class_a); + if (!role) + goto insert; + + role_position = find_role_pos (role); + g_object_set_data (G_OBJECT (icon), "role-position", GINT_TO_POINTER (role_position)); + + children = gtk_container_get_children (GTK_CONTAINER (priv->box)); + for (l = g_list_last (children); l; l = l->prev) + { + GtkWidget *child = l->data; + gint rp; + + rp = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (child), "role-position")); + if (rp == 0 || rp < role_position) + { + position = g_list_index (children, child) + 1; + break; + } + } + g_list_free (children); + + if (position < 0) + position = 0; + +insert: + gtk_box_pack_start (GTK_BOX (priv->box), icon, FALSE, FALSE, 0); + gtk_box_reorder_child (GTK_BOX (priv->box), icon, position); gtk_widget_show (icon); } -- 1.6.5.rc2 >From ab7c74cca138c404338ebaf3ee3c1e3f6e92f083 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 22 Oct 2009 22:08:18 -0400 Subject: [PATCH 3/4] Add the ability to have padding between icons in tray --- .../libnotificationarea/na-tray-manager.c | 41 ++++++++++++++++++++ .../libnotificationarea/na-tray-manager.h | 3 + gui/simple-greeter/libnotificationarea/na-tray.c | 12 ++++++ gui/simple-greeter/libnotificationarea/na-tray.h | 2 + 4 files changed, 58 insertions(+), 0 deletions(-) diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.c b/gui/simple-greeter/libnotificationarea/na-tray-manager.c index 1bf54f1..d49c646 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray-manager.c +++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.c @@ -653,6 +653,32 @@ na_tray_manager_set_visual_property (NaTrayManager *manager) #endif } +static void +na_tray_manager_set_padding_property (NaTrayManager *manager) +{ +#ifdef GDK_WINDOWING_X11 + GdkDisplay *display; + Atom orientation_atom; + gulong data[1]; + + if (!manager->invisible || !manager->invisible->window) + return; + + display = gtk_widget_get_display (manager->invisible); + orientation_atom = gdk_x11_get_xatom_by_name_for_display (display, + "_NET_SYSTEM_TRAY_PADDING"); + + data[0] = manager->padding; + + XChangeProperty (GDK_DISPLAY_XDISPLAY (display), + GDK_WINDOW_XWINDOW (manager->invisible->window), + orientation_atom, + XA_CARDINAL, 32, + PropModeReplace, + (guchar *) &data, 1); +#endif +} + #ifdef GDK_WINDOWING_X11 static gboolean @@ -697,6 +723,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager, na_tray_manager_set_orientation_property (manager); na_tray_manager_set_visual_property (manager); + na_tray_manager_set_padding_property (manager); timestamp = gdk_x11_get_server_time (invisible->window); @@ -836,6 +863,20 @@ na_tray_manager_set_orientation (NaTrayManager *manager, } } +void +na_tray_manager_set_padding (NaTrayManager *manager, + gint padding) +{ + g_return_if_fail (NA_IS_TRAY_MANAGER (manager)); + + if (manager->padding != padding) + { + manager->padding = padding; + + na_tray_manager_set_padding_property (manager); + } +} + GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager) { diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.h b/gui/simple-greeter/libnotificationarea/na-tray-manager.h index f325453..e93882e 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray-manager.h +++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.h @@ -55,6 +55,7 @@ struct _NaTrayManager GtkWidget *invisible; GdkScreen *screen; GtkOrientation orientation; + gint padding; GList *messages; GHashTable *socket_table; @@ -91,6 +92,8 @@ gboolean na_tray_manager_manage_screen (NaTrayManager *manager, void na_tray_manager_set_orientation (NaTrayManager *manager, GtkOrientation orientation); GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager); +void na_tray_manager_set_padding (NaTrayManager *manager, + gint padding); G_END_DECLS diff --git a/gui/simple-greeter/libnotificationarea/na-tray.c b/gui/simple-greeter/libnotificationarea/na-tray.c index 3bd1258..40845c1 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray.c +++ b/gui/simple-greeter/libnotificationarea/na-tray.c @@ -599,6 +599,8 @@ na_tray_constructor (GType type, { trays_screens [screen_number].tray_manager = tray_manager; + na_tray_manager_set_padding (tray_manager, 0); + g_signal_connect (tray_manager, "tray_icon_added", G_CALLBACK (tray_added), &trays_screens [screen_number]); @@ -801,6 +803,16 @@ idle_redraw_cb (NaTray *tray) } void +na_tray_set_padding (NaTray *tray, + gint padding) +{ + NaTrayPrivate *priv = tray->priv; + + if (get_tray (priv->trays_screen) == tray) + na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding); +} + +void na_tray_force_redraw (NaTray *tray) { NaTrayPrivate *priv = tray->priv; diff --git a/gui/simple-greeter/libnotificationarea/na-tray.h b/gui/simple-greeter/libnotificationarea/na-tray.h index 57baddd..1ead20f 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray.h +++ b/gui/simple-greeter/libnotificationarea/na-tray.h @@ -60,6 +60,8 @@ NaTray *na_tray_new_for_screen (GdkScreen *screen, void na_tray_set_orientation (NaTray *tray, GtkOrientation orientation); GtkOrientation na_tray_get_orientation (NaTray *tray); +void na_tray_set_padding (NaTray *tray, + gint padding); void na_tray_force_redraw (NaTray *tray); G_END_DECLS -- 1.6.5.rc2 >From 050879701489074492a35b0427f0ac7cf21ebf82 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 22 Oct 2009 22:13:58 -0400 Subject: [PATCH 4/4] Read padding from notification area applet and use it. --- gui/simple-greeter/gdm-greeter-panel.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c index 03c4122..43b91d5 100644 --- a/gui/simple-greeter/gdm-greeter-panel.c +++ b/gui/simple-greeter/gdm-greeter-panel.c @@ -65,6 +65,7 @@ #define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement" #define KEY_DISABLE_RESTART_BUTTONS "/apps/gdm/simple-greeter/disable_restart_buttons" +#define KEY_NOTIFICATION_AREA_PADDING "/apps/notification_area_applet/prefs/padding" #define GDM_GREETER_PANEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_PANEL, GdmGreeterPanelPrivate)) @@ -824,6 +825,7 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) { NaTray *tray; GtkWidget *spacer; + int padding; gdm_profile_start (NULL); @@ -955,6 +957,9 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)), GTK_ORIENTATION_HORIZONTAL); + + padding = gconf_client_get_int (panel->priv->client, KEY_NOTIFICATION_AREA_PADDING, NULL); + na_tray_set_padding (tray, padding); gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (tray), FALSE, FALSE, 6); gtk_widget_show (GTK_WIDGET (tray)); gdm_greeter_panel_hide_user_options (panel); -- 1.6.5.rc2 fix-run-dir-permissions.patch: b/configure.ac | 17 +++++++++++++++++ b/daemon/Makefile.am | 1 + b/daemon/gdm-display-access-file.c | 14 +++++++------- b/daemon/gdm-greeter-session.c | 1 + b/daemon/gdm-welcome-session.c | 33 ++++++++++++++++++++++++++++++++- b/data/Makefile.am | 8 ++++++++ b/utils/Makefile.am | 1 + b/utils/gdm-screenshot.c | 6 +----- configure.ac | 3 +-- data/Makefile.am | 3 +-- 10 files changed, 70 insertions(+), 17 deletions(-) --- NEW FILE fix-run-dir-permissions.patch --- >From 5475c0a823cf94f817821105b40760d902d9ace5 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 27 Oct 2009 10:40:55 -0400 Subject: [PATCH 1/4] Make screenshot dir a configure argument This provides a little more flexibility to distributors, but more importantly makes it less hard coded in gdm-screenshot.c --- configure.ac | 17 +++++++++++++++++ data/Makefile.am | 8 ++++++++ utils/Makefile.am | 1 + utils/gdm-screenshot.c | 5 +---- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 4fe4430..0dd2658 100644 --- a/configure.ac +++ b/configure.ac @@ -1237,6 +1237,23 @@ fi AC_SUBST(GDM_XAUTH_DIR) dnl --------------------------------------------------------------------------- +dnl - Directory for greeter screenshot +dnl --------------------------------------------------------------------------- + +AC_ARG_WITH(screenshot-dir, + AS_HELP_STRING([--with-screenshot-dir=], + [directory to store greeter screenshot])) + +if ! test -z "$with_screenshot_dir"; then + GDM_SCREENSHOT_DIR=$with_screenshot_dir +else + GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm +fi + +AC_SUBST(GDM_SCREENSHOT_DIR) + + +dnl --------------------------------------------------------------------------- dnl - Finish dnl --------------------------------------------------------------------------- diff --git a/data/Makefile.am b/data/Makefile.am index 73fa106..608194d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -13,6 +13,7 @@ predir = $(gdmconfdir)/PreSession postlogindir = $(gdmconfdir)/PostLogin workingdir = $(GDM_WORKING_DIR) xauthdir = $(GDM_XAUTH_DIR) +screenshotdir = $(GDM_SCREENSHOT_DIR) cachedir = $(localstatedir)/cache/gdm Xsession: $(srcdir)/Xsession.in @@ -123,6 +124,7 @@ uninstall-hook: -rf \ $(DESTDIR)$(workingdir)/.gconf.mandatory \ $(DESTDIR)$(xauthdir) + $(DESTDIR)$(screenshotdir) install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path if test '!' -d $(DESTDIR)$(gdmconfdir); then \ @@ -204,6 +206,12 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa chown root:gdm $(DESTDIR)$(xauthdir) || : ; \ fi + if test '!' -d $(DESTDIR)$(screenshotdir); then \ + $(mkinstalldirs) $(DESTDIR)$(screenshotdir); \ + chmod 0755 $(DESTDIR)$(screenshotdir); \ + chown gdm:gdm $(DESTDIR)$(screenshotdir) || : ; \ + fi + if test '!' -d $(DESTDIR)$(workingdir); then \ $(mkinstalldirs) $(DESTDIR)$(workingdir); \ chmod 1770 $(DESTDIR)$(workingdir); \ diff --git a/utils/Makefile.am b/utils/Makefile.am index 0b6ea04..f1ff331 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I. \ -I.. \ -DLOCALSTATEDIR=\""$(localstatedir)"\" \ + -DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ $(UTILS_CFLAGS) \ $(CANBERRA_GTK_CFLAGS) \ diff --git a/utils/gdm-screenshot.c b/utils/gdm-screenshot.c index f66de46..12102f2 100644 --- a/utils/gdm-screenshot.c +++ b/utils/gdm-screenshot.c @@ -163,11 +163,8 @@ screenshot_save (GdkPixbuf *pixbuf) char *filename; gboolean res; GError *error; - const char *save_dir; - save_dir = LOCALSTATEDIR "/run/gdm"; - - filename = g_build_filename (save_dir, + filename = g_build_filename (GDM_SCREENSHOT_DIR, "GDM-Screenshot.png", NULL); -- 1.6.5.1 >From 1fe51c8f69dc93033d2035c27389377090f21b78 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 27 Oct 2009 11:25:19 -0400 Subject: [PATCH 2/4] Create screenshot dir at runtime if not available We want the screenshot dir to be owned by the GDM user, so the greeter can write screenshots to it. --- daemon/Makefile.am | 1 + daemon/gdm-greeter-session.c | 1 + daemon/gdm-welcome-session.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index a122a15..ab10dc5 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -15,6 +15,7 @@ AM_CPPFLAGS = \ -DSBINDIR=\"$(sbindir)\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \ + -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ -DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \ $(DISABLE_DEPRECATED_CFLAGS) \ diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c index aae1928..994acbc 100644 --- a/daemon/gdm-greeter-session.c +++ b/daemon/gdm-greeter-session.c @@ -156,6 +156,7 @@ gdm_greeter_session_new (const char *display_name, "x11-display-device", display_device, "x11-display-hostname", display_hostname, "x11-display-is-local", display_is_local, + "runtime-dir", GDM_SCREENSHOT_DIR, NULL); return GDM_GREETER_SESSION (object); diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c index b58e855..f340660 100644 --- a/daemon/gdm-welcome-session.c +++ b/daemon/gdm-welcome-session.c @@ -63,6 +63,7 @@ struct GdmWelcomeSessionPrivate char *user_name; char *group_name; + char *runtime_dir; char *x11_display_name; char *x11_display_device; @@ -91,6 +92,7 @@ enum { PROP_X11_DISPLAY_IS_LOCAL, PROP_USER_NAME, PROP_GROUP_NAME, + PROP_RUNTIME_DIR, PROP_SERVER_ADDRESS, PROP_COMMAND, PROP_SERVER_DBUS_PATH, @@ -408,6 +410,7 @@ rotate_logs (const char *path, typedef struct { const char *user_name; const char *group_name; + const char *runtime_dir; const char *log_file; } SpawnChildData; @@ -435,6 +438,10 @@ spawn_child_setup (SpawnChildData *data) _exit (1); } + g_debug ("GdmWelcomeSession: Setting up run time dir %s", data->runtime_dir); + g_mkdir (data->runtime_dir, 0755); + chown (data->runtime_dir, pwent->pw_uid, pwent->pw_gid); + g_debug ("GdmWelcomeSession: Changing (uid:gid) for child process to (%d:%d)", pwent->pw_uid, grent->gr_gid); @@ -552,6 +559,7 @@ static gboolean spawn_command_line_async_as_user (const char *command_line, const char *user_name, const char *group_name, + const char *runtime_dir, const char *log_file, char **env, GPid *child_pid, @@ -575,6 +583,7 @@ spawn_command_line_async_as_user (const char *command_line, data.user_name = user_name; data.group_name = group_name; + data.runtime_dir = runtime_dir; data.log_file = log_file; local_error = NULL; @@ -756,6 +765,7 @@ gdm_welcome_session_spawn (GdmWelcomeSession *welcome_session) ret = spawn_command_line_async_as_user (welcome_session->priv->command, welcome_session->priv->user_name, welcome_session->priv->group_name, + welcome_session->priv->runtime_dir, log_path, (char **)env->pdata, &welcome_session->priv->pid, @@ -928,6 +938,14 @@ _gdm_welcome_session_set_group_name (GdmWelcomeSession *welcome_session, } static void +_gdm_welcome_session_set_runtime_dir (GdmWelcomeSession *welcome_session, + const char *dir) +{ + g_free (welcome_session->priv->runtime_dir); + welcome_session->priv->runtime_dir = g_strdup (dir); +} + +static void _gdm_welcome_session_set_server_dbus_path (GdmWelcomeSession *welcome_session, const char *name) { @@ -998,6 +1016,9 @@ gdm_welcome_session_set_property (GObject *object, case PROP_GROUP_NAME: _gdm_welcome_session_set_group_name (self, g_value_get_string (value)); break; + case PROP_RUNTIME_DIR: + _gdm_welcome_session_set_runtime_dir (self, g_value_get_string (value)); + break; case PROP_SERVER_ADDRESS: gdm_welcome_session_set_server_address (self, g_value_get_string (value)); break; @@ -1054,6 +1075,9 @@ gdm_welcome_session_get_property (GObject *object, case PROP_GROUP_NAME: g_value_set_string (value, self->priv->group_name); break; + case PROP_RUNTIME_DIR: + g_value_set_string (value, self->priv->runtime_dir); + break; case PROP_SERVER_ADDRESS: g_value_set_string (value, self->priv->server_address); break; @@ -1154,6 +1178,13 @@ gdm_welcome_session_class_init (GdmWelcomeSessionClass *klass) GDM_GROUPNAME, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property (object_class, + PROP_RUNTIME_DIR, + g_param_spec_string ("runtime-dir", + "runtime dir", + "runtime dir", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, PROP_SERVER_ADDRESS, g_param_spec_string ("server-address", "server address", @@ -1267,6 +1298,7 @@ gdm_welcome_session_finalize (GObject *object) g_free (welcome_session->priv->command); g_free (welcome_session->priv->user_name); g_free (welcome_session->priv->group_name); + g_free (welcome_session->priv->runtime_dir); g_free (welcome_session->priv->x11_display_name); g_free (welcome_session->priv->x11_display_device); g_free (welcome_session->priv->x11_display_hostname); -- 1.6.5.1 >From 81870b019c929694ea392359b0a66b0a500c7d5c Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 27 Oct 2009 11:43:15 -0400 Subject: [PATCH 3/4] Move default screenshot dir to it's own subdirectory --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 0dd2658..93917e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1247,7 +1247,7 @@ AC_ARG_WITH(screenshot-dir, if ! test -z "$with_screenshot_dir"; then GDM_SCREENSHOT_DIR=$with_screenshot_dir else - GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm + GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter fi AC_SUBST(GDM_SCREENSHOT_DIR) -- 1.6.5.1 >From c96697431529ed87dbdbb987ed92ac2286b247b7 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 27 Oct 2009 10:35:37 -0400 Subject: [PATCH 4/4] Lock down /var/run/gdm We don't need it so open now that screenshots are written to their own directory, and having it open has implications for quota abuse. --- daemon/gdm-display-access-file.c | 14 +++++++------- data/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c index a3d3e2f..1b52f15 100644 --- a/daemon/gdm-display-access-file.c +++ b/daemon/gdm-display-access-file.c @@ -268,10 +268,10 @@ _create_xauth_file_for_user (const char *username, fp = NULL; fd = -1; - /* Create directory if not exist, then set permission 01775 and ownership root:gdm */ + /* Create directory if not exist, then set permission 0711 and ownership root:gdm */ if (g_file_test (GDM_XAUTH_DIR, G_FILE_TEST_IS_DIR) == FALSE) { g_unlink (GDM_XAUTH_DIR); - if (g_mkdir (GDM_XAUTH_DIR, S_ISVTX | S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) { + if (g_mkdir (GDM_XAUTH_DIR, 0711) != 0) { g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), @@ -279,15 +279,15 @@ _create_xauth_file_for_user (const char *username, goto out; } - g_chmod (GDM_XAUTH_DIR, S_ISVTX | S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); + g_chmod (GDM_XAUTH_DIR, 0711); _get_uid_and_gid_for_user (GDM_USERNAME, &uid, &gid); if (chown (GDM_XAUTH_DIR, 0, gid) != 0) { g_warning ("Unable to change owner of '%s'", GDM_XAUTH_DIR); } } else { - /* if it does exist make sure it has correct mode 01775 */ - g_chmod (GDM_XAUTH_DIR, S_ISVTX | S_IRWXU |S_IRWXG | S_IROTH | S_IXOTH); + /* if it does exist make sure it has correct mode 0711 */ + g_chmod (GDM_XAUTH_DIR, 0711); /* and clean up any stale auth subdirs */ clean_up_stale_auth_subdirs (); @@ -368,8 +368,8 @@ _create_xauth_file_for_user (const char *username, } /* now open up permissions on per-session directory */ - g_debug ("GdmDisplayAccessFile: chmoding %s to 1777", dir_name); - g_chmod (dir_name, S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO); + g_debug ("GdmDisplayAccessFile: chmoding %s to 0711", dir_name); + g_chmod (dir_name, 0711); errno = 0; fp = fdopen (fd, "w"); diff --git a/data/Makefile.am b/data/Makefile.am index 608194d..dfbd096 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -202,7 +202,7 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa if test '!' -d $(DESTDIR)$(xauthdir); then \ $(mkinstalldirs) $(DESTDIR)$(xauthdir); \ - chmod 1777 $(DESTDIR)$(xauthdir); \ + chmod 0711 $(DESTDIR)$(xauthdir); \ chown root:gdm $(DESTDIR)$(xauthdir) || : ; \ fi -- 1.6.5.1 fix-timer.patch: b/gui/simple-greeter/gdm-cell-renderer-timer.c | 13 ++----------- gui/simple-greeter/gdm-cell-renderer-timer.c | 2 -- 2 files changed, 2 insertions(+), 13 deletions(-) --- NEW FILE fix-timer.patch --- >From 88d4e5d79ca5ded0f9e88af67044d53342ff0897 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 22 Oct 2009 17:39:27 -0400 Subject: [PATCH 1/2] Force cell renderer to be a specific height Before it was growing and shrinking all the time causing, flicker. --- gui/simple-greeter/gdm-cell-renderer-timer.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/gui/simple-greeter/gdm-cell-renderer-timer.c b/gui/simple-greeter/gdm-cell-renderer-timer.c index 7918b48..9453d7e 100644 --- a/gui/simple-greeter/gdm-cell-renderer-timer.c +++ b/gui/simple-greeter/gdm-cell-renderer-timer.c @@ -108,19 +108,11 @@ gdm_cell_renderer_timer_get_size (GtkCellRenderer *cell, } if (width != NULL) { - if (cell->width >= 0) { - *width = cell->width; - } else { - *width = renderer->priv->value <= G_MINDOUBLE? 0 : 64; - } + *width = cell->xpad * 2 + 24; } if (height != NULL) { - if (cell->height >= 0) { - *height = cell->height; - } else { - *height = renderer->priv->value <= G_MINDOUBLE? 0 : 64; - } + *height = cell->ypad * 2 + 24; } } -- 1.6.5.rc2 >From a87b05fac2c2de7cff80a183e397f33416bfc893 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 22 Oct 2009 17:45:13 -0400 Subject: [PATCH 2/2] Drop set_operator (SOURCE) in cell renderer I'm not sure why I was doing it, when it looks find using OVER, so I'm going to take it out. --- gui/simple-greeter/gdm-cell-renderer-timer.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/gui/simple-greeter/gdm-cell-renderer-timer.c b/gui/simple-greeter/gdm-cell-renderer-timer.c index 9453d7e..0fb404c 100644 --- a/gui/simple-greeter/gdm-cell-renderer-timer.c +++ b/gui/simple-greeter/gdm-cell-renderer-timer.c @@ -164,7 +164,6 @@ draw_timer (GdmCellRendererTimer *renderer, cairo_arc (context, 0, 0, radius + 1, 0, 2 * G_PI); cairo_fill (context); - cairo_set_operator (context, CAIRO_OPERATOR_SOURCE); cairo_set_source_rgb (context, bg->red / 65535.0, bg->green / 65535.0, -- 1.6.5.rc2 gdm-2.28.1-move-shutdown-functions.patch: b/gui/simple-greeter/Makefile.am | 2 b/gui/simple-greeter/gdm-greeter-login-window.c | 294 -------------------- b/gui/simple-greeter/gdm-greeter-login-window.glade | 194 ------------- b/gui/simple-greeter/gdm-greeter-panel.c | 263 +++++++++++++++++ b/gui/simple-greeter/gdm-greeter-panel.h | 3 b/gui/simple-greeter/gdm-greeter-session.c | 4 b/gui/simple-greeter/test-greeter-panel.c | 3 gui/simple-greeter/gdm-greeter-panel.c | 103 +++++-- 8 files changed, 346 insertions(+), 520 deletions(-) --- NEW FILE gdm-2.28.1-move-shutdown-functions.patch --- commit 7b3be6884096a2d21af3c6c26090641c16988b15 Merge: f0a0955 4c20614 Author: Ray Strode Date: Tue Oct 20 17:56:09 2009 -0400 Move Shutdown functions to panel instead of login window Robert Ancell gives a good rationale for the move: "In GDM 2.28/master on startup the user is presented with a window containing: - A list of users to log in as with the first user selected - Two buttons, restart and shutdown, below the user list Since the first user is selected, users who are unfamiliar/not paying close attention sometimes click on the shutdown button as this is placed where the default action (in this case login) is conventionally placed (the lower right hand corner of the window). The penalty of making this mistake is for the computer to shut down immediately with no chance of aborting this mistake. An additional mistake users can make is to miss clicking on their user and then click on the shutdown button (as this button is replaced with the login button after selecting a user). Recommended behaviour: Move the shutdown actions (shutdown, sleep, hibernate, restart) to a menu on the GDM panel. The shutdown buttons do not need to be prominently located as: - They are used less frequently than the login buttons (normal operation is to shutdown from within your session). - Most hardware has a dedicated power button that performs the same action - It is better to have them in a location where they are less likely to be accidentally activated" (see https://bugs.gnome.org/596151) >From e53b45310bc0b83ab14fdfde1cac6e6ea22d82b7 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 24 Sep 2009 15:51:10 +1000 Subject: [PATCH 1/3] Move shutdown buttons to menu in panel (Bug #596151) --- gui/simple-greeter/Makefile.am | 2 +- gui/simple-greeter/gdm-greeter-login-window.c | 294 --------------------- gui/simple-greeter/gdm-greeter-login-window.glade | 194 -------------- gui/simple-greeter/gdm-greeter-panel.c | 263 ++++++++++++++++++- gui/simple-greeter/gdm-greeter-panel.h | 3 +- gui/simple-greeter/gdm-greeter-session.c | 4 +- gui/simple-greeter/test-greeter-panel.c | 2 +- 7 files changed, 267 insertions(+), 495 deletions(-) diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am index 4c06bc3..519e652 100644 --- a/gui/simple-greeter/Makefile.am +++ b/gui/simple-greeter/Makefile.am @@ -92,7 +92,6 @@ test_greeter_login_window_LDADD = \ libgdmuser.la \ $(COMMON_LIBS) \ $(SIMPLE_GREETER_LIBS) \ - $(DEVKIT_POWER_LIBS) \ $(RBAC_LIBS) \ $(NULL) @@ -144,6 +143,7 @@ test_greeter_panel_LDADD = \ $(GTK_LIBS) \ $(GCONF_LIBS) \ $(LIBXKLAVIER_LIBS) \ + $(DEVKIT_POWER_LIBS) \ $(NULL) test_remote_login_window_SOURCES = \ diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c index 10a5132..9a29a2e 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -34,11 +34,6 @@ #include #include -#ifdef ENABLE_RBAC_SHUTDOWN -#include -#include -#endif - #include #include #include @@ -56,10 +51,6 @@ #include #include -#ifdef HAVE_DEVICEKIT_POWER -#include -#endif - #include "gdm-settings-client.h" #include "gdm-settings-keys.h" #include "gdm-profile.h" @@ -90,7 +81,6 @@ #define KEY_BANNER_MESSAGE_TEXT KEY_GREETER_DIR "/banner_message_text" #define KEY_BANNER_MESSAGE_TEXT_NOCHOOSER KEY_GREETER_DIR "/banner_message_text_nochooser" #define KEY_LOGO KEY_GREETER_DIR "/logo_icon_name" -#define KEY_DISABLE_RESTART_BUTTONS KEY_GREETER_DIR "/disable_restart_buttons" #define GDM_GREETER_LOGIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_LOGIN_WINDOW, GdmGreeterLoginWindowPrivate)) enum { @@ -125,8 +115,6 @@ struct GdmGreeterLoginWindowPrivate char *timed_login_username; guint timed_login_timeout_id; - guint sensitize_power_buttons_timeout_id; - guint login_button_handler_id; guint start_session_handler_id; }; @@ -353,37 +341,6 @@ sensitize_widget (GdmGreeterLoginWindow *login_window, } } -static gboolean -get_show_restart_buttons (GdmGreeterLoginWindow *login_window) -{ - gboolean show; - GError *error; - - error = NULL; - show = ! gconf_client_get_bool (login_window->priv->client, KEY_DISABLE_RESTART_BUTTONS, &error); - if (error != NULL) { - g_debug ("GdmGreeterLoginWindow: unable to get disable-restart-buttons configuration: %s", error->message); - g_error_free (error); - } - -#ifdef ENABLE_RBAC_SHUTDOWN - { - char *username; - - username = g_get_user_name (); - if (username == NULL || !chkauthattr (RBAC_SHUTDOWN_KEY, username)) { - show = FALSE; - g_debug ("GdmGreeterLoginWindow: Not showing stop/restart buttons for user %s due to RBAC key %s", - username, RBAC_SHUTDOWN_KEY); - } else { - g_debug ("GdmGreeterLoginWindow: Showing stop/restart buttons for user %s due to RBAC key %s", - username, RBAC_SHUTDOWN_KEY); - } - } -#endif - return show; -} - static void on_login_button_clicked_answer_query (GtkButton *button, GdmGreeterLoginWindow *login_window) @@ -477,61 +434,6 @@ adjust_other_login_visibility(GdmGreeterLoginWindow *login_window) } } -#ifdef HAVE_DEVICEKIT_POWER -static gboolean -can_suspend (GdmGreeterLoginWindow *login_window) -{ - gboolean ret; - DkpClient *dkp_client; - - /* use DeviceKit-power to get data */ - dkp_client = dkp_client_new (); - g_object_get (dkp_client, - "can-suspend", &ret, - NULL); - g_object_unref (dkp_client); - return ret; -} -#endif - -static void -remove_sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window) -{ - if (login_window->priv->sensitize_power_buttons_timeout_id > 0) { - g_source_remove (login_window->priv->sensitize_power_buttons_timeout_id); - login_window->priv->sensitize_power_buttons_timeout_id = 0; - } -} - -static gboolean -sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window) -{ - switch (login_window->priv->dialog_mode) { - case MODE_SELECTION: - sensitize_widget (login_window, "shutdown-button", TRUE); - sensitize_widget (login_window, "restart-button", TRUE); - sensitize_widget (login_window, "suspend-button", TRUE); - sensitize_widget (login_window, "disconnect-button", TRUE); - break; - case MODE_AUTHENTICATION: - break; - default: - g_assert_not_reached (); - } - - login_window->priv->sensitize_power_buttons_timeout_id = 0; - return FALSE; -} - -static void -add_sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window) -{ - remove_sensitize_power_buttons_timeout (login_window); - login_window->priv->sensitize_power_buttons_timeout_id = g_timeout_add_seconds (1, - (GSourceFunc)sensitize_power_buttons_timeout, - login_window); -} - static void switch_mode (GdmGreeterLoginWindow *login_window, int number) @@ -539,16 +441,6 @@ switch_mode (GdmGreeterLoginWindow *login_window, const char *default_name; GtkWidget *user_chooser; GtkWidget *box; - gboolean show_restart_buttons; - gboolean show_suspend_button; - - show_restart_buttons = get_show_restart_buttons (login_window); - -#ifdef HAVE_DEVICEKIT_POWER - show_suspend_button = can_suspend (login_window); -#else - show_suspend_button = FALSE; -#endif /* we want to run this even if we're supposed to be in the mode already so that we reset everything @@ -557,38 +449,20 @@ switch_mode (GdmGreeterLoginWindow *login_window, default_name = NULL; - remove_sensitize_power_buttons_timeout (login_window); - switch (number) { case MODE_SELECTION: set_log_in_button_mode (login_window, LOGIN_BUTTON_HIDDEN); show_widget (login_window, "cancel-button", FALSE); - show_widget (login_window, "shutdown-button", - login_window->priv->display_is_local && show_restart_buttons); - show_widget (login_window, "restart-button", - login_window->priv->display_is_local && show_restart_buttons); - show_widget (login_window, "suspend-button", - login_window->priv->display_is_local && show_restart_buttons && show_suspend_button); - show_widget (login_window, "disconnect-button", - ! login_window->priv->display_is_local); - show_widget (login_window, "auth-input-box", FALSE); - add_sensitize_power_buttons_timeout (login_window); - sensitize_widget (login_window, "shutdown-button", FALSE); - sensitize_widget (login_window, "restart-button", FALSE); - sensitize_widget (login_window, "suspend-button", FALSE); sensitize_widget (login_window, "disconnect-button", FALSE); default_name = NULL; break; case MODE_AUTHENTICATION: show_widget (login_window, "cancel-button", TRUE); - show_widget (login_window, "shutdown-button", FALSE); - show_widget (login_window, "restart-button", FALSE); - show_widget (login_window, "suspend-button", FALSE); show_widget (login_window, "disconnect-button", FALSE); default_name = "log-in-button"; break; @@ -629,32 +503,6 @@ switch_mode (GdmGreeterLoginWindow *login_window, } static void -do_disconnect (GdmGreeterLoginWindow *login_window) -{ - gtk_main_quit (); -} - -#ifdef HAVE_DEVICEKIT_POWER -static void -do_suspend (GdmGreeterLoginWindow *login_window) -{ - gboolean ret; - DkpClient *dkp_client; - GError *error = NULL; - - /* use DeviceKit-power to get data */ - dkp_client = dkp_client_new (); - ret = dkp_client_suspend (dkp_client, &error); - if (!ret) { - g_warning ("Couldn't suspend: %s", error->message); - g_error_free (error); - return; - } - g_object_unref (dkp_client); -} -#endif - -static void delete_entry_text (GtkWidget *entry) { const char *typed_text; @@ -968,16 +816,6 @@ gdm_greeter_login_window_get_property (GObject *object, } static void -suspend_button_clicked (GtkButton *button, - GdmGreeterLoginWindow *login_window) -{ -#ifdef HAVE_DEVICEKIT_POWER - do_suspend (login_window); -#endif -} - - -static void cancel_button_clicked (GtkButton *button, GdmGreeterLoginWindow *login_window) { @@ -985,125 +823,6 @@ cancel_button_clicked (GtkButton *button, } static void -disconnect_button_clicked (GtkButton *button, - GdmGreeterLoginWindow *login_window) -{ - do_disconnect (login_window); -} - -static gboolean -try_system_stop (DBusGConnection *connection, - GError **error) -{ - DBusGProxy *proxy; - gboolean res; - - g_debug ("GdmGreeterLoginWindow: trying to stop system"); - - proxy = dbus_g_proxy_new_for_name (connection, - CK_NAME, - CK_MANAGER_PATH, - CK_MANAGER_INTERFACE); - res = dbus_g_proxy_call_with_timeout (proxy, - "Stop", - INT_MAX, - error, - /* parameters: */ - G_TYPE_INVALID, - /* return values: */ - G_TYPE_INVALID); - return res; -} - -static gboolean -try_system_restart (DBusGConnection *connection, - GError **error) -{ - DBusGProxy *proxy; - gboolean res; - - g_debug ("GdmGreeterLoginWindow: trying to restart system"); - - proxy = dbus_g_proxy_new_for_name (connection, - CK_NAME, - CK_MANAGER_PATH, - CK_MANAGER_INTERFACE); - res = dbus_g_proxy_call_with_timeout (proxy, - "Restart", - INT_MAX, - error, - /* parameters: */ - G_TYPE_INVALID, - /* return values: */ - G_TYPE_INVALID); - return res; -} - -static void -do_system_restart (GdmGreeterLoginWindow *login_window) -{ - gboolean res; - GError *error; - DBusGConnection *connection; - - error = NULL; - connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (connection == NULL) { - g_warning ("Unable to get system bus connection: %s", error->message); - g_error_free (error); - return; - } - - res = try_system_restart (connection, &error); - if (!res) { - g_debug ("GdmGreeterLoginWindow: unable to restart system: %s: %s", - dbus_g_error_get_name (error), - error->message); - g_error_free (error); - } -} - -static void -do_system_stop (GdmGreeterLoginWindow *login_window) -{ - gboolean res; - GError *error; - DBusGConnection *connection; - - error = NULL; - connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (connection == NULL) { - g_warning ("Unable to get system bus connection: %s", error->message); - g_error_free (error); - return; - } - - res = try_system_stop (connection, &error); - if (!res) { - g_debug ("GdmGreeterLoginWindow: unable to stop system: %s: %s", - dbus_g_error_get_name (error), - error->message); - g_error_free (error); - } -} - -static void -restart_button_clicked (GtkButton *button, - GdmGreeterLoginWindow *login_window) -{ - g_debug ("GdmGreeterLoginWindow: restart button clicked"); - do_system_restart (login_window); -} - -static void -shutdown_button_clicked (GtkButton *button, - GdmGreeterLoginWindow *login_window) -{ - g_debug ("GdmGreeterLoginWindow: stop button clicked"); - do_system_stop (login_window); -} - -static void on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window) { update_banner_message (login_window); @@ -1400,20 +1119,9 @@ load_theme (GdmGreeterLoginWindow *login_window) login_window->priv->auth_banner_label = glade_xml_get_widget (login_window->priv->xml, "auth-banner-label"); /*make_label_small_italic (login_window->priv->auth_banner_label);*/ - button = glade_xml_get_widget (login_window->priv->xml, "suspend-button"); - g_signal_connect (button, "clicked", G_CALLBACK (suspend_button_clicked), login_window); - button = glade_xml_get_widget (login_window->priv->xml, "cancel-button"); g_signal_connect (button, "clicked", G_CALLBACK (cancel_button_clicked), login_window); - button = glade_xml_get_widget (login_window->priv->xml, "disconnect-button"); - g_signal_connect (button, "clicked", G_CALLBACK (disconnect_button_clicked), login_window); - - button = glade_xml_get_widget (login_window->priv->xml, "restart-button"); - g_signal_connect (button, "clicked", G_CALLBACK (restart_button_clicked), login_window); - button = glade_xml_get_widget (login_window->priv->xml, "shutdown-button"); - g_signal_connect (button, "clicked", G_CALLBACK (shutdown_button_clicked), login_window); - entry = glade_xml_get_widget (login_window->priv->xml, "auth-prompt-entry"); /* Only change the invisible character if it '*' otherwise assume it is OK */ if ('*' == gtk_entry_get_invisible_char (GTK_ENTRY (entry))) { @@ -1780,8 +1488,6 @@ gdm_greeter_login_window_finalize (GObject *object) g_object_unref (login_window->priv->client); } - remove_sensitize_power_buttons_timeout (login_window); - G_OBJECT_CLASS (gdm_greeter_login_window_parent_class)->finalize (object); } diff --git a/gui/simple-greeter/gdm-greeter-login-window.glade b/gui/simple-greeter/gdm-greeter-login-window.glade index d972c82..7c6e94b 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.glade +++ b/gui/simple-greeter/gdm-greeter-login-window.glade @@ -337,200 +337,6 @@ 6 - - True - True - gtk-disconnect - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - False - 0 - - - - True - media-playback-pause - 16 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Suspend - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - False - 0 - - - - True - view-refresh - 16 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Restart - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - False - 0 - - - - True - system-shutdown - 16 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Shut Down - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - - - True True diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c index dbdef29..dd0cb32 100644 --- a/gui/simple-greeter/gdm-greeter-panel.c +++ b/gui/simple-greeter/gdm-greeter-panel.c @@ -27,12 +27,22 @@ #include #include +#ifdef ENABLE_RBAC_SHUTDOWN +#include +#include +#endif + #include #include #include #include #include +#include + +#ifdef HAVE_DEVICEKIT_POWER +#include +#endif #include "gdm-languages.h" #include "gdm-layouts.h" @@ -46,6 +56,16 @@ #include "na-tray.h" +#define CK_NAME "org.freedesktop.ConsoleKit" +#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager" +#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager" + +#define GPM_DBUS_NAME "org.freedesktop.PowerManagement" +#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement" +#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement" + +#define KEY_DISABLE_RESTART_BUTTONS "/apps/gdm/simple-greeter/disable_restart_buttons" + #define GDM_GREETER_PANEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_PANEL, GdmGreeterPanelPrivate)) struct GdmGreeterPanelPrivate @@ -66,11 +86,15 @@ struct GdmGreeterPanelPrivate char *default_session_name; char *default_language_name; + + GConfClient *client; + guint display_is_local : 1; }; enum { PROP_0, - PROP_MONITOR + PROP_MONITOR, + PROP_DISPLAY_IS_LOCAL }; enum { @@ -107,6 +131,13 @@ gdm_greeter_panel_set_monitor (GdmGreeterPanel *panel, } static void +_gdm_greeter_panel_set_display_is_local (GdmGreeterPanel *panel, + gboolean is) +{ + panel->priv->display_is_local = is; +} + +static void gdm_greeter_panel_set_property (GObject *object, guint prop_id, const GValue *value, @@ -120,6 +151,9 @@ gdm_greeter_panel_set_property (GObject *object, case PROP_MONITOR: gdm_greeter_panel_set_monitor (self, g_value_get_int (value)); break; + case PROP_DISPLAY_IS_LOCAL: + _gdm_greeter_panel_set_display_is_local (self, g_value_get_boolean (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -140,6 +174,9 @@ gdm_greeter_panel_get_property (GObject *object, case PROP_MONITOR: g_value_set_int (value, self->priv->monitor); break; + case PROP_DISPLAY_IS_LOCAL: + g_value_set_boolean (value, self->priv->display_is_local); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -477,6 +514,13 @@ gdm_greeter_panel_class_init (GdmGreeterPanelClass *klass) G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, + PROP_DISPLAY_IS_LOCAL, + g_param_spec_boolean ("display-is-local", + "display is local", + "display is local", + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); g_type_class_add_private (klass, sizeof (GdmGreeterPanelPrivate)); } @@ -563,11 +607,185 @@ on_animation_tick (GdmGreeterPanel *panel, gtk_widget_queue_resize (GTK_WIDGET (panel)); } +static gboolean +try_system_stop (DBusGConnection *connection, + GError **error) +{ + DBusGProxy *proxy; + gboolean res; + + g_debug ("GdmGreeterPanel: trying to stop system"); + + proxy = dbus_g_proxy_new_for_name (connection, + CK_NAME, + CK_MANAGER_PATH, + CK_MANAGER_INTERFACE); + res = dbus_g_proxy_call_with_timeout (proxy, + "Stop", + INT_MAX, + error, + /* parameters: */ + G_TYPE_INVALID, + /* return values: */ + G_TYPE_INVALID); + return res; +} + +static gboolean +try_system_restart (DBusGConnection *connection, + GError **error) +{ + DBusGProxy *proxy; + gboolean res; + + g_debug ("GdmGreeterPanel: trying to restart system"); + + proxy = dbus_g_proxy_new_for_name (connection, + CK_NAME, + CK_MANAGER_PATH, + CK_MANAGER_INTERFACE); + res = dbus_g_proxy_call_with_timeout (proxy, + "Restart", + INT_MAX, + error, + /* parameters: */ + G_TYPE_INVALID, + /* return values: */ + G_TYPE_INVALID); + return res; +} + +static gboolean +can_suspend (void) +{ + gboolean ret = FALSE; + +#ifdef HAVE_DEVICEKIT_POWER + DkpClient *dkp_client; + + /* use DeviceKit-power to get data */ + dkp_client = dkp_client_new (); + g_object_get (dkp_client, + "can-suspend", &ret, + NULL); + g_object_unref (dkp_client); +#endif + + return ret; +} + +static void +do_system_suspend (void) +{ +#ifdef HAVE_DEVICEKIT_POWER + gboolean ret; + DkpClient *dkp_client; + GError *error = NULL; + + /* use DeviceKit-power to get data */ + dkp_client = dkp_client_new (); + ret = dkp_client_suspend (dkp_client, &error); + if (!ret) { + g_warning ("Couldn't suspend: %s", error->message); + g_error_free (error); + return; + } + g_object_unref (dkp_client); +#endif +} + +static void +do_system_restart (void) +{ + gboolean res; + GError *error; + DBusGConnection *connection; + + error = NULL; + connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); + if (connection == NULL) { + g_warning ("Unable to get system bus connection: %s", error->message); + g_error_free (error); + return; + } + + res = try_system_restart (connection, &error); + if (!res) { + g_debug ("GdmGreeterPanel: unable to restart system: %s: %s", + dbus_g_error_get_name (error), + error->message); + g_error_free (error); + } +} + +static void +do_system_stop (void) +{ + gboolean res; + GError *error; + DBusGConnection *connection; + + error = NULL; + connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); + if (connection == NULL) { + g_warning ("Unable to get system bus connection: %s", error->message); + g_error_free (error); + return; + } + + res = try_system_stop (connection, &error); + if (!res) { + g_debug ("GdmGreeterPanel: unable to stop system: %s: %s", + dbus_g_error_get_name (error), + error->message); + g_error_free (error); + } +} + +static void +do_disconnect (void) +{ + gtk_main_quit (); +} + +static gboolean +get_show_restart_buttons (GdmGreeterPanel *panel) +{ + gboolean show; + GError *error; + + error = NULL; + show = ! gconf_client_get_bool (panel->priv->client, KEY_DISABLE_RESTART_BUTTONS, &error); + if (error != NULL) { + g_debug ("GdmGreeterPanel: unable to get disable-restart-buttons configuration: %s", error->message); + g_error_free (error); + } + +#ifdef ENABLE_RBAC_SHUTDOWN + { + char *username; + + username = g_get_user_name (); + if (username == NULL || !chkauthattr (RBAC_SHUTDOWN_KEY, username)) { + show = FALSE; + g_debug ("GdmGreeterPanel: Not showing stop/restart buttons for user %s due to RBAC key %s", + username, RBAC_SHUTDOWN_KEY); + } else { + g_debug ("GdmGreeterPanel: Showing stop/restart buttons for user %s due to RBAC key %s", + username, RBAC_SHUTDOWN_KEY); + } + } +#endif + return show; +} + static void gdm_greeter_panel_init (GdmGreeterPanel *panel) { NaTray *tray; GtkWidget *spacer; + GtkWidget *shutdown_menu; + GtkWidget *menu, *menu_item; gdm_profile_start (NULL); @@ -603,6 +821,8 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) spacer = gtk_label_new (""); gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), spacer, TRUE, TRUE, 6); gtk_widget_show (spacer); + + panel->priv->client = gconf_client_get_default (); gdm_profile_start ("creating option widget"); panel->priv->language_option_widget = gdm_language_option_widget_new (); @@ -642,6 +862,42 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) gtk_widget_show (panel->priv->hostname_label); } + if (panel->priv->display_is_local || get_show_restart_buttons (panel)) { + shutdown_menu = gtk_menu_bar_new (); + + menu_item = gtk_image_menu_item_new (); + menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu); + gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menu_item), TRUE); + gtk_menu_item_set_label (GTK_MENU_ITEM (menu_item), ""); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), + gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON)); + gtk_menu_shell_append (GTK_MENU_SHELL (shutdown_menu), menu_item); + + if (panel->priv->display_is_local) { + menu_item = gtk_menu_item_new_with_label ("Disconnect"); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_disconnect), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + } else { + if (can_suspend ()) { + menu_item = gtk_menu_item_new_with_label ("Suspend"); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + } + + menu_item = gtk_menu_item_new_with_label ("Restart"); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_restart), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + + menu_item = gtk_menu_item_new_with_label ("Shut Down"); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_stop), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + } + + gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (shutdown_menu), FALSE, FALSE, 0); + gtk_widget_show_all (GTK_WIDGET (shutdown_menu)); + } + panel->priv->clock = gdm_clock_widget_new (); gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6); @@ -651,7 +907,6 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (tray), FALSE, FALSE, 6); gtk_widget_show (GTK_WIDGET (tray)); - gdm_greeter_panel_hide_user_options (panel); panel->priv->progress = 0.0; @@ -684,13 +939,15 @@ gdm_greeter_panel_finalize (GObject *object) GtkWidget * gdm_greeter_panel_new (GdkScreen *screen, - int monitor) + int monitor, + gboolean is_local) { GObject *object; object = g_object_new (GDM_TYPE_GREETER_PANEL, "screen", screen, "monitor", monitor, + "display-is-local", is_local, NULL); return GTK_WIDGET (object); diff --git a/gui/simple-greeter/gdm-greeter-panel.h b/gui/simple-greeter/gdm-greeter-panel.h index 1e637f5..625c80d 100644 --- a/gui/simple-greeter/gdm-greeter-panel.h +++ b/gui/simple-greeter/gdm-greeter-panel.h @@ -60,7 +60,8 @@ typedef struct GType gdm_greeter_panel_get_type (void); GtkWidget * gdm_greeter_panel_new (GdkScreen *screen, - int monitor); + int monitor, + gboolean is_local); void gdm_greeter_panel_show_user_options (GdmGreeterPanel *panel); void gdm_greeter_panel_hide_user_options (GdmGreeterPanel *panel); diff --git a/gui/simple-greeter/gdm-greeter-session.c b/gui/simple-greeter/gdm-greeter-session.c index 167b693..e7d206a 100644 --- a/gui/simple-greeter/gdm-greeter-session.c +++ b/gui/simple-greeter/gdm-greeter-session.c @@ -332,13 +332,15 @@ toggle_panel (GdmGreeterSession *session, GdkScreen *screen; int monitor; int x, y; + gboolean is_local; display = gdk_display_get_default (); gdk_display_get_pointer (display, &screen, &x, &y, NULL); monitor = get_tallest_monitor_at_point (screen, x, y); - session->priv->panel = gdm_greeter_panel_new (screen, monitor); + is_local = gdm_greeter_client_get_display_is_local (session->priv->client); + session->priv->panel = gdm_greeter_panel_new (screen, monitor, is_local); g_signal_connect_swapped (session->priv->panel, "language-selected", diff --git a/gui/simple-greeter/test-greeter-panel.c b/gui/simple-greeter/test-greeter-panel.c index 80ef0a9..86adae3 100644 --- a/gui/simple-greeter/test-greeter-panel.c +++ b/gui/simple-greeter/test-greeter-panel.c @@ -53,7 +53,7 @@ main (int argc, char *argv[]) gdk_display_get_pointer (display, &screen, &x, &y, NULL); monitor = gdk_screen_get_monitor_at_point (screen, x, y); - panel = gdm_greeter_panel_new (screen, monitor); + panel = gdm_greeter_panel_new (screen, monitor, TRUE); gdm_greeter_panel_show_user_options (GDM_GREETER_PANEL (panel)); gtk_widget_show (panel); -- 1.6.5.rc2 >From 4ee17e4732cbdc4c91e93da732de6849c4f95a86 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 20 Oct 2009 17:06:58 -0400 Subject: [PATCH 2/3] Use button instead of menu bar The menu bar isn't a great fit for the panel --- gui/simple-greeter/gdm-greeter-panel.c | 81 +++++++++++++++++++++++++------- 1 files changed, 64 insertions(+), 17 deletions(-) diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c index dd0cb32..d5dd820 100644 --- a/gui/simple-greeter/gdm-greeter-panel.c +++ b/gui/simple-greeter/gdm-greeter-panel.c @@ -77,6 +77,8 @@ struct GdmGreeterPanelPrivate GtkWidget *option_hbox; GtkWidget *hostname_label; GtkWidget *clock; + GtkWidget *shutdown_button; + GtkWidget *shutdown_menu; GtkWidget *language_option_widget; GtkWidget *layout_option_widget; GtkWidget *session_option_widget; @@ -780,12 +782,48 @@ get_show_restart_buttons (GdmGreeterPanel *panel) } static void +position_shutdown_menu (GtkMenu *menu, + int *x, + int *y, + gboolean *push_in, + GdmGreeterPanel *panel) +{ + GtkRequisition menu_requisition; + + *push_in = TRUE; + + *x = panel->priv->shutdown_button->allocation.x; + gtk_window_get_position (GTK_WINDOW (panel), NULL, y); + + gtk_widget_size_request (GTK_WIDGET (menu), &menu_requisition); + + *y -= menu_requisition.height; +} + +static void +on_shutdown_button_toggled (GdmGreeterPanel *panel) +{ + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button))) { + gtk_menu_popup (GTK_MENU (panel->priv->shutdown_menu), NULL, NULL, + (GtkMenuPositionFunc) position_shutdown_menu, + panel, 0, 0); + } else { + gtk_menu_popdown (GTK_MENU (panel->priv->shutdown_menu)); + } +} + +static void +on_shutdown_menu_deactivate (GdmGreeterPanel *panel) +{ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button), + FALSE); +} + +static void gdm_greeter_panel_init (GdmGreeterPanel *panel) { NaTray *tray; GtkWidget *spacer; - GtkWidget *shutdown_menu; - GtkWidget *menu, *menu_item; gdm_profile_start (NULL); @@ -863,39 +901,48 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) } if (panel->priv->display_is_local || get_show_restart_buttons (panel)) { - shutdown_menu = gtk_menu_bar_new (); + GtkWidget *menu_item; + GtkWidget *image; + + panel->priv->shutdown_button = gtk_toggle_button_new (); + gtk_button_set_relief (GTK_BUTTON (panel->priv->shutdown_button), + GTK_RELIEF_NONE); + + panel->priv->shutdown_menu = gtk_menu_new (); + gtk_menu_attach_to_widget (GTK_MENU (panel->priv->shutdown_menu), + panel->priv->shutdown_button, NULL); + g_signal_connect_swapped (panel->priv->shutdown_button, "toggled", + G_CALLBACK (on_shutdown_button_toggled), panel); + g_signal_connect_swapped (panel->priv->shutdown_menu, "deactivate", + G_CALLBACK (on_shutdown_menu_deactivate), panel); - menu_item = gtk_image_menu_item_new (); - menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menu_item), TRUE); - gtk_menu_item_set_label (GTK_MENU_ITEM (menu_item), ""); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), - gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON)); - gtk_menu_shell_append (GTK_MENU_SHELL (shutdown_menu), menu_item); + image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image); + gtk_container_add (GTK_CONTAINER (panel->priv->shutdown_button), image); if (panel->priv->display_is_local) { menu_item = gtk_menu_item_new_with_label ("Disconnect"); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_disconnect), NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); } else { if (can_suspend ()) { menu_item = gtk_menu_item_new_with_label ("Suspend"); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); } menu_item = gtk_menu_item_new_with_label ("Restart"); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_restart), NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); menu_item = gtk_menu_item_new_with_label ("Shut Down"); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_stop), NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); } - gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (shutdown_menu), FALSE, FALSE, 0); - gtk_widget_show_all (GTK_WIDGET (shutdown_menu)); + gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (panel->priv->shutdown_button), FALSE, FALSE, 0); + gtk_widget_show_all (panel->priv->shutdown_menu); + gtk_widget_show_all (GTK_WIDGET (panel->priv->shutdown_button)); } panel->priv->clock = gdm_clock_widget_new (); -- 1.6.5.rc2 >From 4c206142ddb22315d9beb42eae9d868f449bdf11 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 20 Oct 2009 17:23:15 -0400 Subject: [PATCH 3/3] Mark Shutdown, Restart, and Suspend for translation --- gui/simple-greeter/gdm-greeter-panel.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c index d5dd820..016f636 100644 --- a/gui/simple-greeter/gdm-greeter-panel.c +++ b/gui/simple-greeter/gdm-greeter-panel.c @@ -926,16 +926,16 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); } else { if (can_suspend ()) { - menu_item = gtk_menu_item_new_with_label ("Suspend"); + menu_item = gtk_menu_item_new_with_label (_("Suspend")); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL); gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); } - menu_item = gtk_menu_item_new_with_label ("Restart"); + menu_item = gtk_menu_item_new_with_label (_("Restart")); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_restart), NULL); gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); - menu_item = gtk_menu_item_new_with_label ("Shut Down"); + menu_item = gtk_menu_item_new_with_label (_("Shut Down")); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_stop), NULL); gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); } -- 1.6.5.rc2 >From 7fbb5c0dec8aa42b1d8985c6f62be02c035175da Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 26 Oct 2009 15:00:43 -0400 Subject: [PATCH] Position shutdown menu better in multi-monitor displays --- gui/simple-greeter/gdm-greeter-panel.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c index 43b91d5..caade7a 100644 --- a/gui/simple-greeter/gdm-greeter-panel.c +++ b/gui/simple-greeter/gdm-greeter-panel.c @@ -790,10 +790,21 @@ position_shutdown_menu (GtkMenu *menu, GdmGreeterPanel *panel) { GtkRequisition menu_requisition; + GdkScreen *screen; + int monitor; *push_in = TRUE; - *x = panel->priv->shutdown_button->allocation.x; + screen = gtk_widget_get_screen (GTK_WIDGET (panel)); + monitor = gdk_screen_get_monitor_at_window (screen, GTK_WIDGET (panel)->window); + gtk_menu_set_monitor (menu, monitor); + + gtk_widget_translate_coordinates (GTK_WIDGET (panel->priv->shutdown_button), + GTK_WIDGET (panel), + panel->priv->shutdown_button->allocation.x, + panel->priv->shutdown_button->allocation.y, + x, y); + gtk_window_get_position (GTK_WINDOW (panel), NULL, y); gtk_widget_size_request (GTK_WIDGET (menu), &menu_requisition); -- 1.6.5.1 gdm-bubble-location.patch: session-setup.entries | 6 ++++++ 1 file changed, 6 insertions(+) --- NEW FILE gdm-bubble-location.patch --- diff -up gdm-2.28.0/data/session-setup.entries.bubble-location gdm-2.28.0/data/session-setup.entries --- gdm-2.28.0/data/session-setup.entries.bubble-location 2009-10-09 09:38:01.315620045 -0400 +++ gdm-2.28.0/data/session-setup.entries 2009-10-09 09:39:11.354874396 -0400 @@ -755,5 +755,11 @@ /bin/true + + /apps/notification-daemon/popup_location + + bottom_right + + make-user-list-animation-smoother.patch: b/gui/simple-greeter/gdm-chooser-widget.c | 3 - b/gui/simple-greeter/gdm-scrollable-widget.c | 19 ++++++- b/gui/simple-greeter/gdm-scrollable-widget.h | 2 gui/simple-greeter/gdm-chooser-widget.c | 70 +++------------------------ gui/simple-greeter/gdm-scrollable-widget.c | 17 +++++- 5 files changed, 43 insertions(+), 68 deletions(-) --- NEW FILE make-user-list-animation-smoother.patch --- >From 7980049944d064e803522aca8241256a62e90925 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 30 Oct 2009 11:18:13 -0400 Subject: [PATCH 1/6] Fix typo in chooser grow code --- gui/simple-greeter/gdm-chooser-widget.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c index cbd5072..9347eee 100644 --- a/gui/simple-greeter/gdm-chooser-widget.c +++ b/gui/simple-greeter/gdm-chooser-widget.c @@ -894,7 +894,7 @@ start_grow_animation (GdmChooserWidget *widget) height = get_height_of_screen (widget); } gdm_scrollable_widget_slide_to_height (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget), - widget->priv->height_when_grown, + height, (GdmScrollableWidgetSlideStepFunc) on_grow_animation_step, widget, (GdmScrollableWidgetSlideDoneFunc) -- 1.6.5.1 >From e2cde131a24e2933588bed8c741ca14bb007c6eb Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 30 Oct 2009 12:13:32 -0400 Subject: [PATCH 2/6] Don't start grow animation until chooser is loaded This makes it smoother when first starting up --- gui/simple-greeter/gdm-chooser-widget.c | 37 ++---------------------------- 1 files changed, 3 insertions(+), 34 deletions(-) diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c index 9347eee..1147104 100644 --- a/gui/simple-greeter/gdm-chooser-widget.c +++ b/gui/simple-greeter/gdm-chooser-widget.c @@ -92,7 +92,6 @@ struct GdmChooserWidgetPrivate guint32 should_hide_inactive_items : 1; guint32 emit_activated_after_resize_animation : 1; - guint32 was_fully_grown : 1; GdmChooserWidgetPosition separator_position; GdmChooserWidgetState state; @@ -807,29 +806,12 @@ on_grow_animation_complete (GdmScrollableWidget *scrollable_widget, { g_assert (widget->priv->state == GDM_CHOOSER_WIDGET_STATE_GROWING); widget->priv->state = GDM_CHOOSER_WIDGET_STATE_GROWN; - widget->priv->was_fully_grown = TRUE; gtk_tree_view_set_enable_search (GTK_TREE_VIEW (widget->priv->items_view), TRUE); _grab_focus (GTK_WIDGET (widget)); } static int -get_height_of_screen (GdmChooserWidget *widget) -{ - GdkScreen *screen; - GdkRectangle area; - int monitor; - - screen = gtk_widget_get_screen (GTK_WIDGET (widget)); - - monitor = gdk_screen_get_monitor_at_window (screen, - gdk_screen_get_root_window (screen)); - gdk_screen_get_monitor_geometry (screen, monitor, &area); - - return area.height; -} - -static int get_number_of_on_screen_rows (GdmChooserWidget *widget) { GtkTreePath *start_path; @@ -876,7 +858,6 @@ start_grow_animation (GdmChooserWidget *widget) { int number_of_visible_rows; int number_of_rows; - int height; number_of_visible_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->model_sorter), NULL); number_of_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->list_store), NULL); @@ -888,13 +869,8 @@ start_grow_animation (GdmChooserWidget *widget) set_inactive_items_visible (widget, TRUE); - if (widget->priv->was_fully_grown) { - height = widget->priv->height_when_grown; - } else { - height = get_height_of_screen (widget); - } gdm_scrollable_widget_slide_to_height (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget), - height, + widget->priv->height_when_grown, (GdmScrollableWidgetSlideStepFunc) on_grow_animation_step, widget, (GdmScrollableWidgetSlideDoneFunc) @@ -912,7 +888,6 @@ skip_resize_animation (GdmChooserWidget *widget) set_inactive_items_visible (GDM_CHOOSER_WIDGET (widget), TRUE); gtk_tree_view_set_enable_search (GTK_TREE_VIEW (widget->priv->items_view), TRUE); widget->priv->state = GDM_CHOOSER_WIDGET_STATE_GROWN; - widget->priv->was_fully_grown = FALSE; _grab_focus (GTK_WIDGET (widget)); } } @@ -922,7 +897,6 @@ gdm_chooser_widget_grow (GdmChooserWidget *widget) { if (widget->priv->state == GDM_CHOOSER_WIDGET_STATE_SHRINKING) { gdm_scrollable_widget_stop_sliding (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget)); - widget->priv->was_fully_grown = FALSE; } gtk_alignment_set (GTK_ALIGNMENT (widget->priv->frame_alignment), @@ -1233,9 +1207,7 @@ gdm_chooser_widget_size_allocate (GtkWidget *widget, chooser_widget = GDM_CHOOSER_WIDGET (widget); if (chooser_widget->priv->state == GDM_CHOOSER_WIDGET_STATE_GROWN) { - if (chooser_widget->priv->was_fully_grown) { - chooser_widget->priv->height_when_grown = allocation->height; - } + chooser_widget->priv->height_when_grown = allocation->height; } } @@ -1801,8 +1773,6 @@ gdm_chooser_widget_init (GdmChooserWidget *widget) */ GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS); - widget->priv->height_when_grown = get_height_of_screen (widget); - gtk_alignment_set_padding (GTK_ALIGNMENT (widget), 0, 0, 0, 0); add_frame (widget); @@ -1935,9 +1905,7 @@ gdm_chooser_widget_init (GdmChooserWidget *widget) gtk_tree_row_reference_free); add_separator (widget); - queue_column_visibility_update (widget); - gdm_chooser_widget_grow (widget); } static void @@ -2544,5 +2512,6 @@ gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget *widget) void gdm_chooser_widget_loaded (GdmChooserWidget *widget) { + gdm_chooser_widget_grow (widget); g_signal_emit (widget, signals[LOADED], 0); } -- 1.6.5.1 >From 3f707bba808b3484be7380a11aebfadb2bc98ab6 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 30 Oct 2009 14:41:54 -0400 Subject: [PATCH 3/6] Hide user list frame when list is empty. --- gui/simple-greeter/gdm-chooser-widget.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c index 1147104..4124195 100644 --- a/gui/simple-greeter/gdm-chooser-widget.c +++ b/gui/simple-greeter/gdm-chooser-widget.c @@ -600,9 +600,9 @@ static void update_chooser_visibility (GdmChooserWidget *widget) { if (gdm_chooser_widget_get_number_of_items (widget) > 0) { - gtk_widget_show (widget->priv->scrollable_widget); + gtk_widget_show (widget->priv->frame); } else { - gtk_widget_hide (widget->priv->scrollable_widget); + gtk_widget_hide (widget->priv->frame); } g_object_notify (G_OBJECT (widget), "list-visible"); } -- 1.6.5.1 >From 6197ec180d369899bf4b87c5e8adaed62ed3fdeb Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 30 Oct 2009 14:52:04 -0400 Subject: [PATCH 4/6] Dynamically slide destination from step function This lets us add items or swift directions while the animation is going. --- gui/simple-greeter/gdm-chooser-widget.c | 10 +++++----- gui/simple-greeter/gdm-scrollable-widget.c | 19 ++++++++++++++++++- gui/simple-greeter/gdm-scrollable-widget.h | 1 + 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c index 4124195..4df03a6 100644 --- a/gui/simple-greeter/gdm-chooser-widget.c +++ b/gui/simple-greeter/gdm-chooser-widget.c @@ -97,7 +97,6 @@ struct GdmChooserWidgetPrivate GdmChooserWidgetState state; double active_row_normalized_position; - int height_when_grown; }; enum { @@ -552,6 +551,7 @@ set_frame_text (GdmChooserWidget *widget, static void on_shrink_animation_step (GdmScrollableWidget *scrollable_widget, double progress, + int *new_height, GdmChooserWidget *widget) { GtkTreePath *active_row_path; @@ -839,6 +839,7 @@ get_number_of_on_screen_rows (GdmChooserWidget *widget) static void on_grow_animation_step (GdmScrollableWidget *scrollable_widget, double progress, + int *new_height, GdmChooserWidget *widget) { int number_of_visible_rows; @@ -851,6 +852,8 @@ on_grow_animation_step (GdmScrollableWidget *scrollable_widget, gdm_scrollable_widget_stop_sliding (scrollable_widget); return; } + + *new_height = GTK_BIN (scrollable_widget)->child->requisition.height; } static void @@ -870,7 +873,7 @@ start_grow_animation (GdmChooserWidget *widget) set_inactive_items_visible (widget, TRUE); gdm_scrollable_widget_slide_to_height (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget), - widget->priv->height_when_grown, + GTK_BIN (widget->priv->scrollable_widget)->child->requisition.height, (GdmScrollableWidgetSlideStepFunc) on_grow_animation_step, widget, (GdmScrollableWidgetSlideDoneFunc) @@ -1206,9 +1209,6 @@ gdm_chooser_widget_size_allocate (GtkWidget *widget, chooser_widget = GDM_CHOOSER_WIDGET (widget); - if (chooser_widget->priv->state == GDM_CHOOSER_WIDGET_STATE_GROWN) { - chooser_widget->priv->height_when_grown = allocation->height; - } } static gboolean diff --git a/gui/simple-greeter/gdm-scrollable-widget.c b/gui/simple-greeter/gdm-scrollable-widget.c index 2c0407d..6d9dc83 100644 --- a/gui/simple-greeter/gdm-scrollable-widget.c +++ b/gui/simple-greeter/gdm-scrollable-widget.c @@ -132,9 +132,26 @@ on_animation_tick (GdmScrollableWidgetAnimation *animation, gtk_widget_set_size_request (animation->widget, width, height); if (animation->step_func != NULL) { + GdmTimer *timer; + + height = animation->desired_height; + + height -= animation->widget->style->ythickness * 2; + height -= GTK_CONTAINER (animation->widget)->border_width * 2; + + timer = g_object_ref (animation->timer); animation->step_func (GDM_SCROLLABLE_WIDGET (animation->widget), progress, + &height, animation->step_func_user_data); + + if (gdm_timer_is_started (timer)) { + height += animation->widget->style->ythickness * 2; + height += GTK_CONTAINER (animation->widget)->border_width * 2; + + animation->desired_height = height; + } + g_object_unref (timer); } } @@ -708,7 +725,7 @@ gdm_scrollable_widget_slide_to_height (GdmScrollableWidget *scrollable_widget, if (!input_redirected || gdm_scrollable_widget_animations_are_disabled (scrollable_widget)) { if (step_func != NULL) { - step_func (scrollable_widget, 0.0, step_user_data); + step_func (scrollable_widget, 0.0, &height, step_user_data); } if (done_func != NULL) { diff --git a/gui/simple-greeter/gdm-scrollable-widget.h b/gui/simple-greeter/gdm-scrollable-widget.h index 9b8877e..2241cb1 100644 --- a/gui/simple-greeter/gdm-scrollable-widget.h +++ b/gui/simple-greeter/gdm-scrollable-widget.h @@ -40,6 +40,7 @@ typedef struct GdmScrollableWidget GdmScrollableWidget; typedef struct GdmScrollableWidgetPrivate GdmScrollableWidgetPrivate; typedef void (* GdmScrollableWidgetSlideStepFunc) (GdmScrollableWidget *scrollable_widget, double progress, + int *new_height, gpointer *user_data); typedef void (* GdmScrollableWidgetSlideDoneFunc) (GdmScrollableWidget *scrollable_widget, gpointer *user_data); -- 1.6.5.1 >From a31d6dd70213fd3ab8572da2923b99fcbe5449a6 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 30 Oct 2009 14:47:45 -0400 Subject: [PATCH 5/6] Drop checks for growing too far We're now very exact about where to grow so we don't need it. --- gui/simple-greeter/gdm-chooser-widget.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c index 4df03a6..6c29d23 100644 --- a/gui/simple-greeter/gdm-chooser-widget.c +++ b/gui/simple-greeter/gdm-chooser-widget.c @@ -848,28 +848,12 @@ on_grow_animation_step (GdmScrollableWidget *scrollable_widget, number_of_visible_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->model_sorter), NULL); number_of_on_screen_rows = get_number_of_on_screen_rows (widget); - if (number_of_on_screen_rows >= number_of_visible_rows) { - gdm_scrollable_widget_stop_sliding (scrollable_widget); - return; - } - *new_height = GTK_BIN (scrollable_widget)->child->requisition.height; } static void start_grow_animation (GdmChooserWidget *widget) { - int number_of_visible_rows; - int number_of_rows; - - number_of_visible_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->model_sorter), NULL); - number_of_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->list_store), NULL); - - if (number_of_visible_rows >= number_of_rows) { - on_grow_animation_complete (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget), widget); - return; - } - set_inactive_items_visible (widget, TRUE); gdm_scrollable_widget_slide_to_height (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget), -- 1.6.5.1 >From f685f9fe038d891026fce69a47a7ab7c3e438d37 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 30 Oct 2009 16:44:29 -0400 Subject: [PATCH 6/6] Compute needs-scrollbar logic differently This way is a little clearer to read and seems to work around a bug where the scrollbar gets shown briefly at the end of an animation. --- gui/simple-greeter/gdm-scrollable-widget.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gui/simple-greeter/gdm-scrollable-widget.c b/gui/simple-greeter/gdm-scrollable-widget.c index 6d9dc83..d55013d 100644 --- a/gui/simple-greeter/gdm-scrollable-widget.c +++ b/gui/simple-greeter/gdm-scrollable-widget.c @@ -252,7 +252,7 @@ gdm_scrollable_widget_animation_stop (GdmScrollableWidgetAnimation *animation) static gboolean gdm_scrollable_widget_needs_scrollbar (GdmScrollableWidget *widget) { - GtkAdjustment *adjustment; + gboolean needs_scrollbar; if (widget->priv->scrollbar == NULL) { return FALSE; @@ -266,9 +266,19 @@ gdm_scrollable_widget_needs_scrollbar (GdmScrollableWidget *widget) return FALSE; } - adjustment = gtk_range_get_adjustment (GTK_RANGE (widget->priv->scrollbar)); + if (GTK_BIN (widget)->child != NULL) { + GtkRequisition child_requisition; + int available_height; + + gtk_widget_get_child_requisition (GTK_BIN (widget)->child, + &child_requisition); + available_height = GTK_WIDGET (widget)->allocation.height; + needs_scrollbar = child_requisition.height > available_height; + } else { + needs_scrollbar = FALSE; + } - return adjustment->upper - adjustment->lower > adjustment->page_size; + return needs_scrollbar; } static void -- 1.6.5.1 tray-padding.patch: session-setup.entries | 6 ++++++ 1 file changed, 6 insertions(+) --- NEW FILE tray-padding.patch --- diff -up gdm-2.28.1/data/session-setup.entries.tray-padding gdm-2.28.1/data/session-setup.entries --- gdm-2.28.1/data/session-setup.entries.tray-padding 2009-10-31 18:07:29.437799765 -0400 +++ gdm-2.28.1/data/session-setup.entries 2009-10-31 18:08:20.758793871 -0400 @@ -761,5 +761,11 @@ bottom_right + + /apps/notification_area_applet/prefs/padding + + 3 + + gdm-multistack.patch: b/common/gdm-marshal.list | 1 b/configure.ac | 45 b/daemon/gdm-factory-slave.c | 13 b/daemon/gdm-greeter-server.c | 2 b/daemon/gdm-greeter-server.h | 5 b/daemon/gdm-product-slave.c | 47 b/daemon/gdm-session-direct.c | 14 b/daemon/gdm-session-private.h | 3 b/daemon/gdm-session-relay.c | 29 b/daemon/gdm-session-worker-job.c | 11 b/daemon/gdm-session-worker-job.h | 2 b/daemon/gdm-session-worker.c | 27 b/daemon/gdm-session-worker.h | 2 b/daemon/gdm-session.c | 20 b/daemon/gdm-session.h | 9 b/daemon/gdm-simple-slave.c | 3 b/daemon/test-session.c | 14 b/gui/simple-greeter/Makefile.am | 4 b/gui/simple-greeter/gdm-chooser-widget.c | 32 b/gui/simple-greeter/gdm-chooser-widget.h | 3 b/gui/simple-greeter/gdm-greeter-client.c | 18 b/gui/simple-greeter/gdm-greeter-client.h | 4 b/gui/simple-greeter/gdm-greeter-login-window.c | 91 b/gui/simple-greeter/gdm-greeter-login-window.glade | 39 b/gui/simple-greeter/gdm-greeter-login-window.h | 11 b/gui/simple-greeter/gdm-greeter-plugin.c | 255 + b/gui/simple-greeter/gdm-greeter-plugin.h | 61 b/gui/simple-greeter/gdm-greeter-session.c | 5 b/gui/simple-greeter/gdm-plugin-manager.c | 478 +++ b/gui/simple-greeter/gdm-plugin-manager.h | 66 b/gui/simple-greeter/gdm-task-list.c | 198 + b/gui/simple-greeter/gdm-task-list.h | 65 b/gui/simple-greeter/gdm-user-chooser-widget.c | 2 b/gui/simple-greeter/libgdmsimplegreeter/Makefile.am | 46 b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c | 147 + b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h | 87 b/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c | 93 b/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h | 55 b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c | 117 b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h | 62 b/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in | 11 b/gui/simple-greeter/plugins/Makefile.am | 1 b/gui/simple-greeter/plugins/fingerprint/Makefile.am | 56 b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c | 299 ++ b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h | 56 b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint.pam | 17 b/gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am | 5 b/gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am | 5 b/gui/simple-greeter/plugins/fingerprint/icons/Makefile.am | 1 b/gui/simple-greeter/plugins/fingerprint/page.ui | 56 b/gui/simple-greeter/plugins/fingerprint/plugin.c | 41 b/gui/simple-greeter/plugins/password/Makefile.am | 53 b/gui/simple-greeter/plugins/password/gdm-password-extension.c | 314 ++ b/gui/simple-greeter/plugins/password/gdm-password-extension.h | 56 b/gui/simple-greeter/plugins/password/gdm-password.pam | 19 b/gui/simple-greeter/plugins/password/page.ui | 56 b/gui/simple-greeter/plugins/password/plugin.c | 40 b/gui/simple-greeter/plugins/smartcard/Makefile.am | 77 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c | 418 ++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h | 56 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c | 1394 ++++++++++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h | 86 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c | 167 + b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c | 558 ++++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h | 94 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.pam | 18 b/gui/simple-greeter/plugins/smartcard/icons/16x16/Makefile.am | 5 b/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am | 5 b/gui/simple-greeter/plugins/smartcard/icons/Makefile.am | 1 b/gui/simple-greeter/plugins/smartcard/page.ui | 56 b/gui/simple-greeter/plugins/smartcard/plugin.c | 40 b/po/POTFILES.in | 2 configure.ac | 15 daemon/gdm-factory-slave.c | 103 daemon/gdm-greeter-server.c | 195 + daemon/gdm-greeter-server.h | 21 daemon/gdm-product-slave.c | 263 + daemon/gdm-session-direct.c | 1150 +++++--- daemon/gdm-session-private.h | 31 daemon/gdm-session-relay.c | 223 + daemon/gdm-session-worker-job.c | 73 daemon/gdm-session-worker-job.h | 6 daemon/gdm-session-worker.c | 61 daemon/gdm-session.c | 250 + daemon/gdm-session.h | 62 daemon/gdm-simple-slave.c | 241 + daemon/test-session.c | 22 gui/simple-greeter/Makefile.am | 15 gui/simple-greeter/gdm-chooser-widget.c | 9 gui/simple-greeter/gdm-chooser-widget.h | 3 gui/simple-greeter/gdm-greeter-client.c | 229 + gui/simple-greeter/gdm-greeter-client.h | 21 gui/simple-greeter/gdm-greeter-login-window.c | 1155 ++++++-- gui/simple-greeter/gdm-greeter-login-window.glade | 144 - gui/simple-greeter/gdm-greeter-login-window.h | 24 gui/simple-greeter/gdm-greeter-session.c | 148 - gui/simple-greeter/gdm-task-list.c | 268 + gui/simple-greeter/gdm-task-list.h | 40 gui/simple-greeter/gdm-user-chooser-widget.c | 32 gui/simple-greeter/libgdmsimplegreeter/Makefile.am | 2 gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c | 51 gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h | 13 gui/simple-greeter/libgdmsimplegreeter/gdm-task.c | 12 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h | 5 gui/simple-greeter/plugins/Makefile.am | 4 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c | 54 gui/simple-greeter/plugins/password/gdm-password-extension.c | 15 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c | 62 po/POTFILES.in | 2 109 files changed, 9965 insertions(+), 1308 deletions(-) View full diff with command: /usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gdm-multistack.patchIndex: gdm-multistack.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-multistack.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- gdm-multistack.patch 23 Sep 2009 23:39:05 -0000 1.1 +++ gdm-multistack.patch 2 Nov 2009 05:38:10 -0000 1.2 @@ -1,1434 +1,1382 @@ -diff -up gdm-2.28.0/common/gdm-marshal.list.multistack gdm-2.28.0/common/gdm-marshal.list ---- gdm-2.28.0/common/gdm-marshal.list.multistack 2009-09-21 16:05:27.000000000 -0400 -+++ gdm-2.28.0/common/gdm-marshal.list 2009-09-23 18:46:06.861400723 -0400 -@@ -5,3 +5,4 @@ VOID:STRING,STRING - VOID:UINT,UINT - VOID:STRING,INT - VOID:DOUBLE -+BOOLEAN:STRING -diff -up gdm-2.28.0/configure.ac.multistack gdm-2.28.0/configure.ac ---- gdm-2.28.0/configure.ac.multistack 2009-09-23 18:46:06.497641172 -0400 -+++ gdm-2.28.0/configure.ac 2009-09-23 18:46:06.800400573 -0400 -@@ -18,6 +18,22 @@ AC_PROG_CXX - AM_PROG_CC_C_O - AC_PROG_LIBTOOL() + +From dfa6b8d5ed60552f435c34c47bc45089fa3eef48 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Fri, 20 Feb 2009 13:52:19 -0500 +Subject: [PATCH 07/81] Add a comment marking protected api in chooser + +The chooser widget has methods that only its +subclasses are supposed to call. We should +mark them as such. +--- + gui/simple-greeter/gdm-chooser-widget.h | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/gui/simple-greeter/gdm-chooser-widget.h b/gui/simple-greeter/gdm-chooser-widget.h +index 578e613..7e3e59c 100644 +--- a/gui/simple-greeter/gdm-chooser-widget.h ++++ b/gui/simple-greeter/gdm-chooser-widget.h +@@ -136,6 +136,8 @@ int gdm_chooser_widget_get_number_of_items (GdmChooserWidget + void gdm_chooser_widget_activate_if_one_item (GdmChooserWidget *widget); + void gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget *widget); -+## increment if the plugin interface has additions, changes, removals. -+LT_CURRENT=1 ++/* Protected ++ */ + void gdm_chooser_widget_loaded (GdmChooserWidget *widget); + + G_END_DECLS +-- +1.6.5.1 + + +From 7b4e38d04e246d7dc4c446ed2a3c69fcc67257cb Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Fri, 6 Feb 2009 17:44:37 -0500 +Subject: [PATCH 08/81] Drop duplicated entry introspection output + +--- + daemon/gdm-greeter-server.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c +index 2e01d33..cecce83 100644 +--- a/daemon/gdm-greeter-server.c ++++ b/daemon/gdm-greeter-server.c +@@ -752,7 +752,6 @@ do_introspect (DBusConnection *connection, + " \n" + " \n" + " \n" +- " \n" + " \n" + " \n" + " \n" +-- +1.6.5.1 + + +From 8d5ddd913f13581df1662730745c1d906772185e Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Mon, 2 Mar 2009 10:07:03 -0500 +Subject: [PATCH 09/81] Make lookup_item not warn when passing NULL for args + +gtk_tree_model_get doesn't like NULL, and we allow +NULL for optional return values. + +We now check each argument for NULL and call +gtk_tree_model_get individually N times (one for +each argument) instead of just once. +--- + gui/simple-greeter/gdm-chooser-widget.c | 31 ++++++++++++++++++++++++------- + 1 files changed, 24 insertions(+), 7 deletions(-) + +diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c +index 2875456..cbd5072 100644 +--- a/gui/simple-greeter/gdm-chooser-widget.c ++++ b/gui/simple-greeter/gdm-chooser-widget.c +@@ -2171,13 +2171,30 @@ gdm_chooser_widget_lookup_item (GdmChooserWidget *widget, + } + g_free (active_item_id); + +- gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter, +- CHOOSER_IMAGE_COLUMN, image, +- CHOOSER_NAME_COLUMN, name, +- CHOOSER_PRIORITY_COLUMN, priority, +- CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use, +- CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate, +- -1); ++ if (image != NULL) { ++ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter, ++ CHOOSER_IMAGE_COLUMN, image, -1); ++ } + -+## increment any time the source changes; set to -+## 0 if you increment CURRENT -+LT_REVISION=0 ++ if (name != NULL) { ++ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter, ++ CHOOSER_NAME_COLUMN, name, -1); ++ } + -+## increment if any interfaces have been added; set to 0 -+## if any interfaces have been changed or removed. removal has -+## precedence over adding, so set to 0 if both happened. -+LT_AGE=0 ++ if (priority != NULL) { ++ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter, ++ CHOOSER_PRIORITY_COLUMN, priority, -1); ++ } + -+AC_SUBST(LT_CURRENT) -+AC_SUBST(LT_REVISION) -+AC_SUBST(LT_AGE) ++ if (is_in_use != NULL) { ++ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter, ++ CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use, -1); ++ } + - AC_HEADER_STDC ++ if (is_separate != NULL) { ++ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter, ++ CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate, -1); ++ } - AC_SUBST(VERSION) -@@ -51,6 +67,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0 - LIBCANBERRA_GTK_REQUIRED_VERSION=0.4 - #FONTCONFIG_REQUIRED_VERSION=2.6.0 - FONTCONFIG_REQUIRED_VERSION=2.5.0 -+NSS_REQUIRED_VERSION=3.11.1 + return TRUE; + } +-- +1.6.5.1 + + +From 57a0d19b8b1e5e7a2132b15ea2c536207b61f80f Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Fri, 6 Feb 2009 15:35:00 -0500 +Subject: [PATCH 10/81] Drop "stopped" signal from worker-job class + +It was unused, dead code. +--- + daemon/gdm-session-direct.c | 14 -------------- + daemon/gdm-session-worker-job.c | 11 ----------- + daemon/gdm-session-worker-job.h | 1 - + 3 files changed, 0 insertions(+), 26 deletions(-) + +diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c +index 47a5778..b6abae4 100644 +--- a/daemon/gdm-session-direct.c ++++ b/daemon/gdm-session-direct.c +@@ -1539,13 +1539,6 @@ gdm_session_direct_init (GdmSessionDirect *session) + } - EXTRA_COMPILE_WARNINGS(yes) + static void +-worker_stopped (GdmSessionWorkerJob *job, +- GdmSessionDirect *session) +-{ +- g_debug ("GdmSessionDirect: Worker job stopped"); +-} +- +-static void + worker_started (GdmSessionWorkerJob *job, + GdmSessionDirect *session) + { +@@ -1588,10 +1581,6 @@ start_worker (GdmSessionDirect *session) + session->priv->job = gdm_session_worker_job_new (); + gdm_session_worker_job_set_server_address (session->priv->job, session->priv->server_address); + g_signal_connect (session->priv->job, +- "stopped", +- G_CALLBACK (worker_stopped), +- session); +- g_signal_connect (session->priv->job, + "started", + G_CALLBACK (worker_started), + session); [...27981 lines suppressed...] -+ Makefile.in -diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/page.ui ---- /dev/null 2009-09-23 15:09:11.116404522 -0400 -+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/page.ui 2009-09-23 18:46:06.823391278 -0400 -@@ -0,0 +1,56 @@ -+ -+ -+ -+ -+ True -+ vertical -+ -+ -+ True -+ -+ -+ True -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ True -+ True -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ True -+ 0 -+ -+ -+ -+ -+ True -+ -+ -+ True -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ True -+ 1 -+ -+ -+ -+ -diff -up /dev/null gdm-2.28.0/gui/simple-greeter/plugins/smartcard/plugin.c ---- /dev/null 2009-09-23 15:09:11.116404522 -0400 -+++ gdm-2.28.0/gui/simple-greeter/plugins/smartcard/plugin.c 2009-09-23 18:46:06.825390205 -0400 -@@ -0,0 +1,40 @@ -+/* -+ * Copyright (C) 2009 Red Hat, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * Written By: Ray Strode -+ * -+ */ ++ for (i = 0; lines[i] ; i++) { ++ if (g_str_has_prefix (lines[i], "USEFPRINTD=") != FALSE) { ++ char *value; ++ ++ value = lines[i] + strlen ("USEFPRINTD="); ++ if (g_strcmp0 (value, "yes") == 0) { ++ ret = TRUE; ++ break; ++ } ++ } ++ } + -+#include "gdm-smartcard-extension.h" ++ g_strfreev (lines); + -+#include -+#include ++ return ret; + } + + static void +-- +1.6.5.1 + + +From f289a1f28d2000c00a35efa164cd207793be1b9f Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Thu, 29 Oct 2009 00:10:40 -0400 +Subject: [PATCH 80/81] don't activate invisible tasks + +--- + gui/simple-greeter/gdm-task-list.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/gui/simple-greeter/gdm-task-list.c b/gui/simple-greeter/gdm-task-list.c +index dd77ed6..c9d7451 100644 +--- a/gui/simple-greeter/gdm-task-list.c ++++ b/gui/simple-greeter/gdm-task-list.c +@@ -335,6 +335,10 @@ gdm_task_list_set_active_task (GdmTaskList *widget, + gboolean was_sensitive; + gboolean was_activated; + ++ if (!gdm_task_is_visible (task)) { ++ return FALSE; ++ } + -+GdmGreeterExtension * -+gdm_greeter_plugin_get_extension (void) -+{ -+ static GObject *extension; + was_sensitive = GTK_WIDGET_SENSITIVE (widget); + gtk_widget_set_sensitive (GTK_WIDGET (widget), TRUE); + +-- +1.6.5.1 + + +From 8144b99a3ab9511d85ff6169ca9612c350010612 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Thu, 29 Oct 2009 00:46:34 -0400 +Subject: [PATCH 81/81] Add lame check for smart card daemon + +We don't want to show the smart card bits if the daemon isn't running + +This is just a temporary hack. We need a better solution. +--- + .../plugins/smartcard/gdm-smartcard-extension.c | 18 +++++++++++++++++- + 1 files changed, 17 insertions(+), 1 deletions(-) + +diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c +index 9967d5f..903e18d 100644 +--- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c ++++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -312,7 +313,22 @@ gdm_smartcard_extension_is_choosable (GdmTask *task) + gboolean + gdm_smartcard_extension_is_visible (GdmTask *task) + { +- return TRUE; ++ char *contents; ++ pid_t pid; + -+ if (extension != NULL) { -+ g_object_ref (extension); -+ } else { -+ extension = g_object_new (GDM_TYPE_SMARTCARD_EXTENSION, NULL); -+ g_object_add_weak_pointer (extension, (gpointer *) &extension); ++ if (g_file_get_contents ("/var/run/pcscd.pid", ++ &contents, NULL, NULL) == FALSE) { ++ return FALSE; + } + -+ return GDM_GREETER_EXTENSION (extension); -+} ++ pid = (pid_t) atoi (contents); ++ g_free (contents); ++ ++ if (pid == 0) { ++ return FALSE; ++ } ++ ++ return kill (pid, 0); + } + + static void +-- +1.6.5.1 + gdm-system-keyboard.patch: configure.ac | 1 daemon/gdm-session-direct.c | 81 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 79 insertions(+), 3 deletions(-) Index: gdm-system-keyboard.patch =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-system-keyboard.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- gdm-system-keyboard.patch 20 Jul 2009 17:20:51 -0000 1.4 +++ gdm-system-keyboard.patch 2 Nov 2009 05:38:10 -0000 1.5 @@ -1,17 +1,22 @@ -diff -up gdm-2.25.2/configure.ac.system-keyboard gdm-2.25.2/configure.ac ---- gdm-2.25.2/configure.ac.system-keyboard 2009-02-24 22:51:00.058815966 -0500 -+++ gdm-2.25.2/configure.ac 2009-02-24 22:51:00.154816109 -0500 -@@ -69,6 +69,7 @@ AC_SUBST(COMMON_LIBS) - PKG_CHECK_MODULES(DAEMON, +# +# Description: Get default keyboard layout from hal +# Ubuntu: https://bugs.launchpad.net/bugs/395103 +# Fedora: http://cvs.fedoraproject.org/viewvc//devel/gdm/gdm-system-keyboard.patch?view=markup +# +diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/configure.ac gdm-2.28.0.new/configure.ac +--- gdm-2.28.0/configure.ac 2009-09-21 22:06:40.000000000 +0200 ++++ gdm-2.28.0.new/configure.ac 2009-10-01 12:35:50.345762314 +0200 +@@ -70,6 +70,7 @@ dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION -+ hal + gio-2.0 >= $GLIB_REQUIRED_VERSION ++ hal ) AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LIBS) -diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemon/gdm-session-direct.c ---- gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-session-direct.c 2009-02-24 22:55:02.656566009 -0500 +diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/daemon/gdm-session-direct.c gdm-2.28.0.new/daemon/gdm-session-direct.c +--- gdm-2.28.0/daemon/gdm-session-direct.c 2009-09-21 22:05:27.000000000 +0200 ++++ gdm-2.28.0.new/daemon/gdm-session-direct.c 2009-10-01 12:34:43.000000000 +0200 @@ -45,6 +45,8 @@ #include #include @@ -21,7 +26,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d #include "gdm-session-direct.h" #include "gdm-session.h" #include "gdm-session-private.h" -@@ -595,14 +597,66 @@ get_default_language_name (GdmSessionDir +@@ -598,14 +600,87 @@ return setlocale (LC_MESSAGES, NULL); } @@ -33,6 +38,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d + char **devices; + int n_devices; + char *layout; ++ char *variant; + char *result; + + result = NULL; @@ -60,8 +66,27 @@ diff -up gdm-2.25.2/daemon/gdm-session-d + "input.xkb.layout", + NULL); + } -+ result = g_strdup (layout); -+ libhal_free_string (layout); ++ if (!layout) ++ goto out; ++ ++ variant = libhal_device_get_property_string (ctx, ++ devices[0], ++ "input.x11_options.XkbVariant", ++ NULL); ++ if (!variant) { ++ variant = libhal_device_get_property_string (ctx, ++ devices[0], ++ "input.xkb.variant", ++ NULL); ++ } ++ ++ if (variant != NULL && variant[0] != '\0') { ++ result = g_strdup_printf("%s\t%s", layout, variant); ++ libhal_free_string (variant); ++ } else { ++ result = g_strdup (layout); ++ } ++ libhal_free_string (layout); + } + + libhal_free_string_array (devices); @@ -74,6 +99,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d + result = g_strdup ("us"); + } + ++ g_debug ("GdmSessionDirect: System default keyboard layout: '%s'", result); + return result; +} + @@ -82,7 +108,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d { - if (session->priv->saved_layout != NULL) { - return session->priv->saved_layout; -+ if (session->priv->saved_layout == NULL) { ++ if (!session->priv->saved_layout) { + session->priv->saved_layout = get_system_default_layout (session); } @@ -91,16 +117,3 @@ diff -up gdm-2.25.2/daemon/gdm-session-d } static char * -diff -up gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard gdm-2.25.2/daemon/gdm-session-settings.c ---- gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard 2008-08-26 15:04:00.000000000 -0400 -+++ gdm-2.25.2/daemon/gdm-session-settings.c 2009-02-24 22:51:00.158815919 -0500 -@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd - { - g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); - -- if (settings->priv->layout_name == NULL || -- strcmp (settings->priv->layout_name, layout_name) != 0) { -+ if (g_strcmp0 (settings->priv->layout_name, layout_name) != 0) { - settings->priv->layout_name = g_strdup (layout_name); - g_object_notify (G_OBJECT (settings), "layout-name"); - } Index: gdm.spec =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v retrieving revision 1.491 retrieving revision 1.492 diff -u -p -r1.491 -r1.492 --- gdm.spec 7 Oct 2009 18:25:58 -0000 1.491 +++ gdm.spec 2 Nov 2009 05:38:10 -0000 1.492 @@ -15,8 +15,8 @@ Summary: The GNOME Display Manager Name: gdm -Version: 2.28.0 -Release: 5%{?dist} +Version: 2.28.1 +Release: 20%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -95,17 +95,24 @@ Requires: audit-libs >= %{libauditver} Patch2: gdm-2.26.0-force-active-vt.patch Patch3: gdm-2.23.92-save-root-window.patch -# https://bugzilla.gnome.org/show_bug.cgi?id=596569 -Patch4: gdm-2.28.0-use-devicekit-power.patch - # uses /etc/sysconfig/keyboard and is thus not directly upstreamable # should probably be changed to get the system layout from the X server +# https://bugzilla.gnome.org/show_bug.cgi?id=572765 Patch13: gdm-system-keyboard.patch -Patch19: gdm-multistack.patch -Patch20: 0001-Fix-gdm_slave_get_timed_login_details.patch +Patch20: gdm-2.28.1-move-shutdown-functions.patch +Patch21: fix-clock.patch +Patch22: fix-timer.patch +Patch23: fix-na-tray.patch +Patch24: fix-computer-info.patch +Patch25: fix-run-dir-permissions.patch +Patch26: make-user-list-animation-smoother.patch +Patch27: 0001-Don-t-show-lock-screen-option-if-locked-down.patch +Patch96: gdm-multistack.patch # Fedora-specific +Patch97: gdm-bubble-location.patch +Patch98: tray-padding.patch Patch99: gdm-2.23.1-fedora-logo.patch %package user-switch-applet @@ -145,12 +152,20 @@ The GDM fingerprint plugin provides func %setup -q %patch2 -p1 -b .force-active-vt %patch3 -p1 -b .save-root-window -%patch4 -p1 -b .use-devicekit-power %patch13 -p1 -b .system-keyboard -%patch19 -p1 -b .multistack -%patch20 -p1 -b .autologin - +%patch20 -p1 -b .move-shutdown-functions +%patch21 -p1 -b .fix-clock +%patch22 -p1 -b .fix-timer +%patch23 -p1 -b .fix-na-tray +%patch24 -p1 -b .fix-computer-info +%patch25 -p1 -b .fix-run-dir-permission +%patch26 -p1 -b .make-user-list-animation-smoother +%patch27 -p1 -b .dont-show-lock-screen-if-locked-down + +%patch96 -p1 -b .multistack +%patch97 -p1 -b .bubble-location +%patch98 -p1 -b .tray-padding %patch99 -p1 -b .fedora-logo autoreconf -i -f @@ -219,6 +234,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/ # temporarily manually copy this cp -f %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/gdm/greeter + rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper find $RPM_BUILD_ROOT -name '*.a' -delete @@ -372,10 +389,12 @@ fi %config %{_datadir}/gdm/autostart/LoginWindow/* %dir %{_localstatedir}/log/gdm %dir %{_localstatedir}/spool/gdm +%dir %{_localstatedir}/run/gdm/greeter %attr(1770, gdm, gdm) %dir %{_localstatedir}/lib/gdm %attr(1750, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory %attr(1640, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml %attr(1640, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.path +%attr(1755, gdm, gdm) %dir %{_localstatedir}/run/gdm/greeter %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm %attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm @@ -400,8 +419,87 @@ fi %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so %changelog -* Wed Oct 07 2009 Ray Strode - 1:2.28.0-5 -- Fix xguest +* Sat Oct 31 2009 Matthias Clasen 2.28.1-20 +- Don't show 'Lock Screen' in the user switcher if locked down + +* Sat Oct 31 2009 Matthias Clasen 2.28.1-18 +- Actually set up statusicon padding + +* Fri Oct 30 2009 Ray Strode 2.28.1-17 +- Make the user list slide animation smoother + +* Thu Oct 29 2009 Ray Strode 2.28.1-16 +- Shrink autologin timer +- Make language dialog not double spaced + +* Thu Oct 29 2009 Ray Strode 2.28.1-15 +- Don't show fingerprint task button unless fingerprint is + enabled +- Don't show smartcard task button and list item unless + pcscd is running. + +* Wed Oct 28 2009 Ray Strode 2.28.1-14 +- Don't show image on login button + +* Wed Oct 28 2009 Ray Strode 2.28.1-13 +- Fix double free during user switching (might address + bug 512944) + +* Tue Oct 27 2009 Ray Strode 2.28.1-12 +- One more go at bug 527920 + +* Tue Oct 27 2009 Ray Strode 2.28.1-11 +- Tighten permissions on /var/run/gdm (bug 531063) + +* Mon Oct 26 2009 Ray Strode 2.28.1-10 +- Position shutdown menu properly on multihead machines + +* Fri Oct 23 2009 Ray Strode 2.28.1-9 +- Don't show hostname by default if it's localhost + +* Fri Oct 23 2009 Ray Strode 2.28.1-8 +- Attempt to fix crash some users see. +- Clean up rebase + +* Fri Oct 23 2009 Ray Strode 2.28.1-7 +- Show Other user even when there are no other users + (bug 527920) + +* Fri Oct 23 2009 Ray Strode 2.28.1-6 +- Properly read default keyboard layout (bug 530452) + +* Fri Oct 23 2009 Ray Strode 2.28.1-5 +- Remove tool tip from login button + +* Thu Oct 22 2009 Ray Strode 2.28.1-4 +- Fix autologin window spasms +- Fix autologin timer animation +- Make autologin and multistack play better together +- Add padding to notification tray + +* Wed Oct 21 2009 Ray Strode 2.28.1-3 +- Move date from panel to clock tooltip + +* Tue Oct 20 2009 Ray Strode 2.28.1-2 +- Move shutdown functions to panel from login window + +* Tue Oct 20 2009 Ray Strode 2.28.1-1 +- Update to 2.28.1 + +* Fri Oct 09 2009 Ray Strode 2.28.0-9 +- Fix Other... user. + +* Fri Oct 9 2009 Matthias Clasen - 1:2.28.0-8 +- Move bubbles to the lower right on the login screen + +* Wed Oct 07 2009 Ray Strode - 1:2.28.0-7 +- Fix gdm-password / xguest interaction (bug 524421) + +* Mon Oct 5 2009 Matthias Clasen - 1:2.28.4-6 +- Fix the autostart file for at-spi-registryd + +* Thu Oct 1 2009 Matthias Clasen - 1:2.28.4-5 +- Handle keyboard layout variants * Mon Sep 28 2009 Ray Strode - 1:2.28.0-4 - Add cache dir to package manifest Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gdm/devel/sources,v retrieving revision 1.114 retrieving revision 1.115 diff -u -p -r1.114 -r1.115 --- sources 23 Sep 2009 22:34:45 -0000 1.114 +++ sources 2 Nov 2009 05:38:10 -0000 1.115 @@ -1 +1 @@ -7724929a6b75ba269fd519d4a4995bbb gdm-2.28.0.tar.bz2 +917dc80f5ef6adcdc15193de238476db gdm-2.28.1.tar.bz2 --- 0001-Fix-gdm_slave_get_timed_login_details.patch DELETED --- --- gdm-2.27.4-multistack.patch DELETED --- --- gdm-2.28.0-use-devicekit-power.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:40:41 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:40:41 +0000 (UTC) Subject: rpms/gnome-applets/F-12 gweather-network.patch, 1.5, NONE polkit1.patch, 1.2, NONE Message-ID: <20091102054041.0917811C0419@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-applets/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16970 Removed Files: gweather-network.patch polkit1.patch Log Message: Drop dead patches --- gweather-network.patch DELETED --- --- polkit1.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:42:41 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:42:41 +0000 (UTC) Subject: rpms/gnome-applets/devel seriesid-clash.patch, NONE, 1.1 gnome-applets.spec, 1.354, 1.355 gweather-network.patch, 1.5, NONE polkit1.patch, 1.2, NONE Message-ID: <20091102054241.BD61111C02A5@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-applets/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17676 Modified Files: gnome-applets.spec Added Files: seriesid-clash.patch Removed Files: gweather-network.patch polkit1.patch Log Message: Copy F12 work over seriesid-clash.patch: invest-applet.omf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE seriesid-clash.patch --- diff -up gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in --- gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid 2009-10-27 00:25:35.351806142 -0400 +++ gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in 2009-10-27 00:29:15.578549690 -0400 @@ -3,7 +3,7 @@ user's guide - + Index: gnome-applets.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.354 retrieving revision 1.355 diff -u -p -r1.354 -r1.355 --- gnome-applets.spec 22 Sep 2009 03:28:49 -0000 1.354 +++ gnome-applets.spec 2 Nov 2009 05:42:39 -0000 1.355 @@ -33,7 +33,7 @@ Summary: Small applications for the GNOME panel Name: gnome-applets Version: 2.28.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -61,6 +61,9 @@ Patch41: gnome-applets-no-mixer-icon.pat # do the nullapplet dance for stickynotes Patch42: stickynotes-null.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=599728 +Patch44: seriesid-clash.patch + BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} @@ -150,6 +153,7 @@ tar xjf %{SOURCE2} %patch3 -p1 -b .ppp-command %patch34 -p1 -b .ppp-includes %patch35 -p1 -b .modemlights-libgnome +%patch44 -p1 -b .seriesid autoreconf -i -f @@ -342,6 +346,9 @@ fi %changelog +* Tue Oct 27 2009 Matthias Clasen - 1:2.28.0-2 +- Fix a help file seriesid clash between accessx-status and invest-applet + * Mon Sep 21 2009 Matthias Clasen - 1:2.28.0-1 - Update to 2.28.0 --- gweather-network.patch DELETED --- --- polkit1.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:50:45 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:50:45 +0000 (UTC) Subject: rpms/control-center/devel about-me-delete.patch, NONE, 1.1 best-shapes.patch, NONE, 1.1 finger-icons.patch, NONE, 1.1 keybinding-bugs.patch, NONE, 1.1 mirror-crash.patch, NONE, 1.1 shell-markup.patch, NONE, 1.1 control-center.spec, 1.493, 1.494 make-default.patch, 1.13, 1.14 sources, 1.98, 1.99 notification-theme.patch, 1.7, NONE slideshow-ui.patch, 1.2, NONE Message-ID: <20091102055046.2F22011C0417@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/control-center/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20457 Modified Files: control-center.spec make-default.patch sources Added Files: about-me-delete.patch best-shapes.patch finger-icons.patch keybinding-bugs.patch mirror-crash.patch shell-markup.patch Removed Files: notification-theme.patch slideshow-ui.patch Log Message: Copy F12 work over about-me-delete.patch: gnome-about-me.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- NEW FILE about-me-delete.patch --- diff -up gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c.about-me-delete gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c --- gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c.about-me-delete 2009-08-17 04:40:16.000000000 -0400 +++ gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c 2009-10-06 00:18:40.622398272 -0400 @@ -72,6 +71,7 @@ typedef struct { gchar *username; guint commit_timeout_id; + gboolean destroyed; } GnomeAboutMe; static GnomeAboutMe *me = NULL; @@ -183,7 +183,8 @@ about_me_destroy (GnomeAboutMe *me) g_free (me->person); g_free (me->login); g_free (me->username); - g_free (me); + + me->destroyed = TRUE; } static void @@ -275,6 +276,9 @@ about_me_focus_out (GtkWidget *widget, G const gchar *wid; gint i; + if (me->destroyed) + return FALSE; + wid = gtk_widget_get_name (widget); if (wid == NULL) best-shapes.patch: appearance-font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE best-shapes.patch --- diff -up gnome-control-center-2.28.1/capplets/appearance/appearance-font.c.best-shapes gnome-control-center-2.28.1/capplets/appearance/appearance-font.c --- gnome-control-center-2.28.1/capplets/appearance/appearance-font.c.best-shapes 2009-10-26 18:30:50.497797557 -0400 +++ gnome-control-center-2.28.1/capplets/appearance/appearance-font.c 2009-10-26 18:31:03.035808184 -0400 @@ -952,7 +952,7 @@ font_init (AppearanceData *data) ANTIALIAS_NONE, HINT_FULL); setup_font_pair (appearance_capplet_get_widget (data, "best_shapes_radio"), appearance_capplet_get_widget (data, "best_shapes_sample"), - ANTIALIAS_GRAYSCALE, HINT_MEDIUM); + ANTIALIAS_GRAYSCALE, HINT_SLIGHT); setup_font_pair (appearance_capplet_get_widget (data, "best_contrast_radio"), appearance_capplet_get_widget (data, "best_contrast_sample"), ANTIALIAS_GRAYSCALE, HINT_FULL); finger-icons.patch: gnome-about-me-fingerprint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE finger-icons.patch --- diff -up gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c.finger-icons gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c --- gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c.finger-icons 2009-10-26 13:02:36.578802754 -0400 +++ gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c 2009-10-26 13:03:11.893802706 -0400 @@ -468,7 +468,7 @@ assistant_prepare (GtkAssistant *ass, Gt { char *filename; - filename = g_strdup_printf ("%s.png", data->finger); + filename = g_strdup_printf ("%s.svg", data->finger); path = g_build_filename (GNOMECC_PIXMAP_DIR, filename, NULL); g_free (filename); } keybinding-bugs.patch: gnome-keybinding-properties.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) --- NEW FILE keybinding-bugs.patch --- >From e0c60bbd3064a67b975d92adc417878ea8949c95 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 1 Oct 2009 12:45:25 +1000 Subject: [PATCH] Fix broken logic in keybinding tree model --- capplets/keybindings/gnome-keybinding-properties.c | 24 ++++++++----------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 6e36e34..0b62f8c 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -522,11 +522,10 @@ find_section (GtkTreeModel *model, GtkTreeIter *iter, const char *title) { - gboolean success, found; + gboolean success; - found = FALSE; success = gtk_tree_model_get_iter_first (model, iter); - while (success && !found) + while (success) { char *description = NULL; @@ -534,16 +533,15 @@ find_section (GtkTreeModel *model, DESCRIPTION_COLUMN, &description, -1); - found = (g_strcmp0 (description, title) == 0); + if (g_strcmp0 (description, title) == 0) + return; success = gtk_tree_model_iter_next (model, iter); } - if (!found) - { - gtk_tree_store_append (GTK_TREE_STORE (model), iter, NULL); - gtk_tree_store_set (GTK_TREE_STORE (model), iter, - DESCRIPTION_COLUMN, title, - -1); - } + + gtk_tree_store_append (GTK_TREE_STORE (model), iter, NULL); + gtk_tree_store_set (GTK_TREE_STORE (model), iter, + DESCRIPTION_COLUMN, title, + -1); } static void @@ -555,7 +553,6 @@ append_keys_to_tree (GtkBuilder *builder, GtkTreeIter parent_iter, iter; GtkTreeModel *model; gint i, j; - gint rows_before; client = gconf_client_get_default (); model = gtk_tree_view_get_model (GTK_TREE_VIEW (gtk_builder_get_object (builder, "shortcut_treeview"))); @@ -571,7 +568,6 @@ append_keys_to_tree (GtkBuilder *builder, * then we need to scroll now */ ensure_scrollbar (builder, i - 1); - rows_before = i; for (j = 0; keys_list[j].name != NULL; j++) { GConfEntry *entry; @@ -689,7 +685,7 @@ append_keys_to_tree (GtkBuilder *builder, g_object_unref (client); /* Don't show an empty section */ - if (i == rows_before) + if (gtk_tree_model_iter_n_children (model, &parent_iter) == 0) gtk_tree_store_remove (GTK_TREE_STORE (model), &parent_iter); if (i == 0) -- 1.6.3.3 mirror-crash.patch: xrandr-capplet.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) --- NEW FILE mirror-crash.patch --- --- gnome-control-center-2.28.0/capplets/display/xrandr-capplet.c 2009-08-24 06:54:41.000000000 -0400 +++ hacked/capplets/display/xrandr-capplet.c 2009-09-30 09:29:05.160839814 -0400 @@ -516,6 +516,7 @@ { int i; GnomeRRMode **modes; + int best_w, best_h; const char *current; clear_combo (app->resolution_combo); @@ -533,6 +534,8 @@ gtk_widget_set_sensitive (app->resolution_combo, TRUE); + best_w = 0; + best_h = 0; for (i = 0; modes[i] != NULL; ++i) { int width, height; @@ -543,12 +546,21 @@ add_key (app->resolution_combo, idle_free (make_resolution_string (width, height)), width, height, 0, -1); + + if (width * height > best_w * best_h) + { + best_w = width; + best_h = height; + } } current = idle_free (make_resolution_string (app->current_output->width, app->current_output->height)); if (!combo_select (app->resolution_combo, current)) - g_assert_not_reached (); + { + combo_select (app->resolution_combo, + idle_free (make_resolution_string (best_w, best_h))); + } } static void shell-markup.patch: app-shell.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- NEW FILE shell-markup.patch --- diff -up gnome-control-center-2.28.0/libslab/app-shell.c.shell-markup gnome-control-center-2.28.0/libslab/app-shell.c --- gnome-control-center-2.28.0/libslab/app-shell.c.shell-markup 2009-10-02 01:03:41.999269098 -0400 +++ gnome-control-center-2.28.0/libslab/app-shell.c 2009-10-02 01:05:13.150267868 -0400 @@ -726,7 +726,6 @@ static void show_no_results_message (AppShellData * app_data, GtkWidget * containing_vbox) { gchar *markup; - gchar *str1; gchar *str2; if (!app_data->filtered_out_everything_widget) @@ -750,8 +749,7 @@ show_no_results_message (AppShellData * gtk_container_add (GTK_CONTAINER (app_data->filtered_out_everything_widget), hbox); } - str1 = g_strdup_printf ("%s", app_data->filter_string); - str2 = g_strdup_printf (_("Your filter \"%s\" does not match any items."), str1); + str2 = g_strdup_printf (_("Your filter \"%s\" does not match any items."), app_data->filter_string); markup = g_markup_printf_escaped ("%s\n\n%s", _("No matches found."), str2); gtk_label_set_text (app_data->filtered_out_everything_widget_label, markup); @@ -759,6 +757,7 @@ show_no_results_message (AppShellData * gtk_box_pack_start (GTK_BOX (containing_vbox), app_data->filtered_out_everything_widget, TRUE, TRUE, 0); g_free (markup); + g_free (str2); } static void Index: control-center.spec =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v retrieving revision 1.493 retrieving revision 1.494 diff -u -p -r1.493 -r1.494 --- control-center.spec 29 Sep 2009 02:22:33 -0000 1.493 +++ control-center.spec 2 Nov 2009 05:50:43 -0000 1.494 @@ -23,8 +23,8 @@ Summary: Utilities to configure the GNOME desktop Name: control-center -Version: 2.28.0 -Release: 11%{?dist} +Version: 2.28.1 +Release: 3%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -58,6 +58,22 @@ Patch47: save-as.patch # https://bugzilla.gnome.org/show_bug.cgi?id=596369 Patch50: fix-background-tooltips.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=593866 +Patch51: mirror-crash.patch + +# https://bugzilla.gnome.org/show_bug.cgi?id=597066 +Patch52: shell-markup.patch + +# https://bugzilla.gnome.org/show_bug.cgi?id=596939 +Patch53: keybinding-bugs.patch + +# https://bugzilla.gnome.org/show_bug.cgi?id=592348 +Patch54: about-me-delete.patch + +Patch55: finger-icons.patch + +Patch56: best-shapes.patch + # call the Fedora/RHEL graphical passwd changing apps Patch95: gnome-control-center-2.25.2-passwd.patch Patch96: gnome-control-center-2.25.2-gecos.patch @@ -192,6 +208,12 @@ for the GNOME desktop. %patch46 -p1 -b .no-tweaks %patch47 -p1 -b .save-as %patch50 -p1 -b .fix-background-tooltips +%patch51 -p1 -b .mirror-crash +%patch52 -p1 -b .shell-markup +%patch53 -p1 -b .keybinding-bugs +%patch54 -p1 -b .about-me-delete +%patch55 -p1 -b .finger-icons +%patch56 -p1 -b .best-shapes # vendor configuration patches %patch95 -p1 -b .passwd @@ -382,6 +404,31 @@ fi %changelog +* Mon Oct 26 2009 Matthias Clasen 2.28.1-3 +- Change 'Best shapes' to mean grayscale+slight + +* Mon Oct 26 2009 Matthias Clasen 2.28.1-2 +- Fix missing fingerprint icons + +* Mon Oct 19 2009 Matthias Clasen 2.28.1-1 +- Update to 2.28.1, just translation updates + +* Fri Oct 9 2009 Matthias Clasen 2.28.0-16 +- Cosmetic change to the background tab in the appearance capplet + +* Tue Oct 6 2009 Matthias Clasen 2.28.0-15 +- Fix a crash in the about-me capplet (#525590) + +* Fri Oct 2 2009 Matthias Clasen 2.28.0-14 +- Fix some logic errors in the keybinding capplet that can lead + to missing entries + +* Fri Oct 2 2009 Matthias Clasen 2.28.0-13 +- Don't show markup in the UI + +* Wed Sep 30 2009 Matthias Clasen 2.28.0-12 +- Fix a crash in the display capplet + * Mon Sep 28 2009 Matthias Clasen 2.28.0-11 - Steal translations for "Make Default" from gnome-power-manager make-default.patch: appearance-desktop.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) Index: make-default.patch =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/make-default.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- make-default.patch 23 Sep 2009 22:16:29 -0000 1.13 +++ make-default.patch 2 Nov 2009 05:50:43 -0000 1.14 @@ -1,6 +1,6 @@ diff -up gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c ---- gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default 2009-09-21 06:44:55.000000000 -0400 -+++ gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c 2009-09-23 18:13:49.115396173 -0400 +--- gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default 2009-10-09 21:43:13.443819939 -0400 ++++ gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c 2009-10-09 21:45:48.428819404 -0400 @@ -31,6 +31,8 @@ #include #include @@ -10,7 +10,7 @@ diff -up gnome-control-center-2.28.0/cap enum { TARGET_URI_LIST, TARGET_BGIMAGE -@@ -984,6 +986,100 @@ wp_select_after_realize (GtkWidget *widg +@@ -984,6 +986,99 @@ wp_select_after_realize (GtkWidget *widg select_item (data, item, TRUE); } @@ -101,7 +101,6 @@ diff -up gnome-control-center-2.28.0/cap + g_error_free (error); + } + -+ g_print ("calling CanSetSystem: %d\n", result); + g_object_unref (proxy); + +out: @@ -111,7 +110,7 @@ diff -up gnome-control-center-2.28.0/cap static GdkPixbuf *buttons[3]; static void -@@ -1146,6 +1242,8 @@ desktop_init (AppearanceData *data, +@@ -1146,6 +1241,8 @@ desktop_init (AppearanceData *data, { GtkWidget *add_button, *w; GtkCellRenderer *cr; @@ -119,27 +118,24 @@ diff -up gnome-control-center-2.28.0/cap + GtkWidget *widget, *box, *button; char *url; - g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL); -@@ -1295,6 +1393,24 @@ desktop_init (AppearanceData *data, + data->wp_update_gconf = TRUE; +@@ -1294,6 +1391,21 @@ desktop_init (AppearanceData *data, /* create the file selector later to save time on startup */ data->wp_filesel = NULL; -+ widget = appearance_capplet_get_widget (data, "background_vbox"); -+ box = gtk_hbox_new (FALSE, 0); -+ gtk_box_pack_end (GTK_BOX (widget), box, FALSE, FALSE, 0); -+ + action = gtk_action_new ("set-system", + _("Make Default"), + _("Set the current background as the system-wide default"), + NULL); + check_can_set_background (action); -+ ++ + button = gtk_button_new (); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action); + gtk_widget_set_no_show_all (button, TRUE); + g_object_unref (action); + -+ gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0); ++ box = appearance_capplet_get_widget (data, "hbox_get_more"); ++ gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 6); + + g_signal_connect (action, "activate", G_CALLBACK (set_background), data); } Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v retrieving revision 1.98 retrieving revision 1.99 diff -u -p -r1.98 -r1.99 --- sources 22 Sep 2009 05:48:17 -0000 1.98 +++ sources 2 Nov 2009 05:50:43 -0000 1.99 @@ -1 +1 @@ -c0e009ed5d94d12a183b61136dd908de gnome-control-center-2.28.0.tar.bz2 +a37a1b5ff4cfce45baef0cf31126d380 gnome-control-center-2.28.1.tar.bz2 --- notification-theme.patch DELETED --- --- slideshow-ui.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:53:17 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:53:17 +0000 (UTC) Subject: rpms/file-roller/F-12 cab.patch,1.1,NONE Message-ID: <20091102055318.ECB2911C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/file-roller/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21670 Removed Files: cab.patch Log Message: Drop dead patches --- cab.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:55:52 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:55:52 +0000 (UTC) Subject: rpms/file-roller/devel sticky-dnd.patch, NONE, 1.1 file-roller.spec, 1.156, 1.157 sources, 1.93, 1.94 cab.patch, 1.1, NONE Message-ID: <20091102055553.013FF11C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/file-roller/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22437 Modified Files: file-roller.spec sources Added Files: sticky-dnd.patch Removed Files: cab.patch Log Message: Copy F12 work over sticky-dnd.patch: eggtreemultidnd.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) --- NEW FILE sticky-dnd.patch --- --- file-roller-2.28.1/src/eggtreemultidnd.c 2009-10-19 13:53:45.000000000 -0400 +++ hacked/src/eggtreemultidnd.c 2009-10-29 23:23:12.660790804 -0400 @@ -179,8 +179,14 @@ priv_data->event_list = NULL; priv_data->pending_event = FALSE; - g_signal_handler_disconnect (widget, priv_data->motion_notify_handler); - g_signal_handler_disconnect (widget, priv_data->button_release_handler); + if (priv_data->motion_notify_handler) { + g_signal_handler_disconnect (widget, priv_data->motion_notify_handler); + priv_data->motion_notify_handler = 0; + } + if (priv_data->button_release_handler) { + g_signal_handler_disconnect (widget, priv_data->button_release_handler); + priv_data->button_release_handler = 0; + } } @@ -401,16 +407,23 @@ priv_data->event_list = g_slist_append (priv_data->event_list, gdk_event_copy ((GdkEvent*)event)); - priv_data->motion_notify_handler = - g_signal_connect (G_OBJECT (tree_view), - "motion_notify_event", - G_CALLBACK (egg_tree_multi_drag_motion_event), - NULL); - priv_data->button_release_handler = - g_signal_connect (G_OBJECT (tree_view), - "button_release_event", - G_CALLBACK (egg_tree_multi_drag_button_release_event), - NULL); + if (priv_data->motion_notify_handler == 0) + { + priv_data->motion_notify_handler = + g_signal_connect (G_OBJECT (tree_view), + "motion_notify_event", + G_CALLBACK (egg_tree_multi_drag_motion_event), + NULL); + } + + if (priv_data->button_release_handler == 0) + { + priv_data->button_release_handler = + g_signal_connect (G_OBJECT (tree_view), + "button_release_event", + G_CALLBACK (egg_tree_multi_drag_button_release_event), + NULL); + } if (priv_data->drag_data_get_handler == 0) { Index: file-roller.spec =================================================================== RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -p -r1.156 -r1.157 --- file-roller.spec 22 Sep 2009 00:51:25 -0000 1.156 +++ file-roller.spec 2 Nov 2009 05:55:51 -0000 1.157 @@ -10,13 +10,16 @@ Summary: Tool for viewing and creating archives Name: file-roller -Version: 2.28.0 -Release: 1%{?dist} +Version: 2.28.1 +Release: 2%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ Source: http://download.gnome.org/sources/file-roller/2.28/file-roller-%{version}.tar.bz2 +# https://bugzilla.gnome.org/show_bug.cgi?id=590606 +Patch0: sticky-dnd.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -51,6 +54,7 @@ such as tar or zip files. %prep %setup -q +%patch0 -p1 -b .sticky-dnd %build %configure --disable-scrollkeeper --disable-static @@ -127,6 +131,15 @@ fi %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Thu Oct 29 2009 Matthias Clasen 2.28.1-2 +- Fix sticky DND + +* Mon Oct 19 2009 Matthias Clasen 2.28.1-1 +- Update to 2.28.1 + +* Thu Oct 1 2009 Matthias Clasen 2.28.0-2 +- Respect button-images setting + * Mon Sep 21 2009 Matthias Clasen 2.28.0-1 - Update to 2.28.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v retrieving revision 1.93 retrieving revision 1.94 diff -u -p -r1.93 -r1.94 --- sources 22 Sep 2009 00:51:25 -0000 1.93 +++ sources 2 Nov 2009 05:55:52 -0000 1.94 @@ -1 +1 @@ -dcb0c887d5d287a28ebb5c0ea69bedfa file-roller-2.28.0.tar.bz2 +fcba40a9aa04386dec961a2f776777c5 file-roller-2.28.1.tar.bz2 --- cab.patch DELETED --- From mclasen at fedoraproject.org Mon Nov 2 05:59:47 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 05:59:47 +0000 (UTC) Subject: rpms/compiz/devel unknown-key.patch, NONE, 1.1 compiz.spec, 1.183, 1.184 compiz-0.3.6-wnck-modal-window.patch, 1.1, NONE Message-ID: <20091102055947.36C0011C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/compiz/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23665 Modified Files: compiz.spec Added Files: unknown-key.patch Removed Files: compiz-0.3.6-wnck-modal-window.patch Log Message: Copy F12 work over unknown-key.patch: 50-compiz-desktop-key.xml.in | 10 +++++----- 50-compiz-key.xml.in | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) --- NEW FILE unknown-key.patch --- diff -up compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in.unknown-key compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in --- compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in.unknown-key 2009-10-26 19:31:49.714797414 -0400 +++ compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in 2009-10-26 19:32:47.250797450 -0400 @@ -1,16 +1,16 @@ - + - + - + - + - + diff -up compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in.unknown-key compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in --- compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in.unknown-key 2009-10-26 19:33:00.669802869 -0400 +++ compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in 2009-10-26 19:47:07.630802031 -0400 @@ -15,9 +15,9 @@ - + - + Index: compiz.spec =================================================================== RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v retrieving revision 1.183 retrieving revision 1.184 diff -u -p -r1.183 -r1.184 --- compiz.spec 21 Sep 2009 16:03:20 -0000 1.183 +++ compiz.spec 2 Nov 2009 05:59:45 -0000 1.184 @@ -13,7 +13,7 @@ URL: http://www.go-compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.8.2 -Release: 15%{?dist} +Release: 18%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +69,8 @@ Patch125: compiz-0.8.2-gnome-terminal.pa #Fix build Patch126: compiz-0.8.2-gconf-buildfix.patch +Patch127: unknown-key.patch + %description Compiz is one of the first OpenGL-accelerated compositing window managers for the X Window System. The integration allows it to perform @@ -137,6 +139,7 @@ and other kde integration related stuff. %patch123 -p1 -b .initial-plugins %patch125 -p1 -b .gnome-terminal %patch126 -p1 -b .gconf +%patch127 -p1 -b .unknown-key %build rm -rf $RPM_BUILD_ROOT @@ -217,7 +220,6 @@ for f in %{gnome_plugins}; do echo %{_datadir}/compiz/$f.xml done >> gnome-files.txt - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -316,6 +318,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 26 2009 Matthias Clasen - 0.8.2-18 +- Better fix for keybindings + +* Mon Oct 26 2009 Adel Gadllah - 0.8.2-17 +- Fix was wrong - revert it + +* Mon Oct 26 2009 Adel Gadllah - 0.8.2-16 +- Don't ship broken keybindings files RH #530603 + * Mon Sep 21 2009 Adel Gadllah - 0.8.2-15 - Revert pageflip patch --- compiz-0.3.6-wnck-modal-window.patch DELETED --- From petersen at fedoraproject.org Mon Nov 2 06:12:46 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 2 Nov 2009 06:12:46 +0000 (UTC) Subject: comps comps-f12.xml.in,1.183,1.184 Message-ID: <20091102061246.8D90E11C00E8@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/extras/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26617 Modified Files: comps-f12.xml.in Log Message: @input-methods: install gtk2-immodule-xim for gtk2 to enable X locale compose and provide a consistent input experience across gtk, qt and x apps Index: comps-f12.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-f12.xml.in,v retrieving revision 1.183 retrieving revision 1.184 diff -u -p -r1.183 -r1.184 --- comps-f12.xml.in 2 Nov 2009 04:45:58 -0000 1.183 +++ comps-f12.xml.in 2 Nov 2009 06:12:45 -0000 1.184 @@ -3206,6 +3206,7 @@ true true + gtk2-immodule-xim ibus-gtk ibus-qt imsettings-xfce From petersen at fedoraproject.org Mon Nov 2 06:37:22 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 2 Nov 2009 06:37:22 +0000 (UTC) Subject: rpms/imsettings/F-12 imsettings-none.conf-gtk-xim-default.patch, NONE, 1.1 imsettings.spec, 1.44, 1.45 Message-ID: <20091102063723.7D1B711C00E8@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/imsettings/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2996 Modified Files: imsettings.spec Added Files: imsettings-none.conf-gtk-xim-default.patch Log Message: - none.conf: default GTK to xim if available like qt does to fix current missing X locale compose for gtk and X (#505100) imsettings-none.conf-gtk-xim-default.patch: none.in.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- NEW FILE imsettings-none.conf-gtk-xim-default.patch --- diff -u imsettings-0.107.4/data/none.in.in\~ imsettings-0.107.4/data/none.in.in --- imsettings-0.107.4/data/none.in.in~ 2008-11-05 21:26:53.000000000 +1000 +++ imsettings-0.107.4/data/none.in.in 2009-11-02 11:44:08.000000000 +1000 @@ -1,6 +1,12 @@ XIM=none XIM_PROGRAM= XIM_ARGS= -GTK_IM_MODULE=gtk-im-context-simple +if [ -f /usr/lib/gtk-2.0/*/immodules/im-xim.so -o \ + -f /usr/lib64/gtk-2.0/*/immodules/im-xim.so ]; +then + GTK_IM_MODULE=xim +else + GTK_IM_MODULE=gtk-im-context-simple +fi QT_IM_MODULE=xim IMSETTINGS_IGNORE_ME=yes Index: imsettings.spec =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/F-12/imsettings.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- imsettings.spec 16 Oct 2009 10:30:46 -0000 1.44 +++ imsettings.spec 2 Nov 2009 06:37:20 -0000 1.45 @@ -1,6 +1,6 @@ Name: imsettings Version: 0.107.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://code.google.com/p/imsettings/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,6 +18,7 @@ Source0: http://imsettings.googlecode.co Source1: imsettings-kde.sh Patch0: imsettings-constraint-of-language.patch Patch1: imsettings-disable-xim.patch +Patch2: imsettings-none.conf-gtk-xim-default.patch Summary: Delivery framework for general Input Method configuration Group: Applications/System @@ -86,6 +87,7 @@ This package contains a plugin to get th %setup -q %patch0 -p1 -b .0-lang %patch1 -p1 -b .1-xim +%patch2 -p1 -b .2-xim %build %configure \ @@ -211,6 +213,10 @@ fi %changelog +* Mon Nov 2 2009 Jens Petersen - 0.107.4-3 +- none.conf: default GTK to xim if available like qt does to fix + current missing X locale compose for gtk and X (#505100) + * Fri Oct 16 2009 Akira TAGOH - 0.107.4-2 - Run IM for Mailthili by default. (#529144) From hedayat at fedoraproject.org Mon Nov 2 06:38:22 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Mon, 2 Nov 2009 06:38:22 +0000 (UTC) Subject: comps comps-f12.xml.in,1.184,1.185 comps-f13.xml.in,1.71,1.72 Message-ID: <20091102063822.2C1FF11C00E8@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3324 Modified Files: comps-f12.xml.in comps-f13.xml.in Log Message: Add SIL Lateef font to desired categories Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.184 retrieving revision 1.185 diff -u -p -r1.184 -r1.185 --- comps-f12.xml.in 2 Nov 2009 06:12:45 -0000 1.184 +++ comps-f12.xml.in 2 Nov 2009 06:38:18 -0000 1.185 @@ -113,6 +113,7 @@ paktype-tehreer-fonts m17n-db-arabic scim-tables-arabic + sil-lateef-fonts sil-scheherazade-fonts @@ -2023,6 +2024,7 @@ sil-gentium-basic-book-fonts sil-gentium-basic-fonts sil-gentium-fonts + sil-lateef-fonts sil-scheherazade-fonts silkscreen-expanded-fonts silkscreen-fonts @@ -4771,6 +4773,7 @@ moodle-fa sil-scheherazade-fonts m17n-db-farsi + sil-lateef-fonts Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.71 retrieving revision 1.72 diff -u -p -r1.71 -r1.72 --- comps-f13.xml.in 2 Nov 2009 02:52:38 -0000 1.71 +++ comps-f13.xml.in 2 Nov 2009 06:38:19 -0000 1.72 @@ -113,6 +113,7 @@ paktype-tehreer-fonts m17n-db-arabic scim-tables-arabic + sil-lateef-fonts sil-scheherazade-fonts @@ -4745,6 +4746,7 @@ moodle-fa sil-scheherazade-fonts m17n-db-farsi + sil-lateef-fonts From bskeggs at fedoraproject.org Mon Nov 2 06:52:10 2009 From: bskeggs at fedoraproject.org (Ben Skeggs) Date: Mon, 2 Nov 2009 06:52:10 +0000 (UTC) Subject: rpms/xorg-x11-drv-nouveau/F-12 .cvsignore, 1.50, 1.51 nouveau-bicubic-2x.patch, 1.18, 1.19 nouveau-multiple-xserver.patch, 1.20, 1.21 nouveau-tile7000.patch, 1.8, 1.9 sources, 1.51, 1.52 xorg-x11-drv-nouveau.spec, 1.63, 1.64 Message-ID: <20091102065210.BA60411C00E8@cvs1.fedora.phx.redhat.com> Author: bskeggs Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8749 Modified Files: .cvsignore nouveau-bicubic-2x.patch nouveau-multiple-xserver.patch nouveau-tile7000.patch sources xorg-x11-drv-nouveau.spec Log Message: * Mon Nov 02 2009 Ben Skeggs 0.0.15-16.20091030git5587f40 - force all pixmaps into system memory initally on low memory cards Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- .cvsignore 27 Oct 2009 07:57:20 -0000 1.50 +++ .cvsignore 2 Nov 2009 06:52:08 -0000 1.51 @@ -1 +1 @@ -xf86-video-nouveau-0.0.15-20091022git718a41b.tar.bz2 +xf86-video-nouveau-0.0.15-20091030git5587f40.tar.bz2 nouveau-bicubic-2x.patch: nv30_xv_tex.c | 2 +- nv40_xv_tex.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) Index: nouveau-bicubic-2x.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/nouveau-bicubic-2x.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- nouveau-bicubic-2x.patch 27 Oct 2009 07:57:20 -0000 1.18 +++ nouveau-bicubic-2x.patch 2 Nov 2009 06:52:08 -0000 1.19 @@ -1,4 +1,4 @@ -From 396d5530b47275274f5e082860ca5882ba53d90d Mon Sep 17 00:00:00 2001 +From 7d95888413fb7a5ea8ab20a24b7ae3ead61f9899 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 4 May 2009 17:04:34 +1000 Subject: [PATCH 2/3] xv: only use bicubic filtering when scaling >=2x nouveau-multiple-xserver.patch: nv_driver.c | 85 ++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 28 deletions(-) Index: nouveau-multiple-xserver.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/nouveau-multiple-xserver.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- nouveau-multiple-xserver.patch 27 Oct 2009 07:57:20 -0000 1.20 +++ nouveau-multiple-xserver.patch 2 Nov 2009 06:52:08 -0000 1.21 @@ -1,4 +1,4 @@ -From 2d20c40d34076bc81fa02acac106a10140e5c811 Mon Sep 17 00:00:00 2001 +From a4d95709d4bc45e412354ccf85dbdff84550055d Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Sun, 28 Jun 2009 20:35:54 +1000 Subject: [PATCH 1/3] f12: hack to support multiple xserver instances nouveau-tile7000.patch: drmmode_display.c | 4 ++-- nv_driver.c | 7 ++++++- nv_type.h | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) Index: nouveau-tile7000.patch =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/nouveau-tile7000.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- nouveau-tile7000.patch 27 Oct 2009 07:57:20 -0000 1.8 +++ nouveau-tile7000.patch 2 Nov 2009 06:52:08 -0000 1.9 @@ -1,4 +1,4 @@ -From ddbed1af07484538f6d005115a795623c65e593e Mon Sep 17 00:00:00 2001 +From 07bf81d7e4d7a6476935be1c88b5bef5db9c7b5e Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 9 Sep 2009 16:26:25 +1000 Subject: [PATCH 3/3] f12: use 0x7000 flags for scanout to avoid mixed tile mode corruption @@ -64,7 +64,7 @@ index f07bc12..c907015 100644 } else { size *= pScrn->virtualY; diff --git a/src/nv_type.h b/src/nv_type.h -index ddf121c..6e1f2f3 100644 +index 0c13dac..55aa8c0 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -113,6 +113,8 @@ typedef struct _NVRec { Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- sources 27 Oct 2009 07:57:20 -0000 1.51 +++ sources 2 Nov 2009 06:52:08 -0000 1.52 @@ -1 +1 @@ -420ce3bf98961f680b3b10d2821fcde8 xf86-video-nouveau-0.0.15-20091022git718a41b.tar.bz2 +ca8bb76474bc8d87f21ca8303eefc052 xf86-video-nouveau-0.0.15-20091030git5587f40.tar.bz2 Index: xorg-x11-drv-nouveau.spec =================================================================== RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/xorg-x11-drv-nouveau.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- xorg-x11-drv-nouveau.spec 27 Oct 2009 07:57:20 -0000 1.63 +++ xorg-x11-drv-nouveau.spec 2 Nov 2009 06:52:08 -0000 1.64 @@ -7,8 +7,8 @@ # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2 -%define gitdate 20091022 -%define git_version 718a41b +%define gitdate 20091030 +%define git_version 5587f40 %define snapshot %{gitdate}git%{git_version} @@ -19,7 +19,7 @@ Name: xorg-x11-drv-nouveau # need to set an epoch to get version number in sync with upstream Epoch: 1 Version: %{nouveau_version} -Release: 15.%{snapshot}%{?dist} +Release: 16.%{snapshot}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/nouveau.4* %changelog +* Mon Nov 02 2009 Ben Skeggs 0.0.15-16.20091030git5587f40 +- force all pixmaps into system memory initally on low memory cards + * Tue Oct 27 2009 Ben Skeggs 0.0.15-15.20091022git718a41b - misc fixes, initial NVA8 support From hedayat at fedoraproject.org Mon Nov 2 06:56:16 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Mon, 2 Nov 2009 06:56:16 +0000 (UTC) Subject: rpms/rcssserver/devel .cvsignore, 1.9, 1.10 rcssserver.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <20091102065616.4B45211C00E8@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/rpms/rcssserver/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10080 Modified Files: .cvsignore rcssserver.spec sources Log Message: New version: 14.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 5 Aug 2009 08:07:42 -0000 1.9 +++ .cvsignore 2 Nov 2009 06:56:14 -0000 1.10 @@ -1 +1 @@ -rcssserver-13.2.2.tar.gz +rcssserver-14.0.0.tar.gz Index: rcssserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/devel/rcssserver.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- rcssserver.spec 5 Aug 2009 08:07:42 -0000 1.13 +++ rcssserver.spec 2 Nov 2009 06:56:14 -0000 1.14 @@ -1,5 +1,5 @@ Name: rcssserver -Version: 13.2.2 +Version: 14.0.0 Release: 1%{?dist} Summary: Robocup 2D Soccer Simulation Server @@ -98,6 +98,12 @@ rm -rf %{buildroot} %{_datadir}/applications/* %changelog +* Mon Nov 02 2009 Hedayat Vatankhah 14.0.0-1 +- Updated to 14.0.0 which brings some new features including: + - New Dash and Stamina models + - Introduce fould model + - Golden goal option + * Wed Aug 05 2009 Hedayat Vatankhah 13.2.2-1 - Updated to 13.2.2 which brings some bug fixes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 5 Aug 2009 08:07:42 -0000 1.9 +++ sources 2 Nov 2009 06:56:14 -0000 1.10 @@ -1 +1 @@ -3af8e644ba9944f1106a712b926bdc65 rcssserver-13.2.2.tar.gz +bd301f0f50c28b5b119706ddc1bb4286 rcssserver-14.0.0.tar.gz From hedayat at fedoraproject.org Mon Nov 2 07:25:57 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Mon, 2 Nov 2009 07:25:57 +0000 (UTC) Subject: rpms/rcssserver/F-12 .cvsignore, 1.9, 1.10 rcssserver.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <20091102072558.2028D11C00E8@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/rpms/rcssserver/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22103 Modified Files: .cvsignore rcssserver.spec sources Log Message: New version: 14.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/F-12/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 5 Aug 2009 08:07:42 -0000 1.9 +++ .cvsignore 2 Nov 2009 07:25:56 -0000 1.10 @@ -1 +1 @@ -rcssserver-13.2.2.tar.gz +rcssserver-14.0.0.tar.gz Index: rcssserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/F-12/rcssserver.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- rcssserver.spec 5 Aug 2009 08:07:42 -0000 1.13 +++ rcssserver.spec 2 Nov 2009 07:25:56 -0000 1.14 @@ -1,5 +1,5 @@ Name: rcssserver -Version: 13.2.2 +Version: 14.0.0 Release: 1%{?dist} Summary: Robocup 2D Soccer Simulation Server @@ -98,6 +98,12 @@ rm -rf %{buildroot} %{_datadir}/applications/* %changelog +* Mon Nov 02 2009 Hedayat Vatankhah 14.0.0-1 +- Updated to 14.0.0 which brings some new features including: + - New Dash and Stamina models + - Introduce fould model + - Golden goal option + * Wed Aug 05 2009 Hedayat Vatankhah 13.2.2-1 - Updated to 13.2.2 which brings some bug fixes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/F-12/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 5 Aug 2009 08:07:42 -0000 1.9 +++ sources 2 Nov 2009 07:25:56 -0000 1.10 @@ -1 +1 @@ -3af8e644ba9944f1106a712b926bdc65 rcssserver-13.2.2.tar.gz +bd301f0f50c28b5b119706ddc1bb4286 rcssserver-14.0.0.tar.gz From hedayat at fedoraproject.org Mon Nov 2 07:26:29 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Mon, 2 Nov 2009 07:26:29 +0000 (UTC) Subject: rpms/rcssserver/F-11 .cvsignore, 1.9, 1.10 rcssserver.spec, 1.11, 1.12 sources, 1.9, 1.10 Message-ID: <20091102072629.E1FC211C00E8@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/rpms/rcssserver/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22268 Modified Files: .cvsignore rcssserver.spec sources Log Message: New version: 14.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/F-11/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 5 Aug 2009 09:15:31 -0000 1.9 +++ .cvsignore 2 Nov 2009 07:26:28 -0000 1.10 @@ -1 +1 @@ -rcssserver-13.2.2.tar.gz +rcssserver-14.0.0.tar.gz Index: rcssserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/F-11/rcssserver.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- rcssserver.spec 5 Aug 2009 09:15:31 -0000 1.11 +++ rcssserver.spec 2 Nov 2009 07:26:28 -0000 1.12 @@ -1,5 +1,5 @@ Name: rcssserver -Version: 13.2.2 +Version: 14.0.0 Release: 1%{?dist} Summary: Robocup 2D Soccer Simulation Server @@ -98,6 +98,12 @@ rm -rf %{buildroot} %{_datadir}/applications/* %changelog +* Mon Nov 02 2009 Hedayat Vatankhah 14.0.0-1 +- Updated to 14.0.0 which brings some new features including: + - New Dash and Stamina models + - Introduce fould model + - Golden goal option + * Wed Aug 05 2009 Hedayat Vatankhah 13.2.2-1 - Updated to 13.2.2 which brings some bug fixes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/F-11/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 5 Aug 2009 09:15:31 -0000 1.9 +++ sources 2 Nov 2009 07:26:29 -0000 1.10 @@ -1 +1 @@ -3af8e644ba9944f1106a712b926bdc65 rcssserver-13.2.2.tar.gz +bd301f0f50c28b5b119706ddc1bb4286 rcssserver-14.0.0.tar.gz From hedayat at fedoraproject.org Mon Nov 2 07:27:50 2009 From: hedayat at fedoraproject.org (Hedayat Vatankhah) Date: Mon, 2 Nov 2009 07:27:50 +0000 (UTC) Subject: rpms/rcssserver/F-10 .cvsignore, 1.9, 1.10 rcssserver.spec, 1.10, 1.11 sources, 1.9, 1.10 Message-ID: <20091102072750.B5E9411C00E8@cvs1.fedora.phx.redhat.com> Author: hedayat Update of /cvs/pkgs/rpms/rcssserver/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22780 Modified Files: .cvsignore rcssserver.spec sources Log Message: New version : 14.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/F-10/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- .cvsignore 5 Aug 2009 09:22:39 -0000 1.9 +++ .cvsignore 2 Nov 2009 07:27:49 -0000 1.10 @@ -1 +1 @@ -rcssserver-13.2.2.tar.gz +rcssserver-14.0.0.tar.gz Index: rcssserver.spec =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/F-10/rcssserver.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- rcssserver.spec 5 Aug 2009 09:22:39 -0000 1.10 +++ rcssserver.spec 2 Nov 2009 07:27:50 -0000 1.11 @@ -1,5 +1,5 @@ Name: rcssserver -Version: 13.2.2 +Version: 14.0.0 Release: 1%{?dist} Summary: Robocup 2D Soccer Simulation Server @@ -104,6 +104,12 @@ rm -rf %{buildroot} %{_datadir}/applications/* %changelog +* Mon Nov 02 2009 Hedayat Vatankhah 14.0.0-1 +- Updated to 14.0.0 which brings some new features including: + - New Dash and Stamina models + - Introduce fould model + - Golden goal option + * Wed Aug 05 2009 Hedayat Vatankhah 13.2.2-1 - Updated to 13.2.2 which brings some bug fixes Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rcssserver/F-10/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- sources 5 Aug 2009 09:22:39 -0000 1.9 +++ sources 2 Nov 2009 07:27:50 -0000 1.10 @@ -1 +1 @@ -3af8e644ba9944f1106a712b926bdc65 rcssserver-13.2.2.tar.gz +bd301f0f50c28b5b119706ddc1bb4286 rcssserver-14.0.0.tar.gz From tmraz at fedoraproject.org Mon Nov 2 07:56:14 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 2 Nov 2009 07:56:14 +0000 (UTC) Subject: rpms/pam/devel pam-1.1.0-console-fixes.patch, NONE, 1.1 pam.spec, 1.205, 1.206 Message-ID: <20091102075615.08A0511C00E8@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30978 Modified Files: pam.spec Added Files: pam-1.1.0-console-fixes.patch Log Message: * Mon Nov 2 2009 Tomas Mraz 1.1.0-7 - pam_console: fix memory corruption when executing handlers (patch by Stas Sergeev) and a few more fixes in the handler execution code (#532302) pam-1.1.0-console-fixes.patch: handlers.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) --- NEW FILE pam-1.1.0-console-fixes.patch --- diff -up Linux-PAM-1.1.0/modules/pam_console/handlers.c.consolefix Linux-PAM-1.1.0/modules/pam_console/handlers.c --- Linux-PAM-1.1.0/modules/pam_console/handlers.c.consolefix 2009-11-02 08:45:24.000000000 +0100 +++ Linux-PAM-1.1.0/modules/pam_console/handlers.c 2009-11-02 08:50:19.000000000 +0100 @@ -172,13 +172,13 @@ call_exec(struct console_handler *handle const char *flagptr; const char **argv; int i = 0; - argv = malloc(sizeof(*argv)*nparams+2); - + argv = malloc(sizeof(*argv)*(nparams+2)); + if (argv == NULL) return; - + argv[i++] = handler->executable; - + for (flagptr = handler->flags; *flagptr != '\0'; flagptr += strlen(flagptr)+1) { switch (testflag(flagptr)) { case HF_LOGFAIL: @@ -231,7 +231,7 @@ execute_handler(pam_handle_t *pamh, stru } sighandler = signal(SIGCHLD, SIG_DFL); - + child = fork(); switch (child) { case -1: @@ -246,30 +246,31 @@ execute_handler(pam_handle_t *pamh, stru if (!wait_exit) { switch(fork()) { case 0: - exit(0); + if(setsid() == -1) { + _exit(255); + } + break; case -1: - exit(255); + _exit(255); default: - if(setsid() == -1) { - exit(255); - } + _exit(0); } } if (set_uid) { struct passwd *pw; pw = getpwnam(user); if (pw == NULL) - exit(255); + _exit(255); if (setgid(pw->pw_gid) == -1 || setuid(pw->pw_uid) == -1) - exit(255); + _exit(255); } call_exec(handler, nparams, user, tty); - exit(255); + _exit(255); default: break; } - + waitpid(child, &rv, 0); if (sighandler != SIG_ERR) Index: pam.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -p -r1.205 -r1.206 --- pam.spec 29 Oct 2009 15:32:22 -0000 1.205 +++ pam.spec 2 Nov 2009 07:56:12 -0000 1.206 @@ -3,7 +3,7 @@ Summary: An extensible library which provides authentication for applications Name: pam Version: 1.1.0 -Release: 6%{?dist} +Release: 7%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+, License: BSD and GPLv2+ @@ -27,6 +27,7 @@ Patch3: pam-1.1.0-cracklib-authtok.patc Patch4: pam-1.1.0-console-nochmod.patch Patch5: pam-1.1.0-notally.patch Patch6: pam-1.1.0-xauth-context.patch +Patch7: pam-1.1.0-console-fixes.patch %define _sbindir /sbin %define _moduledir /%{_lib}/security @@ -93,6 +94,7 @@ mv pam-redhat-%{pam_redhat_version}/* mo %patch4 -p1 -b .nochmod %patch5 -p1 -b .notally %patch6 -p1 -b .xauth-context +%patch7 -p1 -b .console-fixes libtoolize -f autoreconf @@ -325,6 +327,10 @@ fi %doc doc/adg/*.txt doc/adg/html %changelog +* Mon Nov 2 2009 Tomas Mraz 1.1.0-7 +- pam_console: fix memory corruption when executing handlers (patch by + Stas Sergeev) and a few more fixes in the handler execution code (#532302) + * Thu Oct 29 2009 Tomas Mraz 1.1.0-6 - pam_xauth: set the approprate context when creating .xauth files (#531530) From petersen at fedoraproject.org Mon Nov 2 08:02:40 2009 From: petersen at fedoraproject.org (Jens Petersen) Date: Mon, 2 Nov 2009 08:02:40 +0000 (UTC) Subject: rpms/imsettings/F-12 imsettings.spec,1.45,1.46 Message-ID: <20091102080240.AE98111C00E8@cvs1.fedora.phx.redhat.com> Author: petersen Update of /cvs/pkgs/rpms/imsettings/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv619 Modified Files: imsettings.spec Log Message: mai typo Index: imsettings.spec =================================================================== RCS file: /cvs/pkgs/rpms/imsettings/F-12/imsettings.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- imsettings.spec 2 Nov 2009 06:37:20 -0000 1.45 +++ imsettings.spec 2 Nov 2009 08:02:39 -0000 1.46 @@ -218,7 +218,7 @@ fi current missing X locale compose for gtk and X (#505100) * Fri Oct 16 2009 Akira TAGOH - 0.107.4-2 -- Run IM for Mailthili by default. (#529144) +- Run IM for Maithili by default. (#529144) * Mon Sep 28 2009 Akira TAGOH - 0.107.4-1 - New upstream release. From dtardon at fedoraproject.org Mon Nov 2 08:06:47 2009 From: dtardon at fedoraproject.org (David Tardon) Date: Mon, 2 Nov 2009 08:06:47 +0000 (UTC) Subject: rpms/openoffice.org/F-12 ooo-build.ooo68717.gstreamer.video.patch, 1.2, 1.3 openoffice.org.spec, 1.2026, 1.2027 Message-ID: <20091102080647.A5C7E11C00E8@cvs1.fedora.phx.redhat.com> Author: dtardon Update of /cvs/extras/rpms/openoffice.org/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1826 Modified Files: ooo-build.ooo68717.gstreamer.video.patch openoffice.org.spec Log Message: Resolves: rhbz#532330 openoffice impress doesn't recognise .ogv files as video ooo-build.ooo68717.gstreamer.video.patch: avmedia/prj/build.lst | 3 avmedia/source/gstreamer/ChangeLog | 112 +++ avmedia/source/gstreamer/exports.dxp | 4 avmedia/source/gstreamer/gstcommon.hxx | 83 ++ avmedia/source/gstreamer/gstframegrabber.cxx | 244 ++++++++ avmedia/source/gstreamer/gstframegrabber.hxx | 78 ++ avmedia/source/gstreamer/gstmanager.cxx | 114 +++ avmedia/source/gstreamer/gstmanager.hxx | 74 ++ avmedia/source/gstreamer/gstplayer.cxx | 628 ++++++++++++++++++++++ avmedia/source/gstreamer/gstplayer.hxx | 120 ++++ avmedia/source/gstreamer/gstuno.cxx | 111 +++ avmedia/source/gstreamer/gstwindow.cxx | 365 ++++++++++++ avmedia/source/gstreamer/gstwindow.hxx | 119 ++++ avmedia/source/gstreamer/makefile.mk | 85 ++ avmedia/source/inc/mediamisc.hxx | 4 avmedia/source/viewer/mediawindow.cxx | 3 avmedia/source/viewer/mediawindow_impl.cxx | 52 + avmedia/source/viewer/mediawindow_impl.hxx | 8 com/sun/star/wizards/letter/LocaleCodes.java | 2 configure.in | 21 scp2/source/ooo/file_library_ooo.scp | 4 scp2/source/ooo/module_hidden_ooo.scp | 1 set_soenv.in | 1 slideshow/source/engine/shapes/viewmediashape.cxx | 38 + slideshow/source/engine/shapes/viewmediashape.hxx | 7 solenv/inc/settings.mk | 4 source/gstreamer/gstplayer.cxx | 15 source/gstreamer/gstplayer.hxx | 1 svtools/inc/svtools/inettype.hxx | 4 svtools/inc/svtools/svtools.hrc | 210 +++---- svtools/source/misc1/inettype.cxx | 5 svtools/source/misc1/mediatyp.src | 162 +++++ vcl/inc/vcl/salobj.hxx | 2 vcl/inc/vcl/syschild.hxx | 1 vcl/source/window/syschild.cxx | 6 vcl/unx/gtk/window/gtkobject.cxx | 8 vcl/unx/inc/plugins/gtk/gtkobject.hxx | 2 37 files changed, 2586 insertions(+), 115 deletions(-) Index: ooo-build.ooo68717.gstreamer.video.patch =================================================================== RCS file: /cvs/extras/rpms/openoffice.org/F-12/ooo-build.ooo68717.gstreamer.video.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- ooo-build.ooo68717.gstreamer.video.patch 28 Apr 2009 09:32:23 -0000 1.2 +++ ooo-build.ooo68717.gstreamer.video.patch 2 Nov 2009 08:06:46 -0000 1.3 @@ -202,7 +202,7 @@ diff -u -u -r1.2 mediawindow_impl.hxx diff -rup avmedia-orig/source/viewer/mediawindow.cxx avmedia/source/viewer/mediawindow.cxx --- avmedia-orig/source/viewer/mediawindow.cxx 2006-09-21 12:10:28.000000000 +0200 +++ avmedia/source/viewer/mediawindow.cxx 2006-09-21 12:15:19.000000000 +0200 -@@ -383,8 +383,10 @@ +@@ -383,8 +383,11 @@ "AU Audio", "au", "AVI", "avi", "CD Audio", "cda", @@ -210,6 +210,7 @@ diff -rup avmedia-orig/source/viewer/med "MIDI Audio", "mid;midi", "MPEG Audio", "mp2;mp3;mpa", + "OGG Audio/Video", "ogg", ++ "OGG Video", "ogv", "MPEG Video", "mpg;mpeg;mpv;mp4", "Ogg bitstream", "ogg", "Quicktime Video", "mov", Index: openoffice.org.spec =================================================================== RCS file: /cvs/extras/rpms/openoffice.org/F-12/openoffice.org.spec,v retrieving revision 1.2026 retrieving revision 1.2027 diff -u -p -r1.2026 -r1.2027 --- openoffice.org.spec 30 Oct 2009 15:23:14 -0000 1.2026 +++ openoffice.org.spec 2 Nov 2009 08:06:46 -0000 1.2027 @@ -4258,6 +4258,8 @@ fi * Fri Oct 30 2009 Caol?n McNamara - 1:3.1.1-19.15-UNBUILT - Resolves: ooo#106497 language marked as providing spellchecking when unavailable (caolanm) +- Resolves: rhbz#532330 openoffice impress doesn't recognise .ogv + files as video (dtardon) * Wed Oct 28 2009 Caol?n McNamara - 1:3.1.1-19.14 - Resolves: ooo#103757 custom shape cut and paste (caolanm) From dtardon at fedoraproject.org Mon Nov 2 08:07:32 2009 From: dtardon at fedoraproject.org (David Tardon) Date: Mon, 2 Nov 2009 08:07:32 +0000 (UTC) Subject: rpms/openoffice.org/devel ooo-build.ooo68717.gstreamer.video.patch, 1.3, 1.4 openoffice.org.spec, 1.2056, 1.2057 Message-ID: <20091102080732.3791A11C00E8@cvs1.fedora.phx.redhat.com> Author: dtardon Update of /cvs/extras/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2013 Modified Files: ooo-build.ooo68717.gstreamer.video.patch openoffice.org.spec Log Message: Resolves: rhbz#532330 openoffice impress doesn't recognise .ogv files as video ooo-build.ooo68717.gstreamer.video.patch: avmedia/prj/build.lst | 3 avmedia/source/gstreamer/ChangeLog | 112 +++ avmedia/source/gstreamer/exports.dxp | 4 avmedia/source/gstreamer/gstcommon.hxx | 83 ++ avmedia/source/gstreamer/gstframegrabber.cxx | 244 ++++++++ avmedia/source/gstreamer/gstframegrabber.hxx | 78 ++ avmedia/source/gstreamer/gstmanager.cxx | 114 +++ avmedia/source/gstreamer/gstmanager.hxx | 74 ++ avmedia/source/gstreamer/gstplayer.cxx | 628 ++++++++++++++++++++++ avmedia/source/gstreamer/gstplayer.hxx | 120 ++++ avmedia/source/gstreamer/gstuno.cxx | 111 +++ avmedia/source/gstreamer/gstwindow.cxx | 365 ++++++++++++ avmedia/source/gstreamer/gstwindow.hxx | 119 ++++ avmedia/source/gstreamer/makefile.mk | 85 ++ avmedia/source/inc/mediamisc.hxx | 4 avmedia/source/viewer/mediawindow.cxx | 3 avmedia/source/viewer/mediawindow_impl.cxx | 52 + avmedia/source/viewer/mediawindow_impl.hxx | 8 com/sun/star/wizards/letter/LocaleCodes.java | 2 configure.in | 21 scp2/source/ooo/file_library_ooo.scp | 4 scp2/source/ooo/module_hidden_ooo.scp | 1 set_soenv.in | 1 slideshow/source/engine/shapes/viewmediashape.cxx | 38 + slideshow/source/engine/shapes/viewmediashape.hxx | 7 solenv/inc/settings.mk | 4 source/gstreamer/gstplayer.cxx | 15 source/gstreamer/gstplayer.hxx | 1 svtools/inc/svtools/inettype.hxx | 4 svtools/inc/svtools/svtools.hrc | 210 +++---- svtools/source/misc1/inettype.cxx | 5 svtools/source/misc1/mediatyp.src | 162 +++++ vcl/inc/vcl/salobj.hxx | 2 vcl/inc/vcl/syschild.hxx | 1 vcl/source/window/syschild.cxx | 6 vcl/unx/gtk/window/gtkobject.cxx | 8 vcl/unx/inc/plugins/gtk/gtkobject.hxx | 2 37 files changed, 2586 insertions(+), 115 deletions(-) Index: ooo-build.ooo68717.gstreamer.video.patch =================================================================== RCS file: /cvs/extras/rpms/openoffice.org/devel/ooo-build.ooo68717.gstreamer.video.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- ooo-build.ooo68717.gstreamer.video.patch 10 Oct 2009 15:48:45 -0000 1.3 +++ ooo-build.ooo68717.gstreamer.video.patch 2 Nov 2009 08:07:30 -0000 1.4 @@ -202,7 +202,7 @@ diff -u -u -r1.2 mediawindow_impl.hxx diff -rup avmedia-orig/source/viewer/mediawindow.cxx avmedia/source/viewer/mediawindow.cxx --- avmedia-orig/source/viewer/mediawindow.cxx 2006-09-21 12:10:28.000000000 +0200 +++ avmedia/source/viewer/mediawindow.cxx 2006-09-21 12:15:19.000000000 +0200 -@@ -383,8 +383,10 @@ +@@ -383,8 +383,11 @@ "AU Audio", "au", "AVI", "avi", "CD Audio", "cda", @@ -210,6 +210,7 @@ diff -rup avmedia-orig/source/viewer/med "MIDI Audio", "mid;midi", "MPEG Audio", "mp2;mp3;mpa", + "OGG Audio/Video", "ogg", ++ "OGG Video", "ogv", "MPEG Video", "mpg;mpeg;mpv;mp4", "Ogg bitstream", "ogg", "Quicktime Video", "mov", Index: openoffice.org.spec =================================================================== RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.2056 retrieving revision 1.2057 diff -u -p -r1.2056 -r1.2057 --- openoffice.org.spec 30 Oct 2009 15:23:15 -0000 1.2056 +++ openoffice.org.spec 2 Nov 2009 08:07:31 -0000 1.2057 @@ -4136,6 +4136,8 @@ fi * Fri Oct 30 2009 Caol?n McNamara - 1:3.2.0-3.2.UNBUILT - Resolves: ooo#106497 language marked as providing spellchecking when unavailable (caolanm) +- Resolves: rhbz#532330 openoffice impress doesn't recognise .ogv + files as video (dtardon) * Fri Oct 30 2009 Caol?n McNamara - 1:3.2.0-3.1 - Resolves: rhbz#531732 crash in about dialog with unfinished From mmaslano at fedoraproject.org Mon Nov 2 08:16:07 2009 From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=) Date: Mon, 2 Nov 2009 08:16:07 +0000 (UTC) Subject: rpms/cronie/devel contrib.patch,NONE,1.1 dailyjobs,NONE,1.1 Message-ID: <20091102081607.BFBDB11C00E8@cvs1.fedora.phx.redhat.com> Author: mmaslano Update of /cvs/pkgs/rpms/cronie/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4365 Added Files: contrib.patch dailyjobs Log Message: Add patches for review. contrib.patch: 0anacron | 5 +++++ 1 file changed, 5 insertions(+) --- NEW FILE contrib.patch --- diff -urN cronie-1.4.2/contrib.old/0anacron cronie-1.4.2/contrib/0anacron --- cronie-1.4.2/contrib.old/0anacron 2009-09-25 08:23:18.000000000 +0200 +++ cronie-1.4.2/contrib/0anacron 2009-10-30 17:34:28.369959197 +0100 @@ -1,4 +1,9 @@ #!/bin/bash +# in case nonanacron is installed +if [! -x /etc/cron.daily/dailyjob ]; then + exit 0; +fi + #in case file doesn't exist if test -x /var/spool/anacron/cron.daily; then day=`cat /var/spool/anacron/cron.daily` --- NEW FILE dailyjobs --- SHELL=/bin/bash PATH=/sbin:/bin:/usr/sbin:/usr/bin MAILTO=root HOME=/ # run-parts 01 * * * * root [! -f /etc/cron.daily/0anacron] && run-parts /etc/cron.hourly 02 4 * * * root [! -f /etc/cron.daily/0anacron] && run-parts /etc/cron.daily 22 4 * * 0 root [! -f /etc/cron.daily/0anacron] && run-parts /etc/cron.weekly 42 4 1 * * root [! -f /etc/cron.daily/0anacron] && run-parts /etc/cron.monthly From ovasik at fedoraproject.org Mon Nov 2 09:09:31 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 2 Nov 2009 09:09:31 +0000 (UTC) Subject: rpms/docbook-style-xsl/F-11 .cvsignore, 1.25, 1.26 docbook-style-xsl.spec, 1.61, 1.62 docbook-xsl-marginleft.patch, 1.7, 1.8 sources, 1.25, 1.26 docbook-xsl-fop1extensionpath.patch, 1.1, NONE Message-ID: <20091102090931.B9AD611C00E8@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-style-xsl/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19963 Modified Files: .cvsignore docbook-style-xsl.spec docbook-xsl-marginleft.patch sources Removed Files: docbook-xsl-fop1extensionpath.patch Log Message: new upstream release 1.75.2 (required for Publican 1.0) - #532258 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- .cvsignore 11 Mar 2009 22:19:47 -0000 1.25 +++ .cvsignore 2 Nov 2009 09:09:28 -0000 1.26 @@ -1,2 +1,2 @@ -docbook-xsl-1.74.3.tar.bz2 -docbook-xsl-doc-1.74.3.tar.bz2 +docbook-xsl-1.75.2.tar.bz2 +docbook-xsl-doc-1.75.2.tar.bz2 Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/docbook-style-xsl.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- docbook-style-xsl.spec 5 Aug 2009 12:54:26 -0000 1.61 +++ docbook-style-xsl.spec 2 Nov 2009 09:09:29 -0000 1.62 @@ -1,6 +1,6 @@ Name: docbook-style-xsl -Version: 1.74.3 -Release: 2%{?dist} +Version: 1.75.2 +Release: 1%{?dist} Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML @@ -30,7 +30,6 @@ Patch2: docbook-xsl-marginleft.patch Patch3: docbook-xsl-newmethods.patch Patch4: docbook-xsl-non-constant-expressions.patch Patch5: docbook-xsl-list-item-body.patch -Patch6: docbook-xsl-fop1extensionpath.patch %description @@ -48,7 +47,6 @@ popd %patch3 -p1 -b .newmethods %patch4 -p1 -b .nonconstant %patch5 -p1 -b .listitembody -%patch6 -p1 -b .fop1ext cp -p %{SOURCE1} Makefile @@ -119,6 +117,11 @@ if [ "$1" = 0 ]; then fi %changelog +* Mon Nov 02 2009 Ondrej Vasik 1.75.2-1 +- new upstream release 1.75.2 (required for Publican 1.0) + (#532258) +- update marginleft patch + * Wed Aug 05 2009 Ondrej Vasik 1.74.3-2 - Add extension URL to fop1 extension(#505364) docbook-xsl-marginleft.patch: docbook-xsl-1.74.0/fo/lists.xsl | 34 ++++------------------------------ docbook-xsl-1.74.0/fo/param.xsl | 4 ++-- docbook-xsl-1.75.0/fo/pagesetup.xsl | 11 +---------- 3 files changed, 7 insertions(+), 42 deletions(-) Index: docbook-xsl-marginleft.patch =================================================================== RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/docbook-xsl-marginleft.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- docbook-xsl-marginleft.patch 6 Aug 2008 11:56:12 -0000 1.7 +++ docbook-xsl-marginleft.patch 2 Nov 2009 09:09:29 -0000 1.8 @@ -63,24 +63,24 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/li -diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl ---- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -34,29 +34,11 @@ - margin-left="{$page.margin.outer} - {$title.margin.left}" - --> - -- -- -- -- -- -- -- - -- -- -- -+ +diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl +--- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 +@@ -133,8 +133,8 @@ + + always + +- +- ++ ++ + false + + +diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl +--- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 +0200 ++++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200 +@@ -30,16 +30,7 @@ @@ -98,17 +98,3 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pa -diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl ---- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -133,8 +133,8 @@ - - always - -- -- -+ -+ - false - - Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- sources 11 Mar 2009 22:19:47 -0000 1.25 +++ sources 2 Nov 2009 09:09:29 -0000 1.26 @@ -1,2 +1,2 @@ -c77c0c317040b2f2e366842bd9df2218 docbook-xsl-1.74.3.tar.bz2 -2a032a95fbf24367d13acc8210f9cd72 docbook-xsl-doc-1.74.3.tar.bz2 +0c76a58a8e6cb5ab49f819e79917308f docbook-xsl-1.75.2.tar.bz2 +0a59c4c1796683fca32881c221df0b16 docbook-xsl-doc-1.75.2.tar.bz2 --- docbook-xsl-fop1extensionpath.patch DELETED --- From tmraz at fedoraproject.org Mon Nov 2 09:13:53 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 2 Nov 2009 09:13:53 +0000 (UTC) Subject: rpms/pam/F-12 pam-1.1.0-console-fixes.patch, NONE, 1.1 pam.spec, 1.205, 1.206 Message-ID: <20091102091353.9AA9F11C00E8@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21728 Modified Files: pam.spec Added Files: pam-1.1.0-console-fixes.patch Log Message: * Mon Nov 2 2009 Tomas Mraz 1.1.0-7 - pam_console: fix memory corruption when executing handlers (patch by Stas Sergeev) and a few more fixes in the handler execution code (#532302) pam-1.1.0-console-fixes.patch: handlers.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) --- NEW FILE pam-1.1.0-console-fixes.patch --- diff -up Linux-PAM-1.1.0/modules/pam_console/handlers.c.consolefix Linux-PAM-1.1.0/modules/pam_console/handlers.c --- Linux-PAM-1.1.0/modules/pam_console/handlers.c.consolefix 2009-11-02 08:45:24.000000000 +0100 +++ Linux-PAM-1.1.0/modules/pam_console/handlers.c 2009-11-02 08:50:19.000000000 +0100 @@ -172,13 +172,13 @@ call_exec(struct console_handler *handle const char *flagptr; const char **argv; int i = 0; - argv = malloc(sizeof(*argv)*nparams+2); - + argv = malloc(sizeof(*argv)*(nparams+2)); + if (argv == NULL) return; - + argv[i++] = handler->executable; - + for (flagptr = handler->flags; *flagptr != '\0'; flagptr += strlen(flagptr)+1) { switch (testflag(flagptr)) { case HF_LOGFAIL: @@ -231,7 +231,7 @@ execute_handler(pam_handle_t *pamh, stru } sighandler = signal(SIGCHLD, SIG_DFL); - + child = fork(); switch (child) { case -1: @@ -246,30 +246,31 @@ execute_handler(pam_handle_t *pamh, stru if (!wait_exit) { switch(fork()) { case 0: - exit(0); + if(setsid() == -1) { + _exit(255); + } + break; case -1: - exit(255); + _exit(255); default: - if(setsid() == -1) { - exit(255); - } + _exit(0); } } if (set_uid) { struct passwd *pw; pw = getpwnam(user); if (pw == NULL) - exit(255); + _exit(255); if (setgid(pw->pw_gid) == -1 || setuid(pw->pw_uid) == -1) - exit(255); + _exit(255); } call_exec(handler, nparams, user, tty); - exit(255); + _exit(255); default: break; } - + waitpid(child, &rv, 0); if (sighandler != SIG_ERR) Index: pam.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam/F-12/pam.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -p -r1.205 -r1.206 --- pam.spec 29 Oct 2009 15:54:52 -0000 1.205 +++ pam.spec 2 Nov 2009 09:13:52 -0000 1.206 @@ -3,7 +3,7 @@ Summary: An extensible library which provides authentication for applications Name: pam Version: 1.1.0 -Release: 6%{?dist} +Release: 7%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+, License: BSD and GPLv2+ @@ -27,6 +27,7 @@ Patch3: pam-1.1.0-cracklib-authtok.patc Patch4: pam-1.1.0-console-nochmod.patch Patch5: pam-1.1.0-notally.patch Patch6: pam-1.1.0-xauth-context.patch +Patch7: pam-1.1.0-console-fixes.patch %define _sbindir /sbin %define _moduledir /%{_lib}/security @@ -93,6 +94,7 @@ mv pam-redhat-%{pam_redhat_version}/* mo %patch4 -p1 -b .nochmod %patch5 -p1 -b .notally %patch6 -p1 -b .xauth-context +%patch7 -p1 -b .console-fixes libtoolize -f autoreconf @@ -325,6 +327,10 @@ fi %doc doc/adg/*.txt doc/adg/html %changelog +* Mon Nov 2 2009 Tomas Mraz 1.1.0-7 +- pam_console: fix memory corruption when executing handlers (patch by + Stas Sergeev) and a few more fixes in the handler execution code (#532302) + * Thu Oct 29 2009 Tomas Mraz 1.1.0-6 - pam_xauth: set the approprate context when creating .xauth files (#531530) From pghmcfc at fedoraproject.org Mon Nov 2 09:26:46 2009 From: pghmcfc at fedoraproject.org (Paul Howarth) Date: Mon, 2 Nov 2009 09:26:46 +0000 (UTC) Subject: rpms/perl-Math-Pari/devel .cvsignore, 1.8, 1.9 perl-Math-Pari.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <20091102092646.59A2011C00E8@cvs1.fedora.phx.redhat.com> Author: pghmcfc Update of /cvs/pkgs/rpms/perl-Math-Pari/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26189 Modified Files: .cvsignore perl-Math-Pari.spec sources Log Message: Update to 2.010804 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 29 Oct 2009 13:23:54 -0000 1.8 +++ .cvsignore 2 Nov 2009 09:26:42 -0000 1.9 @@ -1,2 +1,2 @@ -Math-Pari-2.010802.tar.gz +Math-Pari-2.010804.tar.gz pari-2.3.4.tar.gz Index: perl-Math-Pari.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/perl-Math-Pari.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- perl-Math-Pari.spec 29 Oct 2009 13:23:54 -0000 1.18 +++ perl-Math-Pari.spec 2 Nov 2009 09:26:44 -0000 1.19 @@ -12,7 +12,7 @@ Summary: Perl interface to PARI Name: perl-Math-Pari -Version: 2.010802 +Version: 2.010804 Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries @@ -94,6 +94,9 @@ cd - %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm* %changelog +* Mon Nov 2 2009 Paul Howarth - 2.010804-1 +- Update to 2.010804 + * Thu Oct 29 2009 Paul Howarth - 2.010802-1 - Update to 2.010802 - Use system pari library (version 2.3.4) rather than a local build Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 29 Oct 2009 13:23:54 -0000 1.8 +++ sources 2 Nov 2009 09:26:44 -0000 1.9 @@ -1,2 +1,2 @@ -f843b0b19da0a0a044851d980881dbc9 Math-Pari-2.010802.tar.gz +d128fa9b278df8a6b2666cb7c889b496 Math-Pari-2.010804.tar.gz 35c896266e4257793387ba22d5d76078 pari-2.3.4.tar.gz From kasal at fedoraproject.org Mon Nov 2 09:36:33 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 09:36:33 +0000 (UTC) Subject: rpms/brltty/devel brltty.spec,1.38,1.39 Message-ID: <20091102093633.6424E11C00E8@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/brltty/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29270 Modified Files: brltty.spec Log Message: - move data-directory back to default: /etc/brltty - move brltty to /bin and /lib, so that it can be used to repair the system without /usr mounted (#276181) - move vstp and libbrlttybba.so to brlapi - brltty no longer requires brlapi - brlapi now requires brltty from the same build - build the TTY driver (it was disabled since it first appered in 3.7.2-1) - build with speech-dispatcher, packed into a separate sub-package Index: brltty.spec =================================================================== RCS file: /cvs/extras/rpms/brltty/devel/brltty.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- brltty.spec 28 Oct 2009 17:26:39 -0000 1.38 +++ brltty.spec 2 Nov 2009 09:36:30 -0000 1.39 @@ -5,11 +5,14 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")} %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} -%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}} +%{!?tcl_sitearch: %define tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}} + +%define _exec_prefix %{nil} +%define _libdir /%{_lib} Name: brltty Version: %{pkg_version} -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://mielke.cc/brltty/ @@ -21,7 +24,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na Summary: Braille display driver for Linux/Unix BuildRequires: byacc glibc-kernheaders BuildRequires: autoconf -Requires: brlapi = %{api_version}-%{release} %description BRLTTY is a background process (daemon) which provides @@ -29,7 +31,17 @@ access to the Linux/Unix console (when i for a blind person using a refreshable braille display. It drives the braille display and provides complete screen review functionality. -Some speech capability has also been incorporated. +BRLTTY can also work with speech synthetizers; if you want to use it with +Speech Dispatcher, please install also package %{name}-speech-dispatcher. + +%package speech-dispatcher +Summary: Speech Dispatcher driver for BRLTTY +Group: System Environment/Daemons +License: GPLv2+ +BuildRequires: speech-dispatcher-devel +Requires: %{name} = %{pkg_version}-%{release} +%description speech-dispatcher +This package provides the Speech Dispatcher driver for BRLTTY. %package xw Summary: XWindow driver for BRLTTY @@ -55,6 +67,7 @@ Version: %{api_version} Group: Applications/System License: LGPLv2+ Summary: Appliation Programming Interface for BRLTTY +Requires: %{name} = %{pkg_version}-%{release} %description -n brlapi This package provides the run-time support for the Application Programming Interface to BRLTTY. @@ -86,7 +99,7 @@ Version: %{api_version} Group: Development/System License: LGPLv2+ Requires: brlapi = %{api_version}-%{release} -BuildRequires: tcl-devel tcl +BuildRequires: tcl-devel Summary: Tcl binding for BrlAPI %description -n tcl-brlapi This package provides the Tcl binding for BrlAPI. @@ -130,8 +143,7 @@ done # there is no curses packages in BuildRequires, so the package builds # without them in mock; let's express this decision explicitly %configure CPPFLAGS="$java_inc" --disable-stripping --without-curses \ - --with-data-directory='${datadir}/${PACKAGE_NAME}' \ - --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt + --with-install-root="${RPM_BUILD_ROOT}" --with-speechd=%{_prefix} make %{?_smp_mflags} find . \( -path ./doc -o -path ./Documents \) -prune -o \ @@ -144,8 +156,12 @@ done %install rm -rf $RPM_BUILD_ROOT -make %{?_smp_mflags} install -mv "$RPM_BUILD_ROOT%{_datadir}/brltty/brltty-pm.conf" \ +# does not seem to be parallel safe +make install +mv "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.a" "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/" +rm "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.so" +ln -s ../../%{_lib}/libbrlapi.so "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/" +mv "$RPM_BUILD_ROOT%{_sysconfdir}/brltty/brltty-pm.conf" \ doc/Drivers/Braille/Papenmeier/ install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5" install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" @@ -153,10 +169,7 @@ echo ".so man1/brltty.1" > $RPM_BUILD_RO # clean up the manuals: rm Documents/Manual-*/*/{*.mk,*.made,Makefile*} - -ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | \ - grep -v 'libbrlttybxw.so\|libbrlttyxas.so' | \ - sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist +mv Documents/BrlAPIref/{html,BrlAPIref} %clean rm -rf $RPM_BUILD_ROOT @@ -182,22 +195,32 @@ then fi exit 0 -%files -f libs.filelist +%post -n brlapi -p /sbin/ldconfig +%postun -n brlapi -p /sbin/ldconfig + +%files %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/brltty.conf +%{_sysconfdir}/brltty/ %{_bindir}/brltty %{_bindir}/brltty-* -%{_bindir}/vstp -%dir %{_libdir}/brltty -%{_datadir}/brltty +%{_libdir}/brltty/ +%exclude %{_libdir}/brltty/libbrlttybba.so +%exclude %{_libdir}/brltty/libbrlttybxw.so +%exclude %{_libdir}/brltty/libbrlttyssd.so +%exclude %{_libdir}/brltty/libbrlttyxas.so %doc LICENSE-GPL LICENSE-LGPL %doc Documents/ChangeLog Documents/TODO %doc Documents/Manual-BRLTTY/ %doc doc/* %doc %{_mandir}/man[15]/brltty.* -%doc %{_mandir}/man1/vstp.* + +%files speech-dispatcher +%doc Drivers/Speech/SpeechDispatcher/README +%{_libdir}/brltty/libbrlttyssd.so %files xw +%doc Drivers/Braille/XWindow/README %{_libdir}/brltty/libbrlttybxw.so %files at-spi @@ -205,20 +228,23 @@ exit 0 %files -n brlapi %defattr(-,root,root) +%{_bindir}/vstp %{_bindir}/xbrlapi +%{_libdir}/brltty/libbrlttybba.so %{_libdir}/libbrlapi.so.* +%doc Drivers/Braille/XWindow/README %doc Documents/Manual-BrlAPI/ -%doc Documents/README.Seika %doc %{_mandir}/man1/xbrlapi.* +%doc %{_mandir}/man1/vstp.* %files -n brlapi-devel %defattr(-,root,root) -%{_libdir}/libbrlapi.a -%{_libdir}/libbrlapi.so +%{_prefix}/%{_lib}/libbrlapi.a +%{_prefix}/%{_lib}/libbrlapi.so %{_includedir}/brltty %{_includedir}/brlapi*.h %doc %{_mandir}/man3/brlapi_*.3* -%doc Documents/BrlAPIref/html +%doc Documents/BrlAPIref/BrlAPIref/ %files -n tcl-brlapi %defattr(-,root,root) @@ -236,6 +262,18 @@ exit 0 %changelog +* Sun Nov 1 2009 Stepan Kasal - 4.1-3 +- build the TTY driver (it was disabled since it first appered in 3.7.2-1) +- build with speech-dispatcher, packed into a separate sub-package + +* Fri Oct 30 2009 Stepan Kasal - 4.1-2 +- move data-directory back to default: /etc/brltty +- move brltty to /bin and /lib, so that it can be used to repair the system + without /usr mounted (#276181) +- move vstp and libbrlttybba.so to brlapi +- brltty no longer requires brlapi +- brlapi now requires brltty from the same build + * Wed Oct 28 2009 Stepan Kasal - 4.1-1 - new upstream version - use --disable-stripping instead of make variable override @@ -243,6 +281,7 @@ exit 0 - remove the duplicate copies of rhmkboot and rhmkroot from docdir - patch configure so that the dirs in summary are not garbled: brltty-autoconf-quote.patch +- move data-directory to ${datadir}/brltty * Tue Oct 20 2009 Stepan Kasal - 4.0-2 - escape rpm macros in the rpm change log From kasal at fedoraproject.org Mon Nov 2 09:37:43 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 09:37:43 +0000 (UTC) Subject: rpms/brltty/F-12 brltty.spec,1.36,1.37 Message-ID: <20091102093743.ABF2C11C00E8@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/brltty/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29696 Modified Files: brltty.spec Log Message: - move data-directory back to default: /etc/brltty - move brltty to /bin and /lib, so that it can be used to repair the system without /usr mounted (#276181) - move vstp and libbrlttybba.so to brlapi - brltty no longer requires brlapi - brlapi now requires brltty from the same build - build the TTY driver (it was disabled since it first appered in 3.7.2-1) - build with speech-dispatcher, packed into a separate sub-package Index: brltty.spec =================================================================== RCS file: /cvs/extras/rpms/brltty/F-12/brltty.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- brltty.spec 28 Oct 2009 17:26:39 -0000 1.36 +++ brltty.spec 2 Nov 2009 09:37:42 -0000 1.37 @@ -5,11 +5,14 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")} %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} -%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}} +%{!?tcl_sitearch: %define tcl_sitearch %{_prefix}/%{_lib}/tcl%{tcl_version}} + +%define _exec_prefix %{nil} +%define _libdir /%{_lib} Name: brltty Version: %{pkg_version} -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://mielke.cc/brltty/ @@ -21,7 +24,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na Summary: Braille display driver for Linux/Unix BuildRequires: byacc glibc-kernheaders BuildRequires: autoconf -Requires: brlapi = %{api_version}-%{release} %description BRLTTY is a background process (daemon) which provides @@ -29,7 +31,17 @@ access to the Linux/Unix console (when i for a blind person using a refreshable braille display. It drives the braille display and provides complete screen review functionality. -Some speech capability has also been incorporated. +BRLTTY can also work with speech synthetizers; if you want to use it with +Speech Dispatcher, please install also package %{name}-speech-dispatcher. + +%package speech-dispatcher +Summary: Speech Dispatcher driver for BRLTTY +Group: System Environment/Daemons +License: GPLv2+ +BuildRequires: speech-dispatcher-devel +Requires: %{name} = %{pkg_version}-%{release} +%description speech-dispatcher +This package provides the Speech Dispatcher driver for BRLTTY. %package xw Summary: XWindow driver for BRLTTY @@ -55,6 +67,7 @@ Version: %{api_version} Group: Applications/System License: LGPLv2+ Summary: Appliation Programming Interface for BRLTTY +Requires: %{name} = %{pkg_version}-%{release} %description -n brlapi This package provides the run-time support for the Application Programming Interface to BRLTTY. @@ -86,7 +99,7 @@ Version: %{api_version} Group: Development/System License: LGPLv2+ Requires: brlapi = %{api_version}-%{release} -BuildRequires: tcl-devel tcl +BuildRequires: tcl-devel Summary: Tcl binding for BrlAPI %description -n tcl-brlapi This package provides the Tcl binding for BrlAPI. @@ -130,8 +143,7 @@ done # there is no curses packages in BuildRequires, so the package builds # without them in mock; let's express this decision explicitly %configure CPPFLAGS="$java_inc" --disable-stripping --without-curses \ - --with-data-directory='${datadir}/${PACKAGE_NAME}' \ - --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt + --with-install-root="${RPM_BUILD_ROOT}" --with-speechd=%{_prefix} make %{?_smp_mflags} find . \( -path ./doc -o -path ./Documents \) -prune -o \ @@ -144,8 +156,12 @@ done %install rm -rf $RPM_BUILD_ROOT -make %{?_smp_mflags} install -mv "$RPM_BUILD_ROOT%{_datadir}/brltty/brltty-pm.conf" \ +# does not seem to be parallel safe +make install +mv "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.a" "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/" +rm "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.so" +ln -s ../../%{_lib}/libbrlapi.so "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/" +mv "$RPM_BUILD_ROOT%{_sysconfdir}/brltty/brltty-pm.conf" \ doc/Drivers/Braille/Papenmeier/ install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5" install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" @@ -153,10 +169,7 @@ echo ".so man1/brltty.1" > $RPM_BUILD_RO # clean up the manuals: rm Documents/Manual-*/*/{*.mk,*.made,Makefile*} - -ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | \ - grep -v 'libbrlttybxw.so\|libbrlttyxas.so' | \ - sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist +mv Documents/BrlAPIref/{html,BrlAPIref} %clean rm -rf $RPM_BUILD_ROOT @@ -182,22 +195,32 @@ then fi exit 0 -%files -f libs.filelist +%post -n brlapi -p /sbin/ldconfig +%postun -n brlapi -p /sbin/ldconfig + +%files %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/brltty.conf +%{_sysconfdir}/brltty/ %{_bindir}/brltty %{_bindir}/brltty-* -%{_bindir}/vstp -%dir %{_libdir}/brltty -%{_datadir}/brltty +%{_libdir}/brltty/ +%exclude %{_libdir}/brltty/libbrlttybba.so +%exclude %{_libdir}/brltty/libbrlttybxw.so +%exclude %{_libdir}/brltty/libbrlttyssd.so +%exclude %{_libdir}/brltty/libbrlttyxas.so %doc LICENSE-GPL LICENSE-LGPL %doc Documents/ChangeLog Documents/TODO %doc Documents/Manual-BRLTTY/ %doc doc/* %doc %{_mandir}/man[15]/brltty.* -%doc %{_mandir}/man1/vstp.* + +%files speech-dispatcher +%doc Drivers/Speech/SpeechDispatcher/README +%{_libdir}/brltty/libbrlttyssd.so %files xw +%doc Drivers/Braille/XWindow/README %{_libdir}/brltty/libbrlttybxw.so %files at-spi @@ -205,20 +228,23 @@ exit 0 %files -n brlapi %defattr(-,root,root) +%{_bindir}/vstp %{_bindir}/xbrlapi +%{_libdir}/brltty/libbrlttybba.so %{_libdir}/libbrlapi.so.* +%doc Drivers/Braille/XWindow/README %doc Documents/Manual-BrlAPI/ -%doc Documents/README.Seika %doc %{_mandir}/man1/xbrlapi.* +%doc %{_mandir}/man1/vstp.* %files -n brlapi-devel %defattr(-,root,root) -%{_libdir}/libbrlapi.a -%{_libdir}/libbrlapi.so +%{_prefix}/%{_lib}/libbrlapi.a +%{_prefix}/%{_lib}/libbrlapi.so %{_includedir}/brltty %{_includedir}/brlapi*.h %doc %{_mandir}/man3/brlapi_*.3* -%doc Documents/BrlAPIref/html +%doc Documents/BrlAPIref/BrlAPIref/ %files -n tcl-brlapi %defattr(-,root,root) @@ -236,6 +262,18 @@ exit 0 %changelog +* Sun Nov 1 2009 Stepan Kasal - 4.1-3 +- build the TTY driver (it was disabled since it first appered in 3.7.2-1) +- build with speech-dispatcher, packed into a separate sub-package + +* Fri Oct 30 2009 Stepan Kasal - 4.1-2 +- move data-directory back to default: /etc/brltty +- move brltty to /bin and /lib, so that it can be used to repair the system + without /usr mounted (#276181) +- move vstp and libbrlttybba.so to brlapi +- brltty no longer requires brlapi +- brlapi now requires brltty from the same build + * Wed Oct 28 2009 Stepan Kasal - 4.1-1 - new upstream version - use --disable-stripping instead of make variable override @@ -243,6 +281,7 @@ exit 0 - remove the duplicate copies of rhmkboot and rhmkroot from docdir - patch configure so that the dirs in summary are not garbled: brltty-autoconf-quote.patch +- move data-directory to ${datadir}/brltty * Tue Oct 20 2009 Stepan Kasal - 4.0-2 - escape rpm macros in the rpm change log From pkgdb at fedoraproject.org Mon Nov 2 09:40:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:40:38 +0000 Subject: [pkgdb] logwatch ownership updated Message-ID: <20091102094038.B2A0E10F802@bastion2.fedora.phx.redhat.com> Package logwatch in Fedora 12 was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:40:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:40:40 +0000 Subject: [pkgdb] logwatch ownership updated Message-ID: <20091102094040.107AC10F871@bastion2.fedora.phx.redhat.com> Package logwatch in Fedora 11 was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:40:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:40:42 +0000 Subject: [pkgdb] logwatch ownership updated Message-ID: <20091102094042.B861910F802@bastion2.fedora.phx.redhat.com> Package logwatch in Fedora devel was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:41:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:41:01 +0000 Subject: [pkgdb] logwatch ownership updated Message-ID: <20091102094101.859D010F871@bastion2.fedora.phx.redhat.com> Package logwatch in Fedora devel is now owned by kklic To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:41:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:41:13 +0000 Subject: [pkgdb] logwatch ownership updated Message-ID: <20091102094113.D58FA10F802@bastion2.fedora.phx.redhat.com> Package logwatch in Fedora 11 is now owned by kklic To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:41:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:41:16 +0000 Subject: [pkgdb] logwatch ownership updated Message-ID: <20091102094116.D0EE710F87B@bastion2.fedora.phx.redhat.com> Package logwatch in Fedora 12 is now owned by kklic To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:42:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:42:33 +0000 Subject: [pkgdb] gzip ownership updated Message-ID: <20091102094233.16BC810F871@bastion2.fedora.phx.redhat.com> Package gzip in Fedora devel was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/gzip From pkgdb at fedoraproject.org Mon Nov 2 09:42:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:42:46 +0000 Subject: [pkgdb] gzip ownership updated Message-ID: <20091102094246.3AB1B10F871@bastion2.fedora.phx.redhat.com> Package gzip in Fedora 12 was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/gzip From pkgdb at fedoraproject.org Mon Nov 2 09:42:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:42:47 +0000 Subject: [pkgdb] gzip ownership updated Message-ID: <20091102094247.B71D010F87E@bastion2.fedora.phx.redhat.com> Package gzip in Fedora 11 was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/gzip From pkgdb at fedoraproject.org Mon Nov 2 09:42:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:42:52 +0000 Subject: [pkgdb] gzip ownership updated Message-ID: <20091102094252.A744610F802@bastion2.fedora.phx.redhat.com> Package gzip in Fedora devel is now owned by kklic To make changes to this package see: /pkgdb/packages/name/gzip From pkgdb at fedoraproject.org Mon Nov 2 09:43:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:43:09 +0000 Subject: [pkgdb] gzip ownership updated Message-ID: <20091102094309.36D7B10F877@bastion2.fedora.phx.redhat.com> Package gzip in Fedora 11 is now owned by kklic To make changes to this package see: /pkgdb/packages/name/gzip From pkgdb at fedoraproject.org Mon Nov 2 09:43:12 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:43:12 +0000 Subject: [pkgdb] gzip ownership updated Message-ID: <20091102094312.9E3CE10F7FF@bastion2.fedora.phx.redhat.com> Package gzip in Fedora 12 is now owned by kklic To make changes to this package see: /pkgdb/packages/name/gzip From ovasik at fedoraproject.org Mon Nov 2 09:43:15 2009 From: ovasik at fedoraproject.org (Ondrej Vasik) Date: Mon, 2 Nov 2009 09:43:15 +0000 (UTC) Subject: rpms/docbook-style-xsl/F-10 .cvsignore, 1.22, 1.23 docbook-style-xsl.Makefile, 1.7, 1.8 docbook-style-xsl.spec, 1.51, 1.52 docbook-xsl-marginleft.patch, 1.7, 1.8 sources, 1.22, 1.23 docbook-xsl-weird-orgname-use.patch, 1.1, NONE Message-ID: <20091102094315.4A52611C00E8@cvs1.fedora.phx.redhat.com> Author: ovasik Update of /cvs/extras/rpms/docbook-style-xsl/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31745 Modified Files: .cvsignore docbook-style-xsl.Makefile docbook-style-xsl.spec docbook-xsl-marginleft.patch sources Removed Files: docbook-xsl-weird-orgname-use.patch Log Message: new upstream release 1.75.2 (required for Publican 1.0) - #532259 , update Makefile(do ship .svg images(#486849), xsl stylesheets for website, , xhtml-1_1, docbook -> epub convertor) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- .cvsignore 3 Jun 2008 11:16:45 -0000 1.22 +++ .cvsignore 2 Nov 2009 09:43:14 -0000 1.23 @@ -1,2 +1,2 @@ -docbook-xsl-1.74.0.tar.gz -docbook-xsl-doc-1.74.0.tar.bz2 +docbook-xsl-1.75.2.tar.bz2 +docbook-xsl-doc-1.75.2.tar.bz2 Index: docbook-style-xsl.Makefile =================================================================== RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/docbook-style-xsl.Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- docbook-style-xsl.Makefile 18 Jun 2007 15:39:19 -0000 1.7 +++ docbook-style-xsl.Makefile 2 Nov 2009 09:43:14 -0000 1.8 @@ -3,10 +3,10 @@ DESTDIR = ..overridden in spec file.. all: install -install: install-xsl install-img install-extensions install-misc +install: install-xsl install-img install-extensions install-misc install-epub install-xsl: - mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling,highlighting,roundtrip} + mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,xhtml-1_1,manpages,profiling,highlighting,roundtrip,website} cp common/*.dtd $(DESTDIR)/common cp common/*.ent $(DESTDIR)/common cp common/*.xml $(DESTDIR)/common @@ -20,22 +20,32 @@ install-xsl: cp lib/*.xsl $(DESTDIR)/lib cp template/*.xsl $(DESTDIR)/template cp xhtml/*.xsl $(DESTDIR)/xhtml + cp xhtml-1_1/*.xsl $(DESTDIR)/xhtml-1_1 cp manpages/*.xsl $(DESTDIR)/manpages cp profiling/*.xsl $(DESTDIR)/profiling cp highlighting/*.xml $(DESTDIR)/highlighting cp highlighting/*.xsl $(DESTDIR)/highlighting cp roundtrip/*.xml $(DESTDIR)/roundtrip cp roundtrip/*.xsl $(DESTDIR)/roundtrip + cp roundtrip/*.dtd $(DESTDIR)/roundtrip + cp website/*.xsl $(DESTDIR)/website install-img: mkdir -p $(DESTDIR)/images/callouts cp images/*.gif $(DESTDIR)/images cp images/*.png $(DESTDIR)/images + cp images/*.svg $(DESTDIR)/images cp images/callouts/*.png $(DESTDIR)/images/callouts + cp images/callouts/*.gif $(DESTDIR)/images/callouts + cp images/callouts/*.svg $(DESTDIR)/images/callouts install-extensions: mkdir -p $(DESTDIR)/extensions cp -r extensions/* $(DESTDIR)/extensions +install-epub: + mkdir -p $(DESTDIR)/epub + cp -r epub/* ${DESTDIR}/epub + install-misc: cp VERSION $(DESTDIR) Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/docbook-style-xsl.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- docbook-style-xsl.spec 11 Feb 2009 17:14:10 -0000 1.51 +++ docbook-style-xsl.spec 2 Nov 2009 09:43:14 -0000 1.52 @@ -1,6 +1,6 @@ Name: docbook-style-xsl -Version: 1.74.0 -Release: 5%{?dist} +Version: 1.75.2 +Release: 1%{?dist} Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML @@ -21,7 +21,7 @@ Conflicts: passivetex < 1.21 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch -Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2 Source1: %{name}.Makefile Source2: http://downloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2 @@ -30,8 +30,6 @@ Patch2: docbook-xsl-marginleft.patch Patch3: docbook-xsl-newmethods.patch Patch4: docbook-xsl-non-constant-expressions.patch Patch5: docbook-xsl-list-item-body.patch -Patch6: docbook-xsl-weird-orgname-use.patch - %description These XSL stylesheets allow you to transform any DocBook XML document to @@ -48,7 +46,6 @@ popd %patch3 -p1 -b .newmethods %patch4 -p1 -b .nonconstant %patch5 -p1 -b .listitembody -%patch6 -p1 -b .orgname cp -p %{SOURCE1} Makefile @@ -119,11 +116,20 @@ if [ "$1" = 0 ]; then fi %changelog +* Mon Nov 02 2009 Ondrej Vasik 1.75.2-1 +- new upstream release 1.75.2 (required for Publican 1.0) + (#532259) +- update marginleft patch, remove weird-orgname + patch addressed by upstream +- updated Makefile: do ship .svg images(#486849), xsl + stylesheets for website, xhtml-1_1, docbook -> epub + convertor + * Wed Feb 11 2009 Ondrej Vasik 1.74.0-5 - Fix broken varlistentry (#479683) * Fri Dec 12 2008 Ondrej Vasik 1.74.0-4 -- Author_Group "" merged between "" +- Author_Group "" merged between "" and "" (#473019) * Wed Aug 06 2008 Kamil Dudka 1.74.0-3 docbook-xsl-marginleft.patch: docbook-xsl-1.74.0/fo/lists.xsl | 34 ++++------------------------------ docbook-xsl-1.74.0/fo/param.xsl | 4 ++-- docbook-xsl-1.75.0/fo/pagesetup.xsl | 11 +---------- 3 files changed, 7 insertions(+), 42 deletions(-) Index: docbook-xsl-marginleft.patch =================================================================== RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/docbook-xsl-marginleft.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- docbook-xsl-marginleft.patch 6 Aug 2008 11:56:12 -0000 1.7 +++ docbook-xsl-marginleft.patch 2 Nov 2009 09:43:14 -0000 1.8 @@ -63,24 +63,24 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/li -diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl ---- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -34,29 +34,11 @@ - margin-left="{$page.margin.outer} - {$title.margin.left}" - --> - -- -- -- -- -- -- -- - -- -- -- -+ +diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl +--- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 +@@ -133,8 +133,8 @@ + + always + +- +- ++ ++ + false + + +diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl +--- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 +0200 ++++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200 +@@ -30,16 +30,7 @@ @@ -98,17 +98,3 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pa -diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl ---- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -133,8 +133,8 @@ - - always - -- -- -+ -+ - false - - Index: sources =================================================================== RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- sources 3 Jun 2008 11:16:45 -0000 1.22 +++ sources 2 Nov 2009 09:43:14 -0000 1.23 @@ -1,2 +1,2 @@ -c9afc756e127ac91486ad28748b679c3 docbook-xsl-1.74.0.tar.gz -3a38cdcfadfacd75ebd1ab6c423d4fd6 docbook-xsl-doc-1.74.0.tar.bz2 +0c76a58a8e6cb5ab49f819e79917308f docbook-xsl-1.75.2.tar.bz2 +0a59c4c1796683fca32881c221df0b16 docbook-xsl-doc-1.75.2.tar.bz2 --- docbook-xsl-weird-orgname-use.patch DELETED --- From pkgdb at fedoraproject.org Mon Nov 2 09:45:59 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:45:59 +0000 Subject: [pkgdb] unzip ownership updated Message-ID: <20091102094559.D9A7810F844@bastion2.fedora.phx.redhat.com> Package unzip in Fedora devel was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/unzip From pkgdb at fedoraproject.org Mon Nov 2 09:46:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:46:05 +0000 Subject: [pkgdb] unzip ownership updated Message-ID: <20091102094605.381B910F802@bastion2.fedora.phx.redhat.com> Package unzip in Fedora 12 was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/unzip From pkgdb at fedoraproject.org Mon Nov 2 09:46:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:46:06 +0000 Subject: [pkgdb] unzip ownership updated Message-ID: <20091102094606.D07DC10F874@bastion2.fedora.phx.redhat.com> Package unzip in Fedora 11 was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/unzip From pkgdb at fedoraproject.org Mon Nov 2 09:47:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:47:37 +0000 Subject: [pkgdb] unzip ownership updated Message-ID: <20091102094737.9A33810F87B@bastion2.fedora.phx.redhat.com> Package unzip in Fedora devel is now owned by kklic To make changes to this package see: /pkgdb/packages/name/unzip From pkgdb at fedoraproject.org Mon Nov 2 09:47:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:47:43 +0000 Subject: [pkgdb] unzip ownership updated Message-ID: <20091102094743.A647A10F874@bastion2.fedora.phx.redhat.com> Package unzip in Fedora 11 is now owned by kklic To make changes to this package see: /pkgdb/packages/name/unzip From pkgdb at fedoraproject.org Mon Nov 2 09:47:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:47:47 +0000 Subject: [pkgdb] unzip ownership updated Message-ID: <20091102094748.0F95D10F802@bastion2.fedora.phx.redhat.com> Package unzip in Fedora 12 is now owned by kklic To make changes to this package see: /pkgdb/packages/name/unzip From pkgdb at fedoraproject.org Mon Nov 2 09:48:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:48:55 +0000 Subject: [pkgdb] zip ownership updated Message-ID: <20091102094855.DD39210F879@bastion2.fedora.phx.redhat.com> Package zip in Fedora 12 was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/zip From pkgdb at fedoraproject.org Mon Nov 2 09:48:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:48:53 +0000 Subject: [pkgdb] zip ownership updated Message-ID: <20091102094853.7F15D10F844@bastion2.fedora.phx.redhat.com> Package zip in Fedora devel was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/zip From pkgdb at fedoraproject.org Mon Nov 2 09:48:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:48:57 +0000 Subject: [pkgdb] zip ownership updated Message-ID: <20091102094857.748FF10F87B@bastion2.fedora.phx.redhat.com> Package zip in Fedora 11 was orphaned by varekova To make changes to this package see: /pkgdb/packages/name/zip From pkgdb at fedoraproject.org Mon Nov 2 09:49:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:49:18 +0000 Subject: [pkgdb] zip ownership updated Message-ID: <20091102094918.B93C110F874@bastion2.fedora.phx.redhat.com> Package zip in Fedora devel is now owned by kklic To make changes to this package see: /pkgdb/packages/name/zip From pkgdb at fedoraproject.org Mon Nov 2 09:49:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:49:25 +0000 Subject: [pkgdb] zip ownership updated Message-ID: <20091102094925.EF21A10F844@bastion2.fedora.phx.redhat.com> Package zip in Fedora 11 is now owned by kklic To make changes to this package see: /pkgdb/packages/name/zip From pkgdb at fedoraproject.org Mon Nov 2 09:49:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:49:27 +0000 Subject: [pkgdb] zip ownership updated Message-ID: <20091102094927.AD0B610F879@bastion2.fedora.phx.redhat.com> Package zip in Fedora 12 is now owned by kklic To make changes to this package see: /pkgdb/packages/name/zip From pkgdb at fedoraproject.org Mon Nov 2 09:52:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:52:33 +0000 Subject: [pkgdb] logwatch: varekova has requested watchbugzilla Message-ID: <20091102095233.2E0C810F87F@bastion2.fedora.phx.redhat.com> varekova has requested the watchbugzilla acl on logwatch (Fedora devel) To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:52:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:52:33 +0000 Subject: [pkgdb] logwatch: varekova has requested watchcommits Message-ID: <20091102095233.3A3F610F883@bastion2.fedora.phx.redhat.com> varekova has requested the watchcommits acl on logwatch (Fedora devel) To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:52:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:52:33 +0000 Subject: [pkgdb] logwatch: varekova has requested commit Message-ID: <20091102095233.948AA10F88B@bastion2.fedora.phx.redhat.com> varekova has requested the commit acl on logwatch (Fedora devel) To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:52:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:52:38 +0000 Subject: [pkgdb] logwatch: varekova has requested watchcommits Message-ID: <20091102095238.3C0C010F88E@bastion2.fedora.phx.redhat.com> varekova has requested the watchcommits acl on logwatch (Fedora 11) To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:52:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:52:38 +0000 Subject: [pkgdb] logwatch: varekova has requested watchbugzilla Message-ID: <20091102095238.6340510F894@bastion2.fedora.phx.redhat.com> varekova has requested the watchbugzilla acl on logwatch (Fedora 11) To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:52:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:52:39 +0000 Subject: [pkgdb] logwatch: varekova has requested commit Message-ID: <20091102095239.98A3B10F89A@bastion2.fedora.phx.redhat.com> varekova has requested the commit acl on logwatch (Fedora 11) To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:52:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:52:42 +0000 Subject: [pkgdb] logwatch: varekova has requested watchcommits Message-ID: <20091102095242.3CF8C10F89E@bastion2.fedora.phx.redhat.com> varekova has requested the watchcommits acl on logwatch (Fedora 12) To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:52:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:52:42 +0000 Subject: [pkgdb] logwatch: varekova has requested watchbugzilla Message-ID: <20091102095242.4F4D810F8A2@bastion2.fedora.phx.redhat.com> varekova has requested the watchbugzilla acl on logwatch (Fedora 12) To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 09:52:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 09:52:43 +0000 Subject: [pkgdb] logwatch: varekova has requested commit Message-ID: <20091102095243.5205510F8A6@bastion2.fedora.phx.redhat.com> varekova has requested the commit acl on logwatch (Fedora 12) To make changes to this package see: /pkgdb/packages/name/logwatch From kasal at fedoraproject.org Mon Nov 2 09:53:34 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 09:53:34 +0000 (UTC) Subject: rpms/perl-HTML-Parser/devel .cvsignore, 1.16, 1.17 perl-HTML-Parser.spec, 1.39, 1.40 sources, 1.17, 1.18 Message-ID: <20091102095334.D00B511C00E8@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-HTML-Parser/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2471 Modified Files: .cvsignore perl-HTML-Parser.spec sources Log Message: - new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Parser/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 23 Oct 2009 14:12:18 -0000 1.16 +++ .cvsignore 2 Nov 2009 09:53:33 -0000 1.17 @@ -1 +1 @@ -HTML-Parser-3.63.tar.gz +HTML-Parser-3.64.tar.gz Index: perl-HTML-Parser.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- perl-HTML-Parser.spec 23 Oct 2009 20:22:49 -0000 1.39 +++ perl-HTML-Parser.spec 2 Nov 2009 09:53:33 -0000 1.40 @@ -1,8 +1,8 @@ %define real_name HTML-Parser Name: perl-%{real_name} -Version: 3.63 -Release: 2%{?dist} +Version: 3.64 +Release: 1%{?dist} Summary: Perl module for parsing HTML Group: Development/Libraries @@ -11,9 +11,9 @@ Url: http://search.cpan.org/d Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl(HTML::Tagset) >= 3.03, perl(ExtUtils::MakeMaker), perl(Test::Simple) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(HTML::Tagset) >= 3.03, perl(ExtUtils::MakeMaker), perl(Test::More) Requires: perl(HTML::Tagset) >= 3.03 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # don't "provide" private Perl libs %global _use_internal_dependency_generator 0 @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 2 2009 Stepan Kasal - 3.64-1 +- new upstream version + * Fri Oct 23 2009 Warren Togami - 3.63-2 - 3.63 CVE-2009-3627 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Parser/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- sources 23 Oct 2009 14:12:18 -0000 1.17 +++ sources 2 Nov 2009 09:53:33 -0000 1.18 @@ -1 +1 @@ -64d1d54411ea71f89c3bab23bfd14abc HTML-Parser-3.63.tar.gz +26ceb6357e855b9e7aad5a5fd66d493e HTML-Parser-3.64.tar.gz From kasal at fedoraproject.org Mon Nov 2 09:55:40 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 09:55:40 +0000 (UTC) Subject: rpms/perl-MIME-Lite/devel .cvsignore, 1.3, 1.4 perl-MIME-Lite.spec, 1.12, 1.13 sources, 1.3, 1.4 Message-ID: <20091102095540.3339111C00E8@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-MIME-Lite/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3209 Modified Files: .cvsignore perl-MIME-Lite.spec sources Log Message: - new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 7 Oct 2009 13:52:33 -0000 1.3 +++ .cvsignore 2 Nov 2009 09:55:39 -0000 1.4 @@ -1 +1 @@ -MIME-Lite-3.026.tar.gz +MIME-Lite-3.027.tar.gz Index: perl-MIME-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/devel/perl-MIME-Lite.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- perl-MIME-Lite.spec 7 Oct 2009 14:26:01 -0000 1.12 +++ perl-MIME-Lite.spec 2 Nov 2009 09:55:39 -0000 1.13 @@ -1,6 +1,6 @@ Name: perl-MIME-Lite -Version: 3.026 -Release: 2%{?dist} +Version: 3.027 +Release: 1%{?dist} Summary: MIME::Lite - low-calorie MIME generator Group: Development/Libraries @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 2 2009 Stepan Kasal - 3.027-1 +- new upstream version + * Wed Oct 7 2009 Stepan Kasal - 3.26-2 - no need to search for *.bs files in noarch rpm Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 7 Oct 2009 13:52:33 -0000 1.3 +++ sources 2 Nov 2009 09:55:39 -0000 1.4 @@ -1 +1 @@ -9917ed1d8bf9d9e9e65ddd89c55489a7 MIME-Lite-3.026.tar.gz +e857febd66c45f2a5919b031fbe70aa7 MIME-Lite-3.027.tar.gz From kasal at fedoraproject.org Mon Nov 2 09:57:39 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 09:57:39 +0000 (UTC) Subject: rpms/perl-Cache-Memcached/devel .cvsignore, 1.3, 1.4 perl-Cache-Memcached.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20091102095739.DD1FE11C00E8@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-Cache-Memcached/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3865 Modified Files: .cvsignore perl-Cache-Memcached.spec sources Log Message: - new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Memcached/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 5 Oct 2009 16:25:52 -0000 1.3 +++ .cvsignore 2 Nov 2009 09:57:38 -0000 1.4 @@ -1 +1 @@ -Cache-Memcached-1.27.tar.gz +Cache-Memcached-1.28.tar.gz Index: perl-Cache-Memcached.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Memcached/devel/perl-Cache-Memcached.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- perl-Cache-Memcached.spec 5 Oct 2009 16:25:52 -0000 1.3 +++ perl-Cache-Memcached.spec 2 Nov 2009 09:57:38 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Cache-Memcached -Version: 1.27 +Version: 1.28 Release: 1%{?dist} Summary: Perl client for memcached @@ -54,6 +54,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 2 2009 Stepan Kasal - 1.28-1 +- new upstream version + * Sat Jul 25 2009 Fedora Release Engineering - 1.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Memcached/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 5 Oct 2009 16:25:52 -0000 1.3 +++ sources 2 Nov 2009 09:57:39 -0000 1.4 @@ -1 +1 @@ -897dbe9b24b4f918e2368c987425797c Cache-Memcached-1.27.tar.gz +2b0f49346cd0cddf30525b098bcabbe6 Cache-Memcached-1.28.tar.gz From jnovy at fedoraproject.org Mon Nov 2 09:59:41 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Mon, 2 Nov 2009 09:59:41 +0000 (UTC) Subject: rpms/mc/devel .cvsignore, 1.41, 1.42 mc.spec, 1.151, 1.152 sources, 1.49, 1.50 Message-ID: <20091102095941.2EB0811C00E8@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/mc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4257 Modified Files: .cvsignore mc.spec sources Log Message: * Mon Nov 02 2009 Jindrich Novy 4.7.0-0.7.pre4 - update to 4.7.0-pre4 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mc/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- .cvsignore 5 Oct 2009 09:08:44 -0000 1.41 +++ .cvsignore 2 Nov 2009 09:59:39 -0000 1.42 @@ -1 +1 @@ -mc-4.7.0-pre3.tar.bz2 +mc-4.7.0-pre4.tar.bz2 Index: mc.spec =================================================================== RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -p -r1.151 -r1.152 --- mc.spec 12 Oct 2009 12:50:24 -0000 1.151 +++ mc.spec 2 Nov 2009 09:59:40 -0000 1.152 @@ -1,20 +1,18 @@ Summary: User-friendly text console file manager and visual shell Name: mc Version: 4.7.0 -Release: 0.6.pre3%{?dist} +Release: 0.7.pre4%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Shells # tarball created from git clone git://midnight-commander.org/git/mc.git -Source0: mc-%{version}-pre3.tar.bz2 +Source0: mc-%{version}-pre4.tar.bz2 URL: http://www.midnight-commander.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel e2fsprogs-devel slang-devel gpm-devel Requires: dev >= 3.3-3 -Patch1: mc-exit.patch Patch2: mc-extensions.patch -Patch3: mc-vfsfail.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -24,10 +22,8 @@ ability to FTP, view tar and zip files, specific files. %prep -%setup -q -n mc-%{version}-pre3 -%patch1 -p1 -b .exit +%setup -q -n mc-%{version}-pre4 %patch2 -p1 -b .extensions -%patch3 -p1 -b .vfsfail %build export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS" @@ -83,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/mc %changelog +* Mon Nov 02 2009 Jindrich Novy 4.7.0-0.7.pre4 +- update to 4.7.0-pre4 + * Mon Oct 12 2009 Jindrich Novy 4.7.0-0.6.pre3 - fix segfault while browsing various archives via VFS (#528268) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mc/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- sources 5 Oct 2009 09:08:44 -0000 1.49 +++ sources 2 Nov 2009 09:59:40 -0000 1.50 @@ -1 +1 @@ -8f5f84a2858c8aaecee7a221a9428370 mc-4.7.0-pre3.tar.bz2 +7bdc0ac4fe57c19a6bf2fd3e8894a073 mc-4.7.0-pre4.tar.bz2 From kasal at fedoraproject.org Mon Nov 2 09:59:46 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 09:59:46 +0000 (UTC) Subject: rpms/perl-Text-CSV_XS/devel .cvsignore, 1.8, 1.9 perl-Text-CSV_XS.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <20091102095946.51ADA11C00E8@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-Text-CSV_XS/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4309 Modified Files: .cvsignore perl-Text-CSV_XS.spec sources Log Message: - new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 7 Oct 2009 10:47:16 -0000 1.8 +++ .cvsignore 2 Nov 2009 09:59:45 -0000 1.9 @@ -1 +1 @@ -Text-CSV_XS-0.68.tar.gz +Text-CSV_XS-0.69.tgz Index: perl-Text-CSV_XS.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/devel/perl-Text-CSV_XS.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- perl-Text-CSV_XS.spec 7 Oct 2009 10:47:17 -0000 1.18 +++ perl-Text-CSV_XS.spec 2 Nov 2009 09:59:46 -0000 1.19 @@ -1,12 +1,12 @@ Name: perl-Text-CSV_XS -Version: 0.68 +Version: 0.69 Release: 1%{?dist} Summary: Comma-separated values manipulation routines Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Text-CSV_XS/ -Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::Pod) @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 2 2009 Stepan Kasal - 0.69 +- new upstream release + * Wed Oct 7 2009 Marcela Ma?l??ov? - 0.68-1 - update to new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 7 Oct 2009 10:47:17 -0000 1.8 +++ sources 2 Nov 2009 09:59:46 -0000 1.9 @@ -1 +1 @@ -be6b24649b7830791fa5d069d8b3881c Text-CSV_XS-0.68.tar.gz +8788c57a50704265e35171746473b404 Text-CSV_XS-0.69.tgz From kasal at fedoraproject.org Mon Nov 2 10:00:20 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 10:00:20 +0000 (UTC) Subject: rpms/perl-HTML-Parser/F-12 .cvsignore, 1.16, 1.17 perl-HTML-Parser.spec, 1.39, 1.40 sources, 1.17, 1.18 Message-ID: <20091102100020.E61D411C0417@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-HTML-Parser/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4490 Modified Files: .cvsignore perl-HTML-Parser.spec sources Log Message: sync with rawhide Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Parser/F-12/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 23 Oct 2009 14:13:51 -0000 1.16 +++ .cvsignore 2 Nov 2009 10:00:20 -0000 1.17 @@ -1 +1 @@ -HTML-Parser-3.63.tar.gz +HTML-Parser-3.64.tar.gz Index: perl-HTML-Parser.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Parser/F-12/perl-HTML-Parser.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- perl-HTML-Parser.spec 23 Oct 2009 20:23:35 -0000 1.39 +++ perl-HTML-Parser.spec 2 Nov 2009 10:00:20 -0000 1.40 @@ -1,8 +1,8 @@ %define real_name HTML-Parser Name: perl-%{real_name} -Version: 3.63 -Release: 2%{?dist} +Version: 3.64 +Release: 1%{?dist} Summary: Perl module for parsing HTML Group: Development/Libraries @@ -11,9 +11,9 @@ Url: http://search.cpan.org/d Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl(HTML::Tagset) >= 3.03, perl(ExtUtils::MakeMaker), perl(Test::Simple) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(HTML::Tagset) >= 3.03, perl(ExtUtils::MakeMaker), perl(Test::More) Requires: perl(HTML::Tagset) >= 3.03 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # don't "provide" private Perl libs %global _use_internal_dependency_generator 0 @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 2 2009 Stepan Kasal - 3.64-1 +- new upstream version + * Fri Oct 23 2009 Warren Togami - 3.63-2 - 3.63 CVE-2009-3627 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Parser/F-12/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- sources 23 Oct 2009 14:13:51 -0000 1.17 +++ sources 2 Nov 2009 10:00:20 -0000 1.18 @@ -1 +1 @@ -64d1d54411ea71f89c3bab23bfd14abc HTML-Parser-3.63.tar.gz +26ceb6357e855b9e7aad5a5fd66d493e HTML-Parser-3.64.tar.gz From kasal at fedoraproject.org Mon Nov 2 10:01:02 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 10:01:02 +0000 (UTC) Subject: rpms/perl-MIME-Lite/F-12 .cvsignore, 1.3, 1.4 perl-MIME-Lite.spec, 1.11, 1.12 sources, 1.3, 1.4 Message-ID: <20091102100102.39E2911C02BC@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-MIME-Lite/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4664 Modified Files: .cvsignore perl-MIME-Lite.spec sources Log Message: sync with rawhide Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/F-12/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 29 Oct 2009 19:23:28 -0000 1.3 +++ .cvsignore 2 Nov 2009 10:01:01 -0000 1.4 @@ -1 +1 @@ -MIME-Lite-3.026.tar.gz +MIME-Lite-3.027.tar.gz Index: perl-MIME-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/F-12/perl-MIME-Lite.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- perl-MIME-Lite.spec 29 Oct 2009 19:23:28 -0000 1.11 +++ perl-MIME-Lite.spec 2 Nov 2009 10:01:01 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-MIME-Lite -Version: 3.026 -Release: 2%{?dist} +Version: 3.027 +Release: 1%{?dist} Summary: MIME::Lite - low-calorie MIME generator Group: Development/Libraries @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 2 2009 Stepan Kasal - 3.027-1 +- new upstream version + * Wed Oct 7 2009 Stepan Kasal - 3.26-2 - no need to search for *.bs files in noarch rpm Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/F-12/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 29 Oct 2009 19:23:28 -0000 1.3 +++ sources 2 Nov 2009 10:01:01 -0000 1.4 @@ -1 +1 @@ -9917ed1d8bf9d9e9e65ddd89c55489a7 MIME-Lite-3.026.tar.gz +e857febd66c45f2a5919b031fbe70aa7 MIME-Lite-3.027.tar.gz From kasal at fedoraproject.org Mon Nov 2 10:03:02 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 10:03:02 +0000 (UTC) Subject: rpms/perl-Cache-Memcached/F-12 .cvsignore, 1.3, 1.4 perl-Cache-Memcached.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20091102100302.8DD8111C02BC@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-Cache-Memcached/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5137 Modified Files: .cvsignore perl-Cache-Memcached.spec sources Log Message: sync with rawhide Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Memcached/F-12/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 29 Oct 2009 17:58:54 -0000 1.3 +++ .cvsignore 2 Nov 2009 10:03:00 -0000 1.4 @@ -1 +1 @@ -Cache-Memcached-1.27.tar.gz +Cache-Memcached-1.28.tar.gz Index: perl-Cache-Memcached.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Memcached/F-12/perl-Cache-Memcached.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- perl-Cache-Memcached.spec 29 Oct 2009 17:58:54 -0000 1.3 +++ perl-Cache-Memcached.spec 2 Nov 2009 10:03:01 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Cache-Memcached -Version: 1.27 +Version: 1.28 Release: 1%{?dist} Summary: Perl client for memcached @@ -54,6 +54,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 2 2009 Stepan Kasal - 1.28-1 +- new upstream version + * Sat Jul 25 2009 Fedora Release Engineering - 1.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Cache-Memcached/F-12/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 29 Oct 2009 17:58:54 -0000 1.3 +++ sources 2 Nov 2009 10:03:01 -0000 1.4 @@ -1 +1 @@ -897dbe9b24b4f918e2368c987425797c Cache-Memcached-1.27.tar.gz +2b0f49346cd0cddf30525b098bcabbe6 Cache-Memcached-1.28.tar.gz From airlied at fedoraproject.org Mon Nov 2 10:08:29 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Mon, 2 Nov 2009 10:08:29 +0000 (UTC) Subject: rpms/kernel/F-12 kernel.spec, 1.1892, 1.1893 drm-kms-r600-maybe-fix.patch, 1.1, NONE Message-ID: <20091102100829.6AECF11C00E8@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6812 Modified Files: kernel.spec Removed Files: drm-kms-r600-maybe-fix.patch Log Message: * Mon Nov 02 2009 Dave Airlie 2.6.31.5-107 - r600: back that out, thanks to yaneti for testing. Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v retrieving revision 1.1892 retrieving revision 1.1893 diff -u -p -r1.1892 -r1.1893 --- kernel.spec 2 Nov 2009 03:04:03 -0000 1.1892 +++ kernel.spec 2 Nov 2009 10:08:28 -0000 1.1893 @@ -697,7 +697,6 @@ Patch1825: drm-intel-pm.patch Patch1826: drm-intel-no-tv-hotplug.patch Patch1827: drm-disable-r600-aspm.patch Patch1828: drm-radeon-agp-font-fix.patch -Patch1829: drm-kms-r600-maybe-fix.patch # vga arb Patch1900: linux-2.6-vga-arb.patch @@ -1383,7 +1382,6 @@ ApplyPatch linux-2.6-e1000-ich9.patch ApplyPatch kms-offb-handoff.patch ApplyPatch drm-next-ea1495a6.patch ApplyPatch drm-radeon-agp-font-fix.patch -ApplyPatch drm-kms-r600-maybe-fix.patch ApplyPatch drm-nouveau.patch # pm broken on my thinkpad t60p - airlied @@ -2106,6 +2104,9 @@ fi # and build. %changelog +* Mon Nov 02 2009 Dave Airlie 2.6.31.5-107 +- r600: back that out, thanks to yaneti for testing. + * Mon Nov 02 2009 Dave Airlie 2.6.31.5-106 - r600: ring size guesswork fix. --- drm-kms-r600-maybe-fix.patch DELETED --- From kasal at fedoraproject.org Mon Nov 2 10:12:38 2009 From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=) Date: Mon, 2 Nov 2009 10:12:38 +0000 (UTC) Subject: rpms/perl-Text-CSV_XS/F-12 .cvsignore, 1.8, 1.9 perl-Text-CSV_XS.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <20091102101238.8026711C00E8@cvs1.fedora.phx.redhat.com> Author: kasal Update of /cvs/extras/rpms/perl-Text-CSV_XS/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9228 Modified Files: .cvsignore perl-Text-CSV_XS.spec sources Log Message: sync with rawhide Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/F-12/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 29 Oct 2009 19:09:20 -0000 1.8 +++ .cvsignore 2 Nov 2009 10:12:37 -0000 1.9 @@ -1 +1 @@ -Text-CSV_XS-0.68.tar.gz +Text-CSV_XS-0.69.tgz Index: perl-Text-CSV_XS.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/F-12/perl-Text-CSV_XS.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- perl-Text-CSV_XS.spec 29 Oct 2009 19:09:20 -0000 1.18 +++ perl-Text-CSV_XS.spec 2 Nov 2009 10:12:37 -0000 1.19 @@ -1,12 +1,12 @@ Name: perl-Text-CSV_XS -Version: 0.68 +Version: 0.69 Release: 1%{?dist} Summary: Comma-separated values manipulation routines Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Text-CSV_XS/ -Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::Pod) @@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 2 2009 Stepan Kasal - 0.69 +- new upstream release + * Wed Oct 7 2009 Marcela Ma?l??ov? - 0.68-1 - update to new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/F-12/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 29 Oct 2009 19:09:20 -0000 1.8 +++ sources 2 Nov 2009 10:12:37 -0000 1.9 @@ -1 +1 @@ -be6b24649b7830791fa5d069d8b3881c Text-CSV_XS-0.68.tar.gz +8788c57a50704265e35171746473b404 Text-CSV_XS-0.69.tgz From pkgdb at fedoraproject.org Mon Nov 2 10:20:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 10:20:15 +0000 Subject: [pkgdb] logwatch had acl change status Message-ID: <20091102102016.027A910F874@bastion2.fedora.phx.redhat.com> kklic has set the watchbugzilla acl on logwatch (Fedora devel) to Approved for varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 10:20:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 10:20:17 +0000 Subject: [pkgdb] logwatch had acl change status Message-ID: <20091102102017.A9FCD10F87F@bastion2.fedora.phx.redhat.com> kklic has set the watchcommits acl on logwatch (Fedora devel) to Approved for varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 10:20:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 10:20:19 +0000 Subject: [pkgdb] logwatch had acl change status Message-ID: <20091102102019.8251F10F883@bastion2.fedora.phx.redhat.com> kklic has set the commit acl on logwatch (Fedora devel) to Approved for varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 10:20:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 10:20:25 +0000 Subject: [pkgdb] logwatch had acl change status Message-ID: <20091102102025.6F1E610F874@bastion2.fedora.phx.redhat.com> kklic has set the watchcommits acl on logwatch (Fedora 11) to Approved for varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 10:20:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 10:20:25 +0000 Subject: [pkgdb] logwatch had acl change status Message-ID: <20091102102025.9DC7410F887@bastion2.fedora.phx.redhat.com> kklic has set the watchbugzilla acl on logwatch (Fedora 11) to Approved for varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 10:20:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 10:20:26 +0000 Subject: [pkgdb] logwatch had acl change status Message-ID: <20091102102026.6AD2F10F88B@bastion2.fedora.phx.redhat.com> kklic has set the commit acl on logwatch (Fedora 11) to Approved for varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 10:20:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 10:20:29 +0000 Subject: [pkgdb] logwatch had acl change status Message-ID: <20091102102029.9322510F880@bastion2.fedora.phx.redhat.com> kklic has set the watchbugzilla acl on logwatch (Fedora 12) to Approved for varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 10:20:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 10:20:29 +0000 Subject: [pkgdb] logwatch had acl change status Message-ID: <20091102102029.AD68010F88E@bastion2.fedora.phx.redhat.com> kklic has set the watchcommits acl on logwatch (Fedora 12) to Approved for varekova To make changes to this package see: /pkgdb/packages/name/logwatch From pkgdb at fedoraproject.org Mon Nov 2 10:20:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 10:20:30 +0000 Subject: [pkgdb] logwatch had acl change status Message-ID: <20091102102030.EC8F910F874@bastion2.fedora.phx.redhat.com> kklic has set the commit acl on logwatch (Fedora 12) to Approved for varekova To make changes to this package see: /pkgdb/packages/name/logwatch From cebbert at fedoraproject.org Mon Nov 2 10:33:32 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Mon, 2 Nov 2009 10:33:32 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.32-rc5-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.1138, 1.1139 kernel.spec, 1.1835, 1.1836 sources, 1.1097, 1.1098 upstream, 1.1010, 1.1011 patch-2.6.32-rc5-git3.bz2.sign, 1.1, NONE Message-ID: <20091102103332.7718D11C02BC@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13888 Modified Files: .cvsignore kernel.spec sources upstream Added Files: patch-2.6.32-rc5-git5.bz2.sign Removed Files: patch-2.6.32-rc5-git3.bz2.sign Log Message: 2.6.32-rc5-git5 --- NEW FILE patch-2.6.32-rc5-git5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBK7M/7yGugalF9Dw4RApDZAJ9fsIKuE9TfyDNuw5eLo1gg1fs6uQCfbkNE e6Jgtirp7A0dG87huiYH2vk= =Pmzs -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1138 retrieving revision 1.1139 diff -u -p -r1.1138 -r1.1139 --- .cvsignore 24 Oct 2009 22:17:56 -0000 1.1138 +++ .cvsignore 2 Nov 2009 10:33:29 -0000 1.1139 @@ -6,4 +6,4 @@ temp-* kernel-2.6.31 linux-2.6.31.tar.bz2 patch-2.6.32-rc5.bz2 -patch-2.6.32-rc5-git3.bz2 +patch-2.6.32-rc5-git5.bz2 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1835 retrieving revision 1.1836 diff -u -p -r1.1835 -r1.1836 --- kernel.spec 27 Oct 2009 19:08:16 -0000 1.1835 +++ kernel.spec 2 Nov 2009 10:33:29 -0000 1.1836 @@ -61,7 +61,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 3 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1971,6 +1971,9 @@ fi # ############################################################## %changelog +* Mon Nov 02 2009 Chuck Ebbert +- 2.6.32-rc5-git5 + * Tue Oct 27 2009 John W. Linville - Disable build of prism54 module Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.1097 retrieving revision 1.1098 diff -u -p -r1.1097 -r1.1098 --- sources 24 Oct 2009 22:17:56 -0000 1.1097 +++ sources 2 Nov 2009 10:33:29 -0000 1.1098 @@ -1,3 +1,3 @@ 84c077a37684e4cbfa67b18154390d8a linux-2.6.31.tar.bz2 29cfdb080df74d97e89e27bc855b0160 patch-2.6.32-rc5.bz2 -0a48014463a0ba764117200a3ae22983 patch-2.6.32-rc5-git3.bz2 +9ae6d9778c6634c5970973d08b0bcee1 patch-2.6.32-rc5-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.1010 retrieving revision 1.1011 diff -u -p -r1.1010 -r1.1011 --- upstream 24 Oct 2009 22:17:56 -0000 1.1010 +++ upstream 2 Nov 2009 10:33:29 -0000 1.1011 @@ -1,4 +1,4 @@ linux-2.6.31.tar.bz2 patch-2.6.32-rc5.bz2 -patch-2.6.32-rc5-git3.bz2 +patch-2.6.32-rc5-git5.bz2 --- patch-2.6.32-rc5-git3.bz2.sign DELETED --- From rishi at fedoraproject.org Mon Nov 2 10:44:52 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Mon, 2 Nov 2009 10:44:52 +0000 (UTC) Subject: rpms/libgdl/devel libgdl-2.28.1-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 libgdl.spec, 1.17, 1.18 sources, 1.11, 1.12 libgdl-2.27.3-pkgconfig.patch, 1.1, NONE Message-ID: <20091102104452.5517811C00E8@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libgdl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18336 Modified Files: .cvsignore libgdl.spec sources Added Files: libgdl-2.28.1-pkgconfig.patch Removed Files: libgdl-2.27.3-pkgconfig.patch Log Message: * Fri Oct 30 2009 Debarshi Ray - 2.28.1-1 - Version bump to 2.28.1. * Added new GdlSwitcherStyle name GDL_SWITCHER_STYLE_NONE. (GNOME Bugzilla #589317) * Translation updates. * http://download.gnome.org/sources/gdl/2.28/gdl-2.28.1.news * http://download.gnome.org/sources/gdl/2.27/gdl-2.27.92.news - Simplified mixed source licensing. There are no GPLv2 files left. libgdl-2.28.1-pkgconfig.patch: gdl-1.0.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE libgdl-2.28.1-pkgconfig.patch --- diff -urNp gdl-2.27.3.orig/gdl-1.0.pc.in gdl-2.27.3/gdl-1.0.pc.in --- gdl-2.27.3.orig/gdl-1.0.pc.in 2009-07-10 10:47:32.000000000 +0530 +++ gdl-2.27.3/gdl-1.0.pc.in 2009-07-10 10:47:50.000000000 +0530 @@ -8,6 +8,6 @@ idldir=@datadir@/idl/libgdl-1.0 Name: gdl Description: Gnome DevTool Libraries Version: @VERSION@ -Requires: gtk+-2.0 libxml-2.0 +Requires: gtk+-2.0 Libs: -L${libdir} -lgdl-1 Cflags: -I${includedir} Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 12 Aug 2009 17:20:40 -0000 1.11 +++ .cvsignore 2 Nov 2009 10:44:49 -0000 1.12 @@ -1 +1 @@ -gdl-2.27.3.tar.bz2 +gdl-2.28.1.tar.bz2 Index: libgdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/libgdl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- libgdl.spec 12 Aug 2009 17:20:40 -0000 1.17 +++ libgdl.spec 2 Nov 2009 10:44:49 -0000 1.18 @@ -1,12 +1,12 @@ Summary: Components and library for GNOME development tools Name: libgdl -Version: 2.27.3 -Release: 3%{?dist} +Version: 2.28.1 +Release: 1%{?dist} # Mixed source licensing scenario. -License: (GPLv2 and GPLv2+ and LGPLv2+) +License: (GPLv2+ and LGPLv2+) Group: Development/Libraries URL: http://www.gnome.org/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/gdl/2.27/gdl-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gdl/2.28/gdl-%{version}.tar.bz2 Patch0: %{name}-%{version}-pkgconfig.patch @@ -70,7 +70,6 @@ rm -rf $RPM_BUILD_ROOT %files -f gdl-1.lang %defattr (-,root,root,-) %doc AUTHORS -%doc ChangeLog %doc MAINTAINERS %doc NEWS %doc README @@ -91,6 +90,15 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name}-1.0/gdl %changelog +* Fri Oct 30 2009 Debarshi Ray - 2.28.1-1 +- Version bump to 2.28.1. + * Added new GdlSwitcherStyle name GDL_SWITCHER_STYLE_NONE. (GNOME Bugzilla + #589317) + * Translation updates. + * http://download.gnome.org/sources/gdl/2.28/gdl-2.28.1.news + * http://download.gnome.org/sources/gdl/2.27/gdl-2.27.92.news +- Simplified mixed source licensing. There are no GPLv2 files left. + * Tue Aug 11 2009 Ville Skytt? - 2.27.3-3 - Use bzipped upstream tarball. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 12 Aug 2009 17:20:40 -0000 1.11 +++ sources 2 Nov 2009 10:44:49 -0000 1.12 @@ -1 +1 @@ -1a01f8c43f7ed7dbae75307f0b6cc843 gdl-2.27.3.tar.bz2 +47834da68494a4d365a1dc569690397d gdl-2.28.1.tar.bz2 --- libgdl-2.27.3-pkgconfig.patch DELETED --- From rishi at fedoraproject.org Mon Nov 2 10:46:59 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Mon, 2 Nov 2009 10:46:59 +0000 (UTC) Subject: rpms/libgdl/F-12 libgdl-2.28.1-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 libgdl.spec, 1.17, 1.18 sources, 1.11, 1.12 libgdl-2.27.3-pkgconfig.patch, 1.1, NONE Message-ID: <20091102104659.F089411C00E8@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libgdl/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19214 Modified Files: .cvsignore libgdl.spec sources Added Files: libgdl-2.28.1-pkgconfig.patch Removed Files: libgdl-2.27.3-pkgconfig.patch Log Message: * Fri Oct 30 2009 Debarshi Ray - 2.28.1-1 - Version bump to 2.28.1. * Added new GdlSwitcherStyle name GDL_SWITCHER_STYLE_NONE. (GNOME Bugzilla #589317) * Translation updates. * http://download.gnome.org/sources/gdl/2.28/gdl-2.28.1.news * http://download.gnome.org/sources/gdl/2.27/gdl-2.27.92.news - Simplified mixed source licensing. There are no GPLv2 files left. libgdl-2.28.1-pkgconfig.patch: gdl-1.0.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE libgdl-2.28.1-pkgconfig.patch --- diff -urNp gdl-2.27.3.orig/gdl-1.0.pc.in gdl-2.27.3/gdl-1.0.pc.in --- gdl-2.27.3.orig/gdl-1.0.pc.in 2009-07-10 10:47:32.000000000 +0530 +++ gdl-2.27.3/gdl-1.0.pc.in 2009-07-10 10:47:50.000000000 +0530 @@ -8,6 +8,6 @@ idldir=@datadir@/idl/libgdl-1.0 Name: gdl Description: Gnome DevTool Libraries Version: @VERSION@ -Requires: gtk+-2.0 libxml-2.0 +Requires: gtk+-2.0 Libs: -L${libdir} -lgdl-1 Cflags: -I${includedir} Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-12/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 12 Aug 2009 17:20:40 -0000 1.11 +++ .cvsignore 2 Nov 2009 10:46:58 -0000 1.12 @@ -1 +1 @@ -gdl-2.27.3.tar.bz2 +gdl-2.28.1.tar.bz2 Index: libgdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-12/libgdl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- libgdl.spec 12 Aug 2009 17:20:40 -0000 1.17 +++ libgdl.spec 2 Nov 2009 10:46:59 -0000 1.18 @@ -1,12 +1,12 @@ Summary: Components and library for GNOME development tools Name: libgdl -Version: 2.27.3 -Release: 3%{?dist} +Version: 2.28.1 +Release: 1%{?dist} # Mixed source licensing scenario. -License: (GPLv2 and GPLv2+ and LGPLv2+) +License: (GPLv2+ and LGPLv2+) Group: Development/Libraries URL: http://www.gnome.org/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/gdl/2.27/gdl-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gdl/2.28/gdl-%{version}.tar.bz2 Patch0: %{name}-%{version}-pkgconfig.patch @@ -70,7 +70,6 @@ rm -rf $RPM_BUILD_ROOT %files -f gdl-1.lang %defattr (-,root,root,-) %doc AUTHORS -%doc ChangeLog %doc MAINTAINERS %doc NEWS %doc README @@ -91,6 +90,15 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name}-1.0/gdl %changelog +* Fri Oct 30 2009 Debarshi Ray - 2.28.1-1 +- Version bump to 2.28.1. + * Added new GdlSwitcherStyle name GDL_SWITCHER_STYLE_NONE. (GNOME Bugzilla + #589317) + * Translation updates. + * http://download.gnome.org/sources/gdl/2.28/gdl-2.28.1.news + * http://download.gnome.org/sources/gdl/2.27/gdl-2.27.92.news +- Simplified mixed source licensing. There are no GPLv2 files left. + * Tue Aug 11 2009 Ville Skytt? - 2.27.3-3 - Use bzipped upstream tarball. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/F-12/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 12 Aug 2009 17:20:40 -0000 1.11 +++ sources 2 Nov 2009 10:46:59 -0000 1.12 @@ -1 +1 @@ -1a01f8c43f7ed7dbae75307f0b6cc843 gdl-2.27.3.tar.bz2 +47834da68494a4d365a1dc569690397d gdl-2.28.1.tar.bz2 --- libgdl-2.27.3-pkgconfig.patch DELETED --- From tmraz at fedoraproject.org Mon Nov 2 10:48:53 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 2 Nov 2009 10:48:53 +0000 (UTC) Subject: rpms/pam/F-11 pam-1.1.0-console-fixes.patch, NONE, 1.1 pam-1.1.0-xauth-context.patch, NONE, 1.1 pam.spec, 1.196, 1.197 Message-ID: <20091102104853.C779C11C00E8@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20072 Modified Files: pam.spec Added Files: pam-1.1.0-console-fixes.patch pam-1.1.0-xauth-context.patch Log Message: * Mon Nov 2 2009 Tomas Mraz 1.0.91-7 - pam_console: fix memory corruption when executing handlers (patch by Stas Sergeev) and a few more fixes in the handler execution code (#532302) - pam_xauth: set the approprate context when creating .xauth files (#531530) pam-1.1.0-console-fixes.patch: handlers.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) --- NEW FILE pam-1.1.0-console-fixes.patch --- diff -up Linux-PAM-1.1.0/modules/pam_console/handlers.c.consolefix Linux-PAM-1.1.0/modules/pam_console/handlers.c --- Linux-PAM-1.1.0/modules/pam_console/handlers.c.consolefix 2009-11-02 08:45:24.000000000 +0100 +++ Linux-PAM-1.1.0/modules/pam_console/handlers.c 2009-11-02 08:50:19.000000000 +0100 @@ -172,13 +172,13 @@ call_exec(struct console_handler *handle const char *flagptr; const char **argv; int i = 0; - argv = malloc(sizeof(*argv)*nparams+2); - + argv = malloc(sizeof(*argv)*(nparams+2)); + if (argv == NULL) return; - + argv[i++] = handler->executable; - + for (flagptr = handler->flags; *flagptr != '\0'; flagptr += strlen(flagptr)+1) { switch (testflag(flagptr)) { case HF_LOGFAIL: @@ -231,7 +231,7 @@ execute_handler(pam_handle_t *pamh, stru } sighandler = signal(SIGCHLD, SIG_DFL); - + child = fork(); switch (child) { case -1: @@ -246,30 +246,31 @@ execute_handler(pam_handle_t *pamh, stru if (!wait_exit) { switch(fork()) { case 0: - exit(0); + if(setsid() == -1) { + _exit(255); + } + break; case -1: - exit(255); + _exit(255); default: - if(setsid() == -1) { - exit(255); - } + _exit(0); } } if (set_uid) { struct passwd *pw; pw = getpwnam(user); if (pw == NULL) - exit(255); + _exit(255); if (setgid(pw->pw_gid) == -1 || setuid(pw->pw_uid) == -1) - exit(255); + _exit(255); } call_exec(handler, nparams, user, tty); - exit(255); + _exit(255); default: break; } - + waitpid(child, &rv, 0); if (sighandler != SIG_ERR) pam-1.1.0-xauth-context.patch: Makefile.am | 2 +- pam_xauth.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 4 deletions(-) --- NEW FILE pam-1.1.0-xauth-context.patch --- diff -up Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am.xauth-context Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am --- Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am.xauth-context 2006-06-09 18:44:08.000000000 +0200 +++ Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am 2009-10-29 14:34:18.000000000 +0100 @@ -16,7 +16,7 @@ secureconfdir = $(SCONFIGDIR) AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ - -L$(top_builddir)/libpam -lpam + -L$(top_builddir)/libpam -lpam @LIBSELINUX@ if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif diff -up Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c.xauth-context Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c --- Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c.xauth-context 2009-04-09 10:07:29.000000000 +0200 +++ Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c 2009-10-29 16:13:21.000000000 +0100 @@ -57,6 +57,12 @@ #include #include +#ifdef WITH_SELINUX +#include +#include +#include +#endif + #define DATANAME "pam_xauth_cookie_file" #define XAUTHENV "XAUTHORITY" #define HOMEENV "HOME" @@ -461,6 +467,10 @@ pam_sm_open_session (pam_handle_t *pamh, getuid(), getgid(), xauth, "-f", cookiefile, "nlist", display, NULL) == 0) { + int save_errno; +#ifdef WITH_SELINUX + security_context_t context = NULL; +#endif /* Check that we got a cookie. If not, we get creative. */ if (((cookie == NULL) || (strlen(cookie) == 0)) && ((strncmp(display, "localhost:", 10) == 0) || @@ -545,12 +555,41 @@ pam_sm_open_session (pam_handle_t *pamh, /* Generate a new file to hold the data. */ euid = geteuid(); setfsuid(tpwd->pw_uid); - fd = mkstemp(xauthority + strlen(XAUTHENV) + 1); + +#ifdef WITH_SELINUX + if (is_selinux_enabled() > 0) { + struct selabel_handle *ctx = selabel_open(SELABEL_CTX_FILE, NULL, 0); + if (ctx != NULL) { + if (selabel_lookup(ctx, &context, + xauthority + sizeof(XAUTHENV), S_IFREG) != 0) { + pam_syslog(pamh, LOG_WARNING, + "could not get SELinux label for '%s'", + xauthority + sizeof(XAUTHENV)); + } + selabel_close(ctx); + if (setfscreatecon(context)) { + pam_syslog(pamh, LOG_WARNING, + "setfscreatecon(%s) failed: %m", context); + } + } + } + fd = mkstemp(xauthority + sizeof(XAUTHENV)); + save_errno = errno; + if (context != NULL) { + free(context); + setfscreatecon(NULL); + } +#else + fd = mkstemp(xauthority + sizeof(XAUTHENV)); + save_errno = errno; +#endif + setfsuid(euid); if (fd == -1) { + errno = save_errno; pam_syslog(pamh, LOG_ERR, "error creating temporary file `%s': %m", - xauthority + strlen(XAUTHENV) + 1); + xauthority + sizeof(XAUTHENV)); retval = PAM_SESSION_ERR; goto cleanup; } @@ -563,7 +602,7 @@ pam_sm_open_session (pam_handle_t *pamh, /* Get a copy of the filename to save as a data item for * removal at session-close time. */ free(cookiefile); - cookiefile = strdup(xauthority + strlen(XAUTHENV) + 1); + cookiefile = strdup(xauthority + sizeof(XAUTHENV)); /* Save the filename. */ if (pam_set_data(pamh, DATANAME, cookiefile, cleanup) != PAM_SUCCESS) { Index: pam.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam/F-11/pam.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -p -r1.196 -r1.197 --- pam.spec 10 Apr 2009 16:06:24 -0000 1.196 +++ pam.spec 2 Nov 2009 10:48:52 -0000 1.197 @@ -3,11 +3,10 @@ Summary: An extensible library which provides authentication for applications Name: pam Version: 1.0.91 -Release: 6%{?dist} +Release: 7%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+, -# pam_rhosts_auth module is BSD with advertising -License: BSD and GPLv2+ and BSD with advertising +License: BSD and GPLv2+ Group: System Environment/Base Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/beta/Linux-PAM-%{version}.tar.bz2 Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/beta/Linux-PAM-%{version}.tar.bz2.sign @@ -24,6 +23,8 @@ Source13: config-util.5 Source14: 90-nproc.conf Patch1: pam-1.0.90-redhat-modules.patch Patch2: pam-1.0.91-std-noclose.patch +Patch6: pam-1.1.0-xauth-context.patch +Patch7: pam-1.1.0-console-fixes.patch %define _sbindir /sbin %define _moduledir /%{_lib}/security @@ -86,6 +87,8 @@ mv pam-redhat-%{pam_redhat_version}/* mo %patch1 -p1 -b .redhat-modules %patch2 -p1 -b .std-noclose +%patch6 -p1 -b .xauth-context +%patch7 -p1 -b .console-fixes libtoolize -f autoreconf @@ -173,7 +176,7 @@ for dir in modules/pam_* ; do if [ -d ${dir} ] ; then %if ! %{WITH_SELINUX} [ ${dir} = "modules/pam_selinux" ] && continue -%endif +%endif if ! ls -1 $RPM_BUILD_ROOT%{_moduledir}/`basename ${dir}`*.so ; then echo ERROR `basename ${dir}` did not build a module. exit 1 @@ -325,6 +328,11 @@ fi %doc doc/adg/*.txt doc/adg/html %changelog +* Mon Nov 2 2009 Tomas Mraz 1.0.91-7 +- pam_console: fix memory corruption when executing handlers (patch by + Stas Sergeev) and a few more fixes in the handler execution code (#532302) +- pam_xauth: set the approprate context when creating .xauth files (#531530) + * Fri Apr 10 2009 Tomas Mraz 1.0.91-6 - add password-auth, fingerprint-auth, and smartcard-auth for applications which can use them namely gdm (#494874) From rjones at fedoraproject.org Mon Nov 2 10:53:40 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 2 Nov 2009 10:53:40 +0000 (UTC) Subject: rpms/ocaml-gettext/devel .cvsignore, 1.5, 1.6 ocaml-gettext.spec, 1.12, 1.13 sources, 1.5, 1.6 ocaml-gettext-0.3.2-dynlink.patch, 1.1, NONE Message-ID: <20091102105340.8A04C11C00E8@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-gettext/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21960 Modified Files: .cvsignore ocaml-gettext.spec sources Removed Files: ocaml-gettext-0.3.2-dynlink.patch Log Message: * Mon Nov 2 2009 Richard W.M. Jones - 0.3.3-1 - New upstream release 0.3.3 (mainly small bugfixes). - This requires ocaml-fileutils 0.4.0 and is incompatible with any earlier version. - Fixed a number of rpmlint warnings with *.ml files in the non-devel package. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-gettext/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 9 Jun 2008 15:48:46 -0000 1.5 +++ .cvsignore 2 Nov 2009 10:53:38 -0000 1.6 @@ -1 +1 @@ -ocaml-gettext-0.3.2.tar.gz +ocaml-gettext-0.3.3.tar.gz Index: ocaml-gettext.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-gettext/devel/ocaml-gettext.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- ocaml-gettext.spec 25 Jul 2009 19:57:17 -0000 1.12 +++ ocaml-gettext.spec 2 Nov 2009 10:53:39 -0000 1.13 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-gettext -Version: 0.3.2 -Release: 9%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: OCaml library for i18n Group: Development/Libraries @@ -13,14 +13,11 @@ Source0: http://sylvain.le-gall.n BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x -# Fix dynlink.cma now required with OCaml 3.11.0. -Patch0: ocaml-gettext-0.3.2-dynlink.patch - BuildRequires: ocaml >= 3.11.0-1 BuildRequires: ocaml-findlib-devel >= 1.2.1-3 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel -BuildRequires: ocaml-fileutils-devel +BuildRequires: ocaml-fileutils-devel >= 0.4.0 BuildRequires: ocaml-camlidl-devel BuildRequires: ocaml-ounit-devel BuildRequires: docbook-style-xsl @@ -66,7 +63,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} # BZ 446919. -Requires: ocaml-fileutils-devel +Requires: ocaml-fileutils-devel >= 0.4.0 %description devel @@ -101,7 +98,6 @@ signature files for developing applicati %prep %setup -q -%patch0 -p1 %build @@ -171,8 +167,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/ocaml/gettext-stub/*.cmxa %exclude %{_libdir}/ocaml/gettext-stub/*.cmx %endif +%exclude %{_libdir}/ocaml/gettext/*.ml %exclude %{_libdir}/ocaml/gettext/*.mli -%exclude %{_libdir}/ocaml/gettext-stub/*.mli +%exclude %{_libdir}/ocaml/gettext-stub/*.ml %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner @@ -189,8 +186,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/ocaml/gettext-stub/*.cmxa %{_libdir}/ocaml/gettext-stub/*.cmx %endif +%{_libdir}/ocaml/gettext/*.ml %{_libdir}/ocaml/gettext/*.mli -%{_libdir}/ocaml/gettext-stub/*.mli +%{_libdir}/ocaml/gettext-stub/*.ml %{_bindir}/ocaml-gettext %{_bindir}/ocaml-xgettext @@ -221,6 +219,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 2 2009 Richard W.M. Jones - 0.3.3-1 +- New upstream release 0.3.3 (mainly small bugfixes). +- This requires ocaml-fileutils 0.4.0 and is incompatible with + any earlier version. +- Fixed a number of rpmlint warnings with *.ml files in the + non-devel package. + * Sat Jul 25 2009 Fedora Release Engineering - 0.3.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-gettext/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 9 Jun 2008 15:48:46 -0000 1.5 +++ sources 2 Nov 2009 10:53:39 -0000 1.6 @@ -1 +1 @@ -a68e0574f7a668d645503ffe466c3500 ocaml-gettext-0.3.2.tar.gz +f1105a62770e6175490e79b803d59e0c ocaml-gettext-0.3.3.tar.gz --- ocaml-gettext-0.3.2-dynlink.patch DELETED --- From liangsuilong at fedoraproject.org Mon Nov 2 10:55:57 2009 From: liangsuilong at fedoraproject.org (Liang Suilong) Date: Mon, 2 Nov 2009 10:55:57 +0000 (UTC) Subject: rpms/iptux/F-12 .cvsignore, 1.3, 1.4 iptux.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20091102105557.8DE6011C00E8@cvs1.fedora.phx.redhat.com> Author: liangsuilong Update of /cvs/pkgs/rpms/iptux/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22866 Modified Files: .cvsignore iptux.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iptux/F-12/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 8 Oct 2009 15:56:17 -0000 1.3 +++ .cvsignore 2 Nov 2009 10:55:56 -0000 1.4 @@ -1,2 +1,3 @@ iptux-0.4.5-2.tar.gz iptux-0.5.0.tar.gz +iptux-0.5.1.tar.gz Index: iptux.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptux/F-12/iptux.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- iptux.spec 8 Oct 2009 15:56:17 -0000 1.3 +++ iptux.spec 2 Nov 2009 10:55:56 -0000 1.4 @@ -1,5 +1,5 @@ Name: iptux -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: A software for sharing in LAN Group: Applications/Internet @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/64x64/apps/ip-tux.png %changelog +* Mon Nov 2 2009 Liang Suilong 0.5.1-1 +- Upstream to 0.5.1 + * Thu Oct 8 2009 Liang Suilong 0.5.0-1 - Upstream to 0.5.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iptux/F-12/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 8 Oct 2009 15:56:17 -0000 1.3 +++ sources 2 Nov 2009 10:55:56 -0000 1.4 @@ -1,2 +1,3 @@ 7804f8a8486e8e9fa23eb661e34b3686 iptux-0.4.5-2.tar.gz d5c9cfa27c1d2e75ca3954028836b4fc iptux-0.5.0.tar.gz +83cd606cc2185d9ae6e6b9abab3af7f0 iptux-0.5.1.tar.gz From rishi at fedoraproject.org Mon Nov 2 10:59:12 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Mon, 2 Nov 2009 10:59:12 +0000 (UTC) Subject: rpms/libgdl/devel libgdl.spec,1.18,1.19 Message-ID: <20091102105912.61BC411C00E8@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/libgdl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24267 Modified Files: libgdl.spec Log Message: * Fri Oct 30 2009 Debarshi Ray - 2.28.1-2 - Added 'BuildRequires: gtk-doc' for Fedora 13 onwards. Index: libgdl.spec =================================================================== RCS file: /cvs/pkgs/rpms/libgdl/devel/libgdl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- libgdl.spec 2 Nov 2009 10:44:49 -0000 1.18 +++ libgdl.spec 2 Nov 2009 10:59:12 -0000 1.19 @@ -1,7 +1,7 @@ Summary: Components and library for GNOME development tools Name: libgdl Version: 2.28.1 -Release: 1%{?dist} +Release: 2%{?dist} # Mixed source licensing scenario. License: (GPLv2+ and LGPLv2+) Group: Development/Libraries @@ -14,6 +14,11 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na BuildRequires: gettext BuildRequires: gtk2-devel + +%if 0%{?fc13} +BuildRequires: gtk-doc +%endif + BuildRequires: intltool BuildRequires: libtool BuildRequires: libxml2-devel @@ -90,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name}-1.0/gdl %changelog +* Fri Oct 30 2009 Debarshi Ray - 2.28.1-2 +- Added 'BuildRequires: gtk-doc' for Fedora 13 onwards. + * Fri Oct 30 2009 Debarshi Ray - 2.28.1-1 - Version bump to 2.28.1. * Added new GdlSwitcherStyle name GDL_SWITCHER_STYLE_NONE. (GNOME Bugzilla From rjones at fedoraproject.org Mon Nov 2 11:03:49 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 2 Nov 2009 11:03:49 +0000 (UTC) Subject: rpms/vhostmd/F-12 vhostmd.conf,1.2,1.3 vhostmd.spec,1.3,1.4 Message-ID: <20091102110349.C8C5311C02A6@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/vhostmd/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25655 Modified Files: vhostmd.conf vhostmd.spec Log Message: Some changes to the default configuration file suggested by SAP to make it more CIM standards compliant. Index: vhostmd.conf =================================================================== RCS file: /cvs/pkgs/rpms/vhostmd/F-12/vhostmd.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- vhostmd.conf 15 Oct 2009 17:53:54 -0000 1.2 +++ vhostmd.conf 2 Nov 2009 11:03:47 -0000 1.3 @@ -39,55 +39,112 @@ within the vm element. VirtualizationVendor - echo Fedora + rpm -qi libvirt| grep Vendor: |awk '{print substr($0, index($0,$5)) }' + - VirtualizationProductInfo + VirtProductInfo virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}' - - TotalPhyCPUs - virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}' + + + HostSystemInfo + hostname -s + - NumCPUs + NumberOfPhysicalCPUsUtilized virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}' + - TotalPhyMem - virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}' + MemoryAllocatedToVirtualServers + virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{ printf "%d\n" $3/1024 }' + - UsedMem - free | grep '^Mem:' | gawk '{print $3}' + FreePhysicalMemory + + free|egrep -i '^[[:space:]]*(Mem:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $4; } + END { printf "%10d\n", sum/1024; }' + + + + UsedPhysicalMemory + + free|egrep -i '^[[:space:]]*(Mem:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $3; } + END { printf "%10d\n", sum/1024; }' + + - FreeMem - free | grep '^Mem:' | gawk '{print $4}' + FreeVirtualMemory + + free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $4; } + END { printf "%10d\n", sum/1024; }' + + + + + UsedVirtualMemory + + free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $3; } + END { printf "%10d\n", sum/1024; }' + PagedInMemory echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))" + + PagedOutMemory echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))" PageRates pagerate.pl + + TotalCPUTime virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \ gawk -F: '/CPU time/ {print $2;}' + + NumberOfAssignedPhysicalCPUs + virsh -r CONNECT dominfo NAME | grep 'CPU(s):' | gawk -F': +' '{print $2}' + + + + PhysicalMemoryAllocatedToVirtualSystem + virsh -r CONNECT dominfo NAME | grep 'Max memory:' | gawk -F' +' '{printf "%d\n", $3/1024}' + + + + + Index: vhostmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/vhostmd/F-12/vhostmd.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- vhostmd.spec 16 Oct 2009 16:10:56 -0000 1.3 +++ vhostmd.spec 2 Nov 2009 11:03:47 -0000 1.4 @@ -8,7 +8,7 @@ Summary: Virtualization host metrics daemon Name: vhostmd Version: 0.4 -Release: 0.5.gite9db007b%{?dist} +Release: 0.6.gite9db007b%{?dist} License: GPLv2+ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -183,6 +183,10 @@ exit 0 %changelog +* Mon Nov 2 2009 Richard W.M. Jones - 0.4-0.6.gite9db007b +- Some changes to the default configuration file suggested by SAP to + make it more CIM standards compliant. + * Fri Oct 16 2009 Richard W.M. Jones - 0.4-0.5.gite9db007b - New upstream based on git e9db007b. - Fix segfault in vm-dump-metrics (RHBZ#529348). From rjones at fedoraproject.org Mon Nov 2 11:03:50 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 2 Nov 2009 11:03:50 +0000 (UTC) Subject: rpms/vhostmd/devel vhostmd.conf,1.2,1.3 vhostmd.spec,1.3,1.4 Message-ID: <20091102110350.B753511C02A6@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/vhostmd/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25624 Modified Files: vhostmd.conf vhostmd.spec Log Message: Some changes to the default configuration file suggested by SAP to make it more CIM standards compliant. Index: vhostmd.conf =================================================================== RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- vhostmd.conf 15 Oct 2009 17:29:08 -0000 1.2 +++ vhostmd.conf 2 Nov 2009 11:03:49 -0000 1.3 @@ -39,55 +39,112 @@ within the vm element. VirtualizationVendor - echo Fedora + rpm -qi libvirt| grep Vendor: |awk '{print substr($0, index($0,$5)) }' + - VirtualizationProductInfo + VirtProductInfo virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}' - - TotalPhyCPUs - virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}' + + + HostSystemInfo + hostname -s + - NumCPUs + NumberOfPhysicalCPUsUtilized virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}' + - TotalPhyMem - virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}' + MemoryAllocatedToVirtualServers + virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{ printf "%d\n" $3/1024 }' + - UsedMem - free | grep '^Mem:' | gawk '{print $3}' + FreePhysicalMemory + + free|egrep -i '^[[:space:]]*(Mem:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $4; } + END { printf "%10d\n", sum/1024; }' + + + + UsedPhysicalMemory + + free|egrep -i '^[[:space:]]*(Mem:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $3; } + END { printf "%10d\n", sum/1024; }' + + - FreeMem - free | grep '^Mem:' | gawk '{print $4}' + FreeVirtualMemory + + free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $4; } + END { printf "%10d\n", sum/1024; }' + + + + + UsedVirtualMemory + + free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $3; } + END { printf "%10d\n", sum/1024; }' + PagedInMemory echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))" + + PagedOutMemory echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))" PageRates pagerate.pl + + TotalCPUTime virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \ gawk -F: '/CPU time/ {print $2;}' + + NumberOfAssignedPhysicalCPUs + virsh -r CONNECT dominfo NAME | grep 'CPU(s):' | gawk -F': +' '{print $2}' + + + + PhysicalMemoryAllocatedToVirtualSystem + virsh -r CONNECT dominfo NAME | grep 'Max memory:' | gawk -F' +' '{printf "%d\n", $3/1024}' + + + + + Index: vhostmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- vhostmd.spec 16 Oct 2009 16:10:40 -0000 1.3 +++ vhostmd.spec 2 Nov 2009 11:03:49 -0000 1.4 @@ -8,7 +8,7 @@ Summary: Virtualization host metrics daemon Name: vhostmd Version: 0.4 -Release: 0.5.gite9db007b%{?dist} +Release: 0.6.gite9db007b%{?dist} License: GPLv2+ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -183,6 +183,10 @@ exit 0 %changelog +* Mon Nov 2 2009 Richard W.M. Jones - 0.4-0.6.gite9db007b +- Some changes to the default configuration file suggested by SAP to + make it more CIM standards compliant. + * Fri Oct 16 2009 Richard W.M. Jones - 0.4-0.5.gite9db007b - New upstream based on git e9db007b. - Fix segfault in vm-dump-metrics (RHBZ#529348). From rjones at fedoraproject.org Mon Nov 2 11:03:52 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 2 Nov 2009 11:03:52 +0000 (UTC) Subject: rpms/vhostmd/F-11 vhostmd.conf,1.2,1.3 vhostmd.spec,1.3,1.4 Message-ID: <20091102110352.E18E511C02A6@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/vhostmd/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25646 Modified Files: vhostmd.conf vhostmd.spec Log Message: Some changes to the default configuration file suggested by SAP to make it more CIM standards compliant. Index: vhostmd.conf =================================================================== RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- vhostmd.conf 15 Oct 2009 17:53:57 -0000 1.2 +++ vhostmd.conf 2 Nov 2009 11:03:52 -0000 1.3 @@ -39,55 +39,112 @@ within the vm element. VirtualizationVendor - echo Fedora + rpm -qi libvirt| grep Vendor: |awk '{print substr($0, index($0,$5)) }' + - VirtualizationProductInfo + VirtProductInfo virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}' - - TotalPhyCPUs - virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}' + + + HostSystemInfo + hostname -s + - NumCPUs + NumberOfPhysicalCPUsUtilized virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}' + - TotalPhyMem - virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}' + MemoryAllocatedToVirtualServers + virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{ printf "%d\n" $3/1024 }' + - UsedMem - free | grep '^Mem:' | gawk '{print $3}' + FreePhysicalMemory + + free|egrep -i '^[[:space:]]*(Mem:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $4; } + END { printf "%10d\n", sum/1024; }' + + + + UsedPhysicalMemory + + free|egrep -i '^[[:space:]]*(Mem:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $3; } + END { printf "%10d\n", sum/1024; }' + + - FreeMem - free | grep '^Mem:' | gawk '{print $4}' + FreeVirtualMemory + + free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $4; } + END { printf "%10d\n", sum/1024; }' + + + + + UsedVirtualMemory + + free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $3; } + END { printf "%10d\n", sum/1024; }' + PagedInMemory echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))" + + PagedOutMemory echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))" PageRates pagerate.pl + + TotalCPUTime virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \ gawk -F: '/CPU time/ {print $2;}' + + NumberOfAssignedPhysicalCPUs + virsh -r CONNECT dominfo NAME | grep 'CPU(s):' | gawk -F': +' '{print $2}' + + + + PhysicalMemoryAllocatedToVirtualSystem + virsh -r CONNECT dominfo NAME | grep 'Max memory:' | gawk -F' +' '{printf "%d\n", $3/1024}' + + + + + Index: vhostmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- vhostmd.spec 16 Oct 2009 16:10:59 -0000 1.3 +++ vhostmd.spec 2 Nov 2009 11:03:52 -0000 1.4 @@ -8,7 +8,7 @@ Summary: Virtualization host metrics daemon Name: vhostmd Version: 0.4 -Release: 0.5.gite9db007b%{?dist} +Release: 0.6.gite9db007b%{?dist} License: GPLv2+ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -183,6 +183,10 @@ exit 0 %changelog +* Mon Nov 2 2009 Richard W.M. Jones - 0.4-0.6.gite9db007b +- Some changes to the default configuration file suggested by SAP to + make it more CIM standards compliant. + * Fri Oct 16 2009 Richard W.M. Jones - 0.4-0.5.gite9db007b - New upstream based on git e9db007b. - Fix segfault in vm-dump-metrics (RHBZ#529348). From rjones at fedoraproject.org Mon Nov 2 11:03:57 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 2 Nov 2009 11:03:57 +0000 (UTC) Subject: rpms/vhostmd/EL-5 vhostmd.conf,1.2,1.3 vhostmd.spec,1.5,1.6 Message-ID: <20091102110357.CEC9411C00E8@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/vhostmd/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25642 Modified Files: vhostmd.conf vhostmd.spec Log Message: Some changes to the default configuration file suggested by SAP to make it more CIM standards compliant. Index: vhostmd.conf =================================================================== RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/vhostmd.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- vhostmd.conf 15 Oct 2009 17:54:02 -0000 1.2 +++ vhostmd.conf 2 Nov 2009 11:03:55 -0000 1.3 @@ -39,55 +39,112 @@ within the vm element. VirtualizationVendor - echo Fedora + rpm -qi libvirt| grep Vendor: |awk '{print substr($0, index($0,$5)) }' + - VirtualizationProductInfo + VirtProductInfo virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}' - - TotalPhyCPUs - virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}' + + + HostSystemInfo + hostname -s + - NumCPUs + NumberOfPhysicalCPUsUtilized virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}' + - TotalPhyMem - virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}' + MemoryAllocatedToVirtualServers + virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{ printf "%d\n" $3/1024 }' + - UsedMem - free | grep '^Mem:' | gawk '{print $3}' + FreePhysicalMemory + + free|egrep -i '^[[:space:]]*(Mem:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $4; } + END { printf "%10d\n", sum/1024; }' + + + + UsedPhysicalMemory + + free|egrep -i '^[[:space:]]*(Mem:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $3; } + END { printf "%10d\n", sum/1024; }' + + - FreeMem - free | grep '^Mem:' | gawk '{print $4}' + FreeVirtualMemory + + free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $4; } + END { printf "%10d\n", sum/1024; }' + + + + + UsedVirtualMemory + + free|egrep -i '^[[:space:]]*(Mem:|Swap:)' \ + |awk 'BEGIN { sum = 0; } + { sum += $3; } + END { printf "%10d\n", sum/1024; }' + PagedInMemory echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))" + + PagedOutMemory echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))" PageRates pagerate.pl + + TotalCPUTime virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \ gawk -F: '/CPU time/ {print $2;}' + + NumberOfAssignedPhysicalCPUs + virsh -r CONNECT dominfo NAME | grep 'CPU(s):' | gawk -F': +' '{print $2}' + + + + PhysicalMemoryAllocatedToVirtualSystem + virsh -r CONNECT dominfo NAME | grep 'Max memory:' | gawk -F' +' '{printf "%d\n", $3/1024}' + + + + + Index: vhostmd.spec =================================================================== RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/vhostmd.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- vhostmd.spec 16 Oct 2009 16:11:03 -0000 1.5 +++ vhostmd.spec 2 Nov 2009 11:03:56 -0000 1.6 @@ -8,7 +8,7 @@ Summary: Virtualization host metrics daemon Name: vhostmd Version: 0.4 -Release: 0.5.gite9db007b%{?dist} +Release: 0.6.gite9db007b%{?dist} License: GPLv2+ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -183,6 +183,10 @@ exit 0 %changelog +* Mon Nov 2 2009 Richard W.M. Jones - 0.4-0.6.gite9db007b +- Some changes to the default configuration file suggested by SAP to + make it more CIM standards compliant. + * Fri Oct 16 2009 Richard W.M. Jones - 0.4-0.5.gite9db007b - New upstream based on git e9db007b. - Fix segfault in vm-dump-metrics (RHBZ#529348). From liangsuilong at fedoraproject.org Mon Nov 2 11:14:09 2009 From: liangsuilong at fedoraproject.org (Liang Suilong) Date: Mon, 2 Nov 2009 11:14:09 +0000 (UTC) Subject: rpms/iptux/F-12 iptux.spec,1.4,1.5 Message-ID: <20091102111409.BDC7A11C00E8@cvs1.fedora.phx.redhat.com> Author: liangsuilong Update of /cvs/pkgs/rpms/iptux/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29118 Modified Files: iptux.spec Log Message: Index: iptux.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptux/F-12/iptux.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- iptux.spec 2 Nov 2009 10:55:56 -0000 1.4 +++ iptux.spec 2 Nov 2009 11:14:07 -0000 1.5 @@ -1,6 +1,6 @@ Name: iptux Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software for sharing in LAN Group: Applications/Internet License: GPLv2+ @@ -49,8 +49,21 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/ %{_datadir}/icons/hicolor/64x64/apps/i-tux.png %{_datadir}/icons/hicolor/64x64/apps/ip-tux.png +%{_datadir}/icons/hicolor/16x16/apps/i-tux.png +%{_datadir}/icons/hicolor/16x16/apps/ip-tux.png +%{_datadir}/icons/hicolor/22x22/apps/i-tux.png +%{_datadir}/icons/hicolor/22x22/apps/ip-tux.png +%{_datadir}/icons/hicolor/24x24/apps/i-tux.png +%{_datadir}/icons/hicolor/24x24/apps/ip-tux.png +%{_datadir}/icons/hicolor/32x32/apps/i-tux.png +%{_datadir}/icons/hicolor/32x32/apps/ip-tux.png +%{_datadir}/icons/hicolor/48x48/apps/i-tux.png +%{_datadir}/icons/hicolor/48x48/apps/ip-tux.png %changelog +* Mon Nov 2 2009 Liang Suilong 0.5.1-2 +- Update RPM Spec file + * Mon Nov 2 2009 Liang Suilong 0.5.1-1 - Upstream to 0.5.1 From nucleo at fedoraproject.org Mon Nov 2 11:21:03 2009 From: nucleo at fedoraproject.org (nucleo) Date: Mon, 2 Nov 2009 11:21:03 +0000 (UTC) Subject: comps comps-f10.xml.in, 1.292, 1.293 comps-f11.xml.in, 1.326, 1.327 comps-f12.xml.in, 1.185, 1.186 comps-f13.xml.in, 1.72, 1.73 Message-ID: <20091102112103.97D6411C02C9@cvs1.fedora.phx.redhat.com> Author: nucleo Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31378 Modified Files: comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in Log Message: Added kde-plasma-quickaccess, kde-plasma-runcommand, kde-plasma-translatoid, qt-recordmydesktop, skanlite to kde-desktop group in F10-F13 Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.292 retrieving revision 1.293 diff -u -p -r1.292 -r1.293 --- comps-f10.xml.in 2 Nov 2009 02:52:38 -0000 1.292 +++ comps-f10.xml.in 2 Nov 2009 11:21:01 -0000 1.293 @@ -3054,6 +3054,9 @@ kcoloredit kcometen4 kde-colorscheme-plastik + kde-plasma-quickaccess + kde-plasma-runcommand + kde-plasma-translatoid kde-plasma-yawp kdeadmin kdeartwork-screensavers @@ -3097,12 +3100,14 @@ metamonitor oooqs2 polyester + qt-recordmydesktop qtcurve-kde4 rekall rsibreak rss-glx-kde scim-bridge-qt3 scim-qtimm + skanlite smb4k speedcrunch uim-qt3 Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.326 retrieving revision 1.327 diff -u -p -r1.326 -r1.327 --- comps-f11.xml.in 2 Nov 2009 02:52:38 -0000 1.326 +++ comps-f11.xml.in 2 Nov 2009 11:21:02 -0000 1.327 @@ -3507,6 +3507,9 @@ kcoloredit kcometen4 kde-colorscheme-plastik + kde-plasma-quickaccess + kde-plasma-runcommand + kde-plasma-translatoid kde-plasma-yawp kdeadmin kdeartwork @@ -3545,12 +3548,14 @@ metamonitor oooqs2 polyester + qt-recordmydesktop qtcurve-kde4 rekall rsibreak rss-glx-kde scim-bridge-qt3 scim-qtimm + skanlite smb4k speedcrunch uim-qt3 Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.185 retrieving revision 1.186 diff -u -p -r1.185 -r1.186 --- comps-f12.xml.in 2 Nov 2009 06:38:18 -0000 1.185 +++ comps-f12.xml.in 2 Nov 2009 11:21:02 -0000 1.186 @@ -3737,6 +3737,9 @@ kde-colorscheme-plastik kde-plasma-ktorrent kde-plasma-networkmanagement + kde-plasma-quickaccess + kde-plasma-runcommand + kde-plasma-translatoid kde-plasma-yawp kdeadmin kdeartwork @@ -3775,12 +3778,14 @@ metamonitor oooqs2 polyester + qt-recordmydesktop qtcurve-kde4 rekall rsibreak rss-glx-kde scim-bridge-qt3 scim-qtimm + skanlite smb4k speedcrunch uim-qt3 Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.72 retrieving revision 1.73 diff -u -p -r1.72 -r1.73 --- comps-f13.xml.in 2 Nov 2009 06:38:19 -0000 1.72 +++ comps-f13.xml.in 2 Nov 2009 11:21:02 -0000 1.73 @@ -3708,6 +3708,9 @@ kde-colorscheme-plastik kde-plasma-ktorrent kde-plasma-networkmanagement + kde-plasma-quickaccess + kde-plasma-runcommand + kde-plasma-translatoid kde-plasma-yawp kdeadmin kdeartwork @@ -3746,12 +3749,14 @@ metamonitor oooqs2 polyester + qt-recordmydesktop qtcurve-kde4 rekall rsibreak rss-glx-kde scim-bridge-qt3 scim-qtimm + skanlite smb4k speedcrunch uim-qt3 From tbzatek at fedoraproject.org Mon Nov 2 11:28:53 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Nov 2009 11:28:53 +0000 (UTC) Subject: rpms/seahorse/devel .cvsignore, 1.33, 1.34 seahorse.spec, 1.82, 1.83 sources, 1.35, 1.36 Message-ID: <20091102112853.5E05E11C00E8@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/seahorse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2137 Modified Files: .cvsignore seahorse.spec sources Log Message: * Mon Nov 2 2009 Tomas Bzatek 2.29.1-1 - Update to 2.29.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- .cvsignore 22 Sep 2009 08:20:08 -0000 1.33 +++ .cvsignore 2 Nov 2009 11:28:52 -0000 1.34 @@ -1 +1 @@ -seahorse-2.28.0.tar.bz2 +seahorse-2.29.1.tar.bz2 Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -p -r1.82 -r1.83 --- seahorse.spec 22 Sep 2009 08:20:09 -0000 1.82 +++ seahorse.spec 2 Nov 2009 11:28:52 -0000 1.83 @@ -1,5 +1,5 @@ Name: seahorse -Version: 2.28.0 +Version: 2.29.1 Release: 1%{?dist} Summary: A GNOME application for managing encryption keys Group: User Interface/Desktops @@ -164,6 +164,9 @@ fi %{_datadir}/gtk-doc/html/libseahorse %changelog +* Mon Nov 2 2009 Tomas Bzatek 2.29.1-1 +- Update to 2.29.1 + * Tue Sep 22 2009 Tomas Bzatek 2.28.0-1 - Update to 2.28.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- sources 22 Sep 2009 08:20:09 -0000 1.35 +++ sources 2 Nov 2009 11:28:52 -0000 1.36 @@ -1 +1 @@ -250495064ce62e19719167897cdea930 seahorse-2.28.0.tar.bz2 +5c476f145fb33887d36be4ec7f456dc7 seahorse-2.29.1.tar.bz2 From liangsuilong at fedoraproject.org Mon Nov 2 11:29:27 2009 From: liangsuilong at fedoraproject.org (Liang Suilong) Date: Mon, 2 Nov 2009 11:29:27 +0000 (UTC) Subject: rpms/iptux/F-11 iptux.spec,1.2,1.3 Message-ID: <20091102112927.58FB611C00E8@cvs1.fedora.phx.redhat.com> Author: liangsuilong Update of /cvs/pkgs/rpms/iptux/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2303 Modified Files: iptux.spec Log Message: Index: iptux.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptux/F-11/iptux.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- iptux.spec 8 Oct 2009 15:28:41 -0000 1.2 +++ iptux.spec 2 Nov 2009 11:29:25 -0000 1.3 @@ -1,6 +1,6 @@ Name: iptux -Version: 0.5.0 -Release: 1%{?dist} +Version: 0.5.1 +Release: 2%{?dist} Summary: A software for sharing in LAN Group: Applications/Internet License: GPLv2+ @@ -49,8 +49,24 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/ %{_datadir}/icons/hicolor/64x64/apps/i-tux.png %{_datadir}/icons/hicolor/64x64/apps/ip-tux.png +%{_datadir}/icons/hicolor/16x16/apps/i-tux.png +%{_datadir}/icons/hicolor/16x16/apps/ip-tux.png +%{_datadir}/icons/hicolor/22x22/apps/i-tux.png +%{_datadir}/icons/hicolor/22x22/apps/ip-tux.png +%{_datadir}/icons/hicolor/24x24/apps/i-tux.png +%{_datadir}/icons/hicolor/24x24/apps/ip-tux.png +%{_datadir}/icons/hicolor/32x32/apps/i-tux.png +%{_datadir}/icons/hicolor/32x32/apps/ip-tux.png +%{_datadir}/icons/hicolor/48x48/apps/i-tux.png +%{_datadir}/icons/hicolor/48x48/apps/ip-tux.png %changelog +* Mon Nov 2 2009 Liang Suilong 0.5.1-2 +- Update RPM Spec file + +* Mon Nov 2 2009 Liang Suilong 0.5.1-1 +- Upstream to 0.5.1 + * Thu Oct 8 2009 Liang Suilong 0.5.0-1 - Upstream to 0.5.0 From jfch2222 at fedoraproject.org Mon Nov 2 11:29:50 2009 From: jfch2222 at fedoraproject.org (Jan F. Chadima) Date: Mon, 2 Nov 2009 11:29:50 +0000 (UTC) Subject: rpms/openssh/devel openssh-4.3p2-gssapi-canohost.patch, 1.1, 1.2 openssh.spec, 1.176, 1.177 Message-ID: <20091102112950.9599611C00E8@cvs1.fedora.phx.redhat.com> Author: jfch2222 Update of /cvs/pkgs/rpms/openssh/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2465 Modified Files: openssh-4.3p2-gssapi-canohost.patch openssh.spec Log Message: Repair canohost patch to allow gssapi to work when host is acessed via pipe proxy openssh-4.3p2-gssapi-canohost.patch: sshconnect2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) Index: openssh-4.3p2-gssapi-canohost.patch =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-4.3p2-gssapi-canohost.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- openssh-4.3p2-gssapi-canohost.patch 30 Nov 2006 10:50:12 -0000 1.1 +++ openssh-4.3p2-gssapi-canohost.patch 2 Nov 2009 11:29:47 -0000 1.2 @@ -1,22 +1,20 @@ -Symptom: intermittent errors on GSSAPI authentication vs -machines on DNS loadbalancer, stupid client message "Generic Error", -server-side debug complains about unknown principal. - -Comes from the fact that we resolve the generic DNS name once for -the connection, then again for getting the GSSAPI/Kerberos service -ticket. So the service ticket may be for a different host, if -the DNS alias switches in between the two resolves. ---- openssh-4.3p2/sshconnect2.c.gss-canohost 2006-11-28 21:58:03.000000000 +0100 -+++ openssh-4.3p2/sshconnect2.c 2006-11-30 11:33:14.000000000 +0100 -@@ -485,6 +485,7 @@ +diff -up openssh-5.3p1/sshconnect2.c.canohost openssh-5.3p1/sshconnect2.c +--- openssh-5.3p1/sshconnect2.c.canohost 2009-03-05 14:58:22.000000000 +0100 ++++ openssh-5.3p1/sshconnect2.c 2009-11-02 11:55:00.000000000 +0100 +@@ -542,6 +542,12 @@ userauth_gssapi(Authctxt *authctxt) static u_int mech = 0; OM_uint32 min; int ok = 0; -+ const char* remotehost = get_canonical_hostname(1); ++ char* remotehost = NULL; ++ const char* canonicalhost = get_canonical_hostname(1); ++ if ( strcmp( canonicalhost, "UNKNOWN" ) == 0 ) ++ remotehost = authctxt->host; ++ else ++ remotehost = canonicalhost; /* Try one GSSAPI method at a time, rather than sending them all at * once. */ -@@ -497,7 +498,7 @@ +@@ -554,7 +560,7 @@ userauth_gssapi(Authctxt *authctxt) /* My DER encoding requires length<128 */ if (gss_supported->elements[mech].length < 128 && ssh_gssapi_check_mechanism(&gssctxt, Index: openssh.spec =================================================================== RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -p -r1.176 -r1.177 --- openssh.spec 29 Oct 2009 09:30:48 -0000 1.176 +++ openssh.spec 2 Nov 2009 11:29:48 -0000 1.177 @@ -69,7 +69,7 @@ Summary: An open source implementation of SSH protocol versions 1 and 2 Name: openssh Version: 5.3p1 -Release: 6%{?dist}%{?rescue_rel} +Release: 7%{?dist}%{?rescue_rel} URL: http://www.openssh.com/portable.html #URL1: http://pamsshauth.sourceforge.net #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz @@ -521,6 +521,9 @@ fi %endif %changelog +* Mon Nov 2 2009 Jan F. Chadima - 5.3p1-7 +- Repair canohost patch to allow gssapi to work when host is acessed via pipe proxy (#531849) + * Thu Oct 29 2009 Jan F. Chadima - 5.3p1-6 - Modify the init script to prevent it to hang during generating the keys (#515145) From tbzatek at fedoraproject.org Mon Nov 2 11:31:40 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Nov 2009 11:31:40 +0000 (UTC) Subject: rpms/seahorse/devel seahorse.spec,1.83,1.84 Message-ID: <20091102113141.0372211C02A6@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/seahorse/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3142 Modified Files: seahorse.spec Log Message: Fix source URL Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -p -r1.83 -r1.84 --- seahorse.spec 2 Nov 2009 11:28:52 -0000 1.83 +++ seahorse.spec 2 Nov 2009 11:31:40 -0000 1.84 @@ -7,7 +7,7 @@ Group: User Interface/Desktops # libcryptui is LGPLv2+ License: GPLv2+ and LGPLv2+ URL: http://projects.gnome.org/seahorse/ -Source: http://download.gnome.org/sources/seahorse/2.28/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/seahorse/2.29/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils From liangsuilong at fedoraproject.org Mon Nov 2 11:43:24 2009 From: liangsuilong at fedoraproject.org (Liang Suilong) Date: Mon, 2 Nov 2009 11:43:24 +0000 (UTC) Subject: rpms/iptux/F-11 iptux.spec,1.3,1.4 Message-ID: <20091102114324.9B28311C00E8@cvs1.fedora.phx.redhat.com> Author: liangsuilong Update of /cvs/pkgs/rpms/iptux/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7146 Modified Files: iptux.spec Log Message: Index: iptux.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptux/F-11/iptux.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- iptux.spec 2 Nov 2009 11:29:25 -0000 1.3 +++ iptux.spec 2 Nov 2009 11:43:22 -0000 1.4 @@ -1,6 +1,6 @@ Name: iptux Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A software for sharing in LAN Group: Applications/Internet License: GPLv2+ @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/48x48/apps/ip-tux.png %changelog +* Mon Nov 2 2009 Liang Suilong 0.5.1-3 +- Tag for Fedora 11 again + * Mon Nov 2 2009 Liang Suilong 0.5.1-2 - Update RPM Spec file From liangsuilong at fedoraproject.org Mon Nov 2 11:50:45 2009 From: liangsuilong at fedoraproject.org (Liang Suilong) Date: Mon, 2 Nov 2009 11:50:45 +0000 (UTC) Subject: rpms/iptux/F-11 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <20091102115045.10A8511C0417@cvs1.fedora.phx.redhat.com> Author: liangsuilong Update of /cvs/pkgs/rpms/iptux/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9689 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/iptux/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 8 Oct 2009 15:28:41 -0000 1.3 +++ .cvsignore 2 Nov 2009 11:50:44 -0000 1.4 @@ -1,2 +1,3 @@ iptux-0.4.5-2.tar.gz iptux-0.5.0.tar.gz +iptux-0.5.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/iptux/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 8 Oct 2009 15:28:41 -0000 1.3 +++ sources 2 Nov 2009 11:50:44 -0000 1.4 @@ -1,2 +1,3 @@ 7804f8a8486e8e9fa23eb661e34b3686 iptux-0.4.5-2.tar.gz d5c9cfa27c1d2e75ca3954028836b4fc iptux-0.5.0.tar.gz +83cd606cc2185d9ae6e6b9abab3af7f0 iptux-0.5.1.tar.gz From nucleo at fedoraproject.org Mon Nov 2 11:53:13 2009 From: nucleo at fedoraproject.org (nucleo) Date: Mon, 2 Nov 2009 11:53:13 +0000 (UTC) Subject: comps comps-f10.xml.in, 1.293, 1.294 comps-f11.xml.in, 1.327, 1.328 comps-f12.xml.in, 1.186, 1.187 comps-f13.xml.in, 1.73, 1.74 Message-ID: <20091102115314.358BD11C00E8@cvs1.fedora.phx.redhat.com> Author: nucleo Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10176 Modified Files: comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in Log Message: Added arora, choqok, mtr-gtk, netactview, rekonq to graphical-internet group in F10-F13 Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.293 retrieving revision 1.294 diff -u -p -r1.293 -r1.294 --- comps-f10.xml.in 2 Nov 2009 11:21:01 -0000 1.293 +++ comps-f10.xml.in 2 Nov 2009 11:53:11 -0000 1.294 @@ -2188,6 +2188,7 @@ transmission amsn apollon + arora azureus balsa bittorrent-gui @@ -2195,6 +2196,7 @@ blogtk bluefish checkgmail + choqok claws-mail contact-lookup-applet deluge @@ -2243,7 +2245,9 @@ midori Miro mitter + mtr-gtk mugshot + netactview nntpgrab-gui nntpgrab-gui-networked nntpgrab-server @@ -2254,6 +2258,7 @@ psi psimedia putty + rekonq seamonkey streamtuner swfdec-mozilla Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.327 retrieving revision 1.328 diff -u -p -r1.327 -r1.328 --- comps-f11.xml.in 2 Nov 2009 11:21:02 -0000 1.327 +++ comps-f11.xml.in 2 Nov 2009 11:53:11 -0000 1.328 @@ -2564,6 +2564,7 @@ transmission amsn apollon + arora azureus balsa bittorrent-gui @@ -2571,6 +2572,7 @@ blogtk bluefish checkgmail + choqok claws-mail contact-lookup-applet deluge @@ -2618,7 +2620,9 @@ midori Miro mitter + mtr-gtk mugshot + netactview nntpgrab-gui ochusha pan @@ -2627,6 +2631,7 @@ psi psimedia putty + rekonq seamonkey streamtuner swfdec-mozilla Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.186 retrieving revision 1.187 diff -u -p -r1.186 -r1.187 --- comps-f12.xml.in 2 Nov 2009 11:21:02 -0000 1.186 +++ comps-f12.xml.in 2 Nov 2009 11:53:12 -0000 1.187 @@ -2756,6 +2756,7 @@ transmission amsn apollon + arora azureus balsa bittorrent-gui @@ -2763,6 +2764,7 @@ blogtk bluefish checkgmail + choqok claws-mail contact-lookup-applet deluge @@ -2810,7 +2812,9 @@ midori Miro mitter + mtr-gtk mugshot + netactview nntpgrab-gui ochusha pan @@ -2820,6 +2824,7 @@ psi psimedia putty + rekonq seamonkey streamtuner swfdec-mozilla Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.73 retrieving revision 1.74 diff -u -p -r1.73 -r1.74 --- comps-f13.xml.in 2 Nov 2009 11:21:02 -0000 1.73 +++ comps-f13.xml.in 2 Nov 2009 11:53:12 -0000 1.74 @@ -2754,6 +2754,7 @@ transmission amsn apollon + arora azureus balsa bittorrent-gui @@ -2761,6 +2762,7 @@ blogtk bluefish checkgmail + choqok claws-mail contact-lookup-applet deluge @@ -2808,7 +2810,9 @@ midori Miro mitter + mtr-gtk mugshot + netactview nntpgrab-gui ochusha pan @@ -2818,6 +2822,7 @@ psi psimedia putty + rekonq seamonkey streamtuner swfdec-mozilla From liangsuilong at fedoraproject.org Mon Nov 2 11:58:36 2009 From: liangsuilong at fedoraproject.org (Liang Suilong) Date: Mon, 2 Nov 2009 11:58:36 +0000 (UTC) Subject: rpms/iptux/F-11 iptux.spec,1.4,1.5 Message-ID: <20091102115836.3E59F11C00E8@cvs1.fedora.phx.redhat.com> Author: liangsuilong Update of /cvs/pkgs/rpms/iptux/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12137 Modified Files: iptux.spec Log Message: Index: iptux.spec =================================================================== RCS file: /cvs/pkgs/rpms/iptux/F-11/iptux.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- iptux.spec 2 Nov 2009 11:43:22 -0000 1.4 +++ iptux.spec 2 Nov 2009 11:58:34 -0000 1.5 @@ -1,6 +1,6 @@ Name: iptux Version: 0.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software for sharing in LAN Group: Applications/Internet License: GPLv2+ @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/48x48/apps/ip-tux.png %changelog +* Mon Nov 2 2009 Liang Suilong 0.5.1-4 +- Tag for Fedora 11 again + * Mon Nov 2 2009 Liang Suilong 0.5.1-3 - Tag for Fedora 11 again From mkasik at fedoraproject.org Mon Nov 2 12:08:23 2009 From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=) Date: Mon, 2 Nov 2009 12:08:23 +0000 (UTC) Subject: rpms/gtk2/F-12 gtk2-remove-connecting-reason.patch, NONE, 1.1 gtk2.spec, 1.429, 1.430 Message-ID: <20091102120823.AC6F111C00E8@cvs1.fedora.phx.redhat.com> Author: mkasik Update of /cvs/pkgs/rpms/gtk2/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15121 Modified Files: gtk2.spec Added Files: gtk2-remove-connecting-reason.patch Log Message: * Mon Nov 2 2009 Marek Kasik - 2.18.3-17 - Remove handling of "connecting-to-device" reason (#529364) gtk2-remove-connecting-reason.patch: gtkprintbackendcups.c | 2 -- 1 file changed, 2 deletions(-) --- NEW FILE gtk2-remove-connecting-reason.patch --- --- gtk+-2.18.3/modules/printbackends/cups/gtkprintbackendcups.c 2009-10-09 07:00:45.000000000 +0200 +++ gtk+-2.18.3/modules/printbackends/cups/gtkprintbackendcups.c 2009-11-02 11:45:39.000000000 +0100 @@ -1628,7 +1628,6 @@ cups_request_printer_list_cb (GtkPrintBa "media-low", "media-empty", "offline", - "connecting-to-device", "other" }; static const char * reasons_descs[] = @@ -1648,7 +1647,6 @@ cups_request_printer_list_cb (GtkPrintBa N_("Printer '%s' is low on paper."), N_("Printer '%s' is out of paper."), N_("Printer '%s' is currently off-line."), - N_("Printer '%s' may not be connected."), N_("There is a problem on printer '%s'.") }; gboolean is_paused = FALSE; Index: gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v retrieving revision 1.429 retrieving revision 1.430 diff -u -p -r1.429 -r1.430 --- gtk2.spec 31 Oct 2009 19:06:13 -0000 1.429 +++ gtk2.spec 2 Nov 2009 12:08:23 -0000 1.430 @@ -17,7 +17,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 16%{?dist} +Release: 17%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2 @@ -46,6 +46,8 @@ Patch8: tooltip-positioning.patch Patch9: iconview-hang.patch # https://bugzilla.gnome.org/show_bug.cgi?id=599446 Patch10: toolbutton-assert.patch +# http://bugzilla.redhat.com/show_bug.cgi?id=529364 +Patch11: gtk2-remove-connecting-reason.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -167,6 +169,7 @@ This package contains developer document %patch8 -p1 -b .tooltip-positioning %patch9 -p1 -b .iconview-hang %patch10 -p1 -b .toolbutton-assert +%patch11 -p1 -b .remove-connecting-reason %build libtoolize --force --copy @@ -403,6 +406,9 @@ fi %changelog +* Mon Nov 2 2009 Marek Kasik - 2.18.3-17 +- Remove handling of "connecting-to-device" reason (#529364) + * Sat Oct 31 2009 Matthias Clasen - 2.18.3-16 - Handle screen changes for tooltips (#531568) From mkasik at fedoraproject.org Mon Nov 2 12:10:00 2009 From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=) Date: Mon, 2 Nov 2009 12:10:00 +0000 (UTC) Subject: rpms/gtk2/F-12 gtk2-preview.patch,NONE,1.1 gtk2.spec,1.430,1.431 Message-ID: <20091102121000.8584A11C00E8@cvs1.fedora.phx.redhat.com> Author: mkasik Update of /cvs/pkgs/rpms/gtk2/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15588 Modified Files: gtk2.spec Added Files: gtk2-preview.patch Log Message: * Mon Nov 2 2009 Marek Kasik - 2.18.3-18 - Show correct print preview (gnome bug #592582) gtk2-preview.patch: gtkprintoperation-unix.c | 26 ++++++- gtkprintoperation.c | 159 +++++++++++++++++++++++++++-------------------- gtkprintsettings.c | 2 3 files changed, 116 insertions(+), 71 deletions(-) --- NEW FILE gtk2-preview.patch --- --- gtk+-2.18.3/gtk/gtkprintoperation.c 2009-10-09 07:00:44.000000000 +0200 +++ gtk+-2.18.3/gtk/gtkprintoperation.c 2009-11-02 12:05:55.000000000 +0100 @@ -78,11 +78,15 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; static int job_nr = 0; +typedef struct _PrintPagesData PrintPagesData; -static void preview_iface_init (GtkPrintOperationPreviewIface *iface); -static GtkPageSetup *create_page_setup (GtkPrintOperation *op); -static void common_render_page (GtkPrintOperation *op, - gint page_nr); +static void preview_iface_init (GtkPrintOperationPreviewIface *iface); +static GtkPageSetup *create_page_setup (GtkPrintOperation *op); +static void common_render_page (GtkPrintOperation *op, + gint page_nr); +static void increment_page_sequence (PrintPagesData *data); +static void prepare_data (PrintPagesData *data); +static void clamp_page_ranges (PrintPagesData *data); G_DEFINE_TYPE_WITH_CODE (GtkPrintOperation, gtk_print_operation, G_TYPE_OBJECT, @@ -260,13 +264,23 @@ preview_start_page (GtkPrintOperation *o GtkPrintContext *print_context, GtkPageSetup *page_setup) { - g_signal_emit_by_name (op, "got-page-size", print_context, page_setup); + if ((op->priv->manual_number_up < 2) || + (op->priv->page_position % op->priv->manual_number_up == 0)) + g_signal_emit_by_name (op, "got-page-size", print_context, page_setup); } static void preview_end_page (GtkPrintOperation *op, GtkPrintContext *print_context) { + cairo_t *cr; + + cr = gtk_print_context_get_cairo_context (print_context); + + if ((op->priv->manual_number_up < 2) || + ((op->priv->page_position + 1) % op->priv->manual_number_up == 0) || + (op->priv->page_position == op->priv->nr_of_pages_to_print - 1)) + cairo_show_page (cr); } static void @@ -411,6 +425,31 @@ gtk_print_operation_get_property (GObjec } } +struct _PrintPagesData +{ + GtkPrintOperation *op; + gint uncollated_copies; + gint collated_copies; + gint uncollated, collated, total; + + gint range, num_ranges; + GtkPageRange *ranges; + GtkPageRange one_range; + + gint page; + gint sheet; + gint first_position, last_position; + gint first_sheet; + gint num_of_sheets; + gint *pages; + + GtkWidget *progress; + + gboolean initialized; + gboolean is_preview; + gboolean done; +}; + typedef struct { GtkPrintOperationPreview *preview; @@ -418,8 +457,8 @@ typedef struct GtkWindow *parent; cairo_surface_t *surface; gchar *filename; - guint page_nr; gboolean wait; + PrintPagesData *pages_data; } PreviewOp; static void @@ -441,6 +480,10 @@ preview_print_idle_done (gpointer data) gtk_print_operation_preview_end_preview (pop->preview); + g_object_unref (pop->pages_data->op); + g_free (pop->pages_data->pages); + g_free (pop->pages_data); + g_object_unref (op); g_free (pop); } @@ -450,9 +493,8 @@ preview_print_idle (gpointer data) { PreviewOp *pop; GtkPrintOperation *op; - gboolean retval = TRUE; - cairo_t *cr; GtkPrintOperationPrivate *priv; + gboolean done = FALSE; pop = (PreviewOp *) data; op = GTK_PRINT_OPERATION (pop->preview); @@ -461,24 +503,23 @@ preview_print_idle (gpointer data) if (priv->page_drawing_state == GTK_PAGE_DRAWING_STATE_READY) { - /* TODO: print out sheets not pages and follow ranges */ - if (pop->page_nr >= op->priv->nr_of_pages) - retval = FALSE; - - if (pop->page_nr > 0) + if (!pop->pages_data->initialized) { - cr = gtk_print_context_get_cairo_context (pop->print_context); - _gtk_print_operation_platform_backend_preview_end_page (op, pop->surface, cr); + pop->pages_data->initialized = TRUE; + prepare_data (pop->pages_data); } - - if (retval) + else { - gtk_print_operation_preview_render_page (pop->preview, pop->page_nr); - pop->page_nr++; + increment_page_sequence (pop->pages_data); + + if (!pop->pages_data->done) + gtk_print_operation_preview_render_page (pop->preview, pop->pages_data->page); + else + done = priv->page_drawing_state == GTK_PAGE_DRAWING_STATE_READY; } } - return retval; + return !done; } static void @@ -502,7 +543,6 @@ preview_ready (GtkPrintOperationPreview GtkPrintContext *context, PreviewOp *pop) { - pop->page_nr = 0; pop->print_context = context; g_object_ref (preview); @@ -529,6 +569,9 @@ gtk_print_operation_preview_handler (Gtk pop->filename = NULL; pop->preview = preview; pop->parent = parent; + pop->pages_data = g_new0 (PrintPagesData, 1); + pop->pages_data->op = g_object_ref (GTK_PRINT_OPERATION (preview)); + pop->pages_data->is_preview = TRUE; page_setup = gtk_print_context_get_page_setup (context); @@ -2026,30 +2069,6 @@ run_pdf (GtkPrintOperation *op, return GTK_PRINT_OPERATION_RESULT_APPLY; } -typedef struct -{ - GtkPrintOperation *op; - gint uncollated_copies; - gint collated_copies; - gint uncollated, collated, total; - - gint range, num_ranges; - GtkPageRange *ranges; - GtkPageRange one_range; - - gint page; - gint sheet; - gint first_position, last_position; - gint first_sheet; - gint num_of_sheets; - gint *pages; - - GtkWidget *progress; - - gboolean initialized; - gboolean is_preview; - gboolean done; -} PrintPagesData; static void clamp_page_ranges (PrintPagesData *data) @@ -2127,7 +2146,8 @@ increment_page_sequence (PrintPagesData inc = 1; /* changing sheet */ - if ((priv->page_position + 1) % priv->manual_number_up == 0 || + if (priv->manual_number_up < 2 || + (priv->page_position + 1) % priv->manual_number_up == 0 || priv->page_position == data->last_position || priv->page_position == priv->nr_of_pages_to_print - 1) { @@ -2579,27 +2599,27 @@ prepare_data (PrintPagesData *data) priv = data->op->priv; + if (priv->manual_collation) + { + data->uncollated_copies = priv->manual_num_copies; + data->collated_copies = 1; + } + else + { + data->uncollated_copies = 1; + data->collated_copies = priv->manual_num_copies; + } + if (!data->initialized) { data->initialized = TRUE; page_setup = create_page_setup (data->op); - _gtk_print_context_set_page_setup (priv->print_context, - page_setup); + _gtk_print_context_set_page_setup (priv->print_context, + page_setup); g_object_unref (page_setup); g_signal_emit (data->op, signals[BEGIN_PRINT], 0, priv->print_context); - if (priv->manual_collation) - { - data->uncollated_copies = priv->manual_num_copies; - data->collated_copies = 1; - } - else - { - data->uncollated_copies = 1; - data->collated_copies = priv->manual_num_copies; - } - return; } @@ -2670,10 +2690,15 @@ prepare_data (PrintPagesData *data) data->collated = 0; data->uncollated = 0; - if (priv->nr_of_pages_to_print % priv->manual_number_up == 0) - data->num_of_sheets = priv->nr_of_pages_to_print / priv->manual_number_up; + if (priv->manual_number_up > 1) + { + if (priv->nr_of_pages_to_print % priv->manual_number_up == 0) + data->num_of_sheets = priv->nr_of_pages_to_print / priv->manual_number_up; + else + data->num_of_sheets = priv->nr_of_pages_to_print / priv->manual_number_up + 1; + } else - data->num_of_sheets = priv->nr_of_pages_to_print / priv->manual_number_up + 1; + data->num_of_sheets = priv->nr_of_pages_to_print; if (priv->manual_reverse) { @@ -2906,12 +2931,12 @@ print_pages (GtkPrintOperation *op &priv->num_page_ranges); priv->manual_num_copies = 1; priv->manual_collation = FALSE; - priv->manual_reverse = FALSE; - priv->manual_page_set = GTK_PAGE_SET_ALL; - priv->manual_scale = 1.0; + priv->manual_reverse = gtk_print_settings_get_reverse (priv->print_settings); + priv->manual_page_set = gtk_print_settings_get_page_set (priv->print_settings); + priv->manual_scale = gtk_print_settings_get_scale (priv->print_settings) / 100.0; priv->manual_orientation = TRUE; - priv->manual_number_up = 1; - priv->manual_number_up_layout = GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM; + priv->manual_number_up = gtk_print_settings_get_number_up (priv->print_settings); + priv->manual_number_up_layout = gtk_print_settings_get_number_up_layout (priv->print_settings); } priv->print_pages_idle_id = gdk_threads_add_idle_full (G_PRIORITY_DEFAULT_IDLE + 10, --- gtk+-2.18.3/gtk/gtkprintoperation-unix.c 2009-10-09 07:00:44.000000000 +0200 +++ gtk+-2.18.3/gtk/gtkprintoperation-unix.c 2009-11-02 12:05:52.000000000 +0100 @@ -207,7 +207,7 @@ _gtk_print_operation_platform_backend_la gchar *cmd; gchar *preview_cmd; GtkSettings *settings; - GtkPrintSettings *print_settings; + GtkPrintSettings *print_settings = NULL; GtkPageSetup *page_setup; GKeyFile *key_file = NULL; gchar *data = NULL; @@ -235,8 +235,28 @@ _gtk_print_operation_platform_backend_la key_file = g_key_file_new (); - print_settings = gtk_print_operation_get_print_settings (op); - gtk_print_settings_to_key_file (print_settings, key_file, NULL); + print_settings = gtk_print_settings_copy (gtk_print_operation_get_print_settings (op)); + + if (print_settings != NULL) + { + gtk_print_settings_set_reverse (print_settings, FALSE); + gtk_print_settings_set_page_set (print_settings, GTK_PAGE_SET_ALL); + gtk_print_settings_set_scale (print_settings, 1.0); + gtk_print_settings_set_number_up (print_settings, 1); + gtk_print_settings_set_number_up_layout (print_settings, GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM); + + /* These removals are neccessary because cups-* settings have higher priority + * than normal settings. + */ + gtk_print_settings_unset (print_settings, "cups-reverse"); + gtk_print_settings_unset (print_settings, "cups-page-set"); + gtk_print_settings_unset (print_settings, "cups-scale"); + gtk_print_settings_unset (print_settings, "cups-number-up"); + gtk_print_settings_unset (print_settings, "cups-number-up-layout"); + + gtk_print_settings_to_key_file (print_settings, key_file, NULL); + g_object_unref (print_settings); + } page_setup = gtk_print_context_get_page_setup (op->priv->print_context); gtk_page_setup_to_key_file (page_setup, key_file, NULL); --- gtk+-2.18.3/gtk/gtkprintsettings.c 2009-10-09 07:00:44.000000000 +0200 +++ gtk+-2.18.3/gtk/gtkprintsettings.c 2009-11-02 12:05:52.000000000 +0100 @@ -1152,7 +1152,7 @@ gtk_print_settings_set_n_copies (GtkPrin gint gtk_print_settings_get_number_up (GtkPrintSettings *settings) { - return gtk_print_settings_get_int (settings, GTK_PRINT_SETTINGS_NUMBER_UP); + return gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_NUMBER_UP, 1); } /** Index: gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v retrieving revision 1.430 retrieving revision 1.431 diff -u -p -r1.430 -r1.431 --- gtk2.spec 2 Nov 2009 12:08:23 -0000 1.430 +++ gtk2.spec 2 Nov 2009 12:10:00 -0000 1.431 @@ -17,7 +17,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 17%{?dist} +Release: 18%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2 @@ -48,6 +48,8 @@ Patch9: iconview-hang.patch Patch10: toolbutton-assert.patch # http://bugzilla.redhat.com/show_bug.cgi?id=529364 Patch11: gtk2-remove-connecting-reason.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=592582 +Patch12: gtk2-preview.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -170,6 +172,7 @@ This package contains developer document %patch9 -p1 -b .iconview-hang %patch10 -p1 -b .toolbutton-assert %patch11 -p1 -b .remove-connecting-reason +%patch12 -p1 -b .preview %build libtoolize --force --copy @@ -406,6 +409,9 @@ fi %changelog +* Mon Nov 2 2009 Marek Kasik - 2.18.3-18 +- Show correct print preview (gnome bug #592582) + * Mon Nov 2 2009 Marek Kasik - 2.18.3-17 - Remove handling of "connecting-to-device" reason (#529364) From pkgdb at fedoraproject.org Mon Nov 2 12:10:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:10:10 +0000 Subject: [pkgdb] perl-XML-Parser-Lite-Tree had acl change status Message-ID: <20091102121010.63A4D10F86F@bastion2.fedora.phx.redhat.com> ksyz has set the watchcommits acl on perl-XML-Parser-Lite-Tree (Fedora devel) to Approved for hpejakle To make changes to this package see: /pkgdb/packages/name/perl-XML-Parser-Lite-Tree From pkgdb at fedoraproject.org Mon Nov 2 12:10:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:10:10 +0000 Subject: [pkgdb] perl-XML-Parser-Lite-Tree had acl change status Message-ID: <20091102121010.AED9C10F87E@bastion2.fedora.phx.redhat.com> ksyz has set the watchbugzilla acl on perl-XML-Parser-Lite-Tree (Fedora devel) to Approved for hpejakle To make changes to this package see: /pkgdb/packages/name/perl-XML-Parser-Lite-Tree From pkgdb at fedoraproject.org Mon Nov 2 12:10:14 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:10:14 +0000 Subject: [pkgdb] perl-XML-Parser-Lite-Tree had acl change status Message-ID: <20091102121014.25C2010F888@bastion2.fedora.phx.redhat.com> ksyz has set the commit acl on perl-XML-Parser-Lite-Tree (Fedora devel) to Approved for hpejakle To make changes to this package see: /pkgdb/packages/name/perl-XML-Parser-Lite-Tree From pkgdb at fedoraproject.org Mon Nov 2 12:10:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:10:24 +0000 Subject: [pkgdb] perl-XML-Parser-Lite-Tree had acl change status Message-ID: <20091102121024.BCDA110F87B@bastion2.fedora.phx.redhat.com> ksyz has set the watchbugzilla acl on perl-XML-Parser-Lite-Tree (Fedora 11) to Approved for hpejakle To make changes to this package see: /pkgdb/packages/name/perl-XML-Parser-Lite-Tree From pkgdb at fedoraproject.org Mon Nov 2 12:10:25 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:10:25 +0000 Subject: [pkgdb] perl-XML-Parser-Lite-Tree had acl change status Message-ID: <20091102121025.C494310F87F@bastion2.fedora.phx.redhat.com> ksyz has set the watchcommits acl on perl-XML-Parser-Lite-Tree (Fedora 11) to Approved for hpejakle To make changes to this package see: /pkgdb/packages/name/perl-XML-Parser-Lite-Tree From pkgdb at fedoraproject.org Mon Nov 2 12:10:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:10:26 +0000 Subject: [pkgdb] perl-XML-Parser-Lite-Tree had acl change status Message-ID: <20091102121026.3DFEE10F88F@bastion2.fedora.phx.redhat.com> ksyz has set the commit acl on perl-XML-Parser-Lite-Tree (Fedora 11) to Approved for hpejakle To make changes to this package see: /pkgdb/packages/name/perl-XML-Parser-Lite-Tree From pkgdb at fedoraproject.org Mon Nov 2 12:10:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:10:31 +0000 Subject: [pkgdb] perl-XML-Parser-Lite-Tree had acl change status Message-ID: <20091102121031.9763610F802@bastion2.fedora.phx.redhat.com> ksyz has set the watchbugzilla acl on perl-XML-Parser-Lite-Tree (Fedora 12) to Approved for hpejakle To make changes to this package see: /pkgdb/packages/name/perl-XML-Parser-Lite-Tree From pkgdb at fedoraproject.org Mon Nov 2 12:10:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:10:31 +0000 Subject: [pkgdb] perl-XML-Parser-Lite-Tree had acl change status Message-ID: <20091102121031.F06D310F883@bastion2.fedora.phx.redhat.com> ksyz has set the watchcommits acl on perl-XML-Parser-Lite-Tree (Fedora 12) to Approved for hpejakle To make changes to this package see: /pkgdb/packages/name/perl-XML-Parser-Lite-Tree From pkgdb at fedoraproject.org Mon Nov 2 12:10:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:10:33 +0000 Subject: [pkgdb] perl-XML-Parser-Lite-Tree had acl change status Message-ID: <20091102121033.BE46610F88B@bastion2.fedora.phx.redhat.com> ksyz has set the commit acl on perl-XML-Parser-Lite-Tree (Fedora 12) to Approved for hpejakle To make changes to this package see: /pkgdb/packages/name/perl-XML-Parser-Lite-Tree From pkgdb at fedoraproject.org Mon Nov 2 12:11:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:11:28 +0000 Subject: [pkgdb] bitbake: ksyz has requested watchbugzilla Message-ID: <20091102121128.EC6B410F88F@bastion2.fedora.phx.redhat.com> ksyz has requested the watchbugzilla acl on bitbake (Fedora devel) To make changes to this package see: /pkgdb/packages/name/bitbake From pkgdb at fedoraproject.org Mon Nov 2 12:11:29 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:11:29 +0000 Subject: [pkgdb] bitbake: ksyz has requested watchcommits Message-ID: <20091102121130.0512D10F895@bastion2.fedora.phx.redhat.com> ksyz has requested the watchcommits acl on bitbake (Fedora devel) To make changes to this package see: /pkgdb/packages/name/bitbake From pkgdb at fedoraproject.org Mon Nov 2 12:11:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:11:30 +0000 Subject: [pkgdb] bitbake: ksyz has requested commit Message-ID: <20091102121130.B054610F89C@bastion2.fedora.phx.redhat.com> ksyz has requested the commit acl on bitbake (Fedora devel) To make changes to this package see: /pkgdb/packages/name/bitbake From pkgdb at fedoraproject.org Mon Nov 2 12:11:45 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:11:45 +0000 Subject: [pkgdb] bitbake: ksyz has requested watchbugzilla Message-ID: <20091102121145.CA96710F880@bastion2.fedora.phx.redhat.com> ksyz has requested the watchbugzilla acl on bitbake (Fedora 12) To make changes to this package see: /pkgdb/packages/name/bitbake From pkgdb at fedoraproject.org Mon Nov 2 12:11:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:11:46 +0000 Subject: [pkgdb] bitbake: ksyz has requested watchcommits Message-ID: <20091102121146.8A42E10F89D@bastion2.fedora.phx.redhat.com> ksyz has requested the watchcommits acl on bitbake (Fedora 12) To make changes to this package see: /pkgdb/packages/name/bitbake From pkgdb at fedoraproject.org Mon Nov 2 12:11:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 12:11:49 +0000 Subject: [pkgdb] bitbake: ksyz has requested commit Message-ID: <20091102121149.EE86D10F89F@bastion2.fedora.phx.redhat.com> ksyz has requested the commit acl on bitbake (Fedora 12) To make changes to this package see: /pkgdb/packages/name/bitbake From mkasik at fedoraproject.org Mon Nov 2 12:12:11 2009 From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=) Date: Mon, 2 Nov 2009 12:12:11 +0000 (UTC) Subject: rpms/gtk2/F-12 gtk2-rotate-layout.patch, NONE, 1.1 gtk2.spec, 1.431, 1.432 Message-ID: <20091102121211.CA82711C0419@cvs1.fedora.phx.redhat.com> Author: mkasik Update of /cvs/pkgs/rpms/gtk2/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16250 Modified Files: gtk2.spec Added Files: gtk2-rotate-layout.patch Log Message: * Mon Nov 2 2009 Marek Kasik - 2.18.3-19 - Correct rotation of number-up layout when printing landscape gtk2-rotate-layout.patch: gtkprintbackendcups.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- NEW FILE gtk2-rotate-layout.patch --- --- gtk+-2.18.3/modules/printbackends/cups/gtkprintbackendcups.c 2009-11-02 12:10:58.000000000 +0100 +++ gtk+-2.18.3/modules/printbackends/cups/gtkprintbackendcups.c 2009-11-02 12:11:18.000000000 +0100 @@ -4317,18 +4317,18 @@ cups_printer_prepare_for_print (GtkPrint break; case GTK_PAGE_ORIENTATION_LANDSCAPE: if (layout < 4) - layout = layout + 5 - 2 * (layout % 2); + layout = layout + 2 + 4 * (1 - layout / 2); else - layout = layout - 6 + 4 * (1 - (layout - 4) / 2); + layout = layout - 3 - 2 * (layout % 2); break; case GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT: layout = (layout + 3 - 2 * (layout % 2)) % 4 + 4 * (layout / 4); break; case GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE: if (layout < 4) - layout = layout + 2 + 4 * (1 - layout / 2); + layout = layout + 5 - 2 * (layout % 2); else - layout = layout - 3 - 2 * (layout % 2); + layout = layout - 6 + 4 * (1 - (layout - 4) / 2); break; } Index: gtk2.spec =================================================================== RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v retrieving revision 1.431 retrieving revision 1.432 diff -u -p -r1.431 -r1.432 --- gtk2.spec 2 Nov 2009 12:10:00 -0000 1.431 +++ gtk2.spec 2 Nov 2009 12:12:10 -0000 1.432 @@ -17,7 +17,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 18%{?dist} +Release: 19%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2 @@ -50,6 +50,7 @@ Patch10: toolbutton-assert.patch Patch11: gtk2-remove-connecting-reason.patch # https://bugzilla.gnome.org/show_bug.cgi?id=592582 Patch12: gtk2-preview.patch +Patch13: gtk2-rotate-layout.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -173,6 +174,7 @@ This package contains developer document %patch10 -p1 -b .toolbutton-assert %patch11 -p1 -b .remove-connecting-reason %patch12 -p1 -b .preview +%patch13 -p1 -b .rotate-layout %build libtoolize --force --copy @@ -409,6 +411,9 @@ fi %changelog +* Mon Nov 2 2009 Marek Kasik - 2.18.3-19 +- Correct rotation of number-up layout when printing landscape + * Mon Nov 2 2009 Marek Kasik - 2.18.3-18 - Show correct print preview (gnome bug #592582) From tmraz at fedoraproject.org Mon Nov 2 12:17:29 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 2 Nov 2009 12:17:29 +0000 (UTC) Subject: rpms/pam/F-11 pam-1.0.91-mkhomedir-umask.patch, NONE, 1.1 pam.spec, 1.197, 1.198 Message-ID: <20091102121730.14C4F11C00E8@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/pam/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17761 Modified Files: pam.spec Added Files: pam-1.0.91-mkhomedir-umask.patch Log Message: * Mon Nov 2 2009 Tomas Mraz 1.0.91-8 - pam_mkhomedir: fix umask parameter of the module (#499816) pam-1.0.91-mkhomedir-umask.patch: pam_mkhomedir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE pam-1.0.91-mkhomedir-umask.patch --- diff -up Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c.umask Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c --- Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c.umask 2009-11-02 13:14:54.000000000 +0100 +++ Linux-PAM-1.0.91/modules/pam_mkhomedir/pam_mkhomedir.c 2009-11-02 13:14:35.000000000 +0100 @@ -84,7 +84,7 @@ _pam_parse (const pam_handle_t *pamh, in } else if (!strcmp(*argv, "debug")) { ctrl |= MKHOMEDIR_DEBUG; } else if (!strncmp(*argv,"umask=",6)) { - strncpy(SkelDir,*argv+6,sizeof(UMask)); + strncpy(UMask,*argv+6,sizeof(UMask)); UMask[sizeof(UMask)-1] = '\0'; } else if (!strncmp(*argv,"skel=",5)) { strncpy(SkelDir,*argv+5,sizeof(SkelDir)); Index: pam.spec =================================================================== RCS file: /cvs/pkgs/rpms/pam/F-11/pam.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -p -r1.197 -r1.198 --- pam.spec 2 Nov 2009 10:48:52 -0000 1.197 +++ pam.spec 2 Nov 2009 12:17:27 -0000 1.198 @@ -3,7 +3,7 @@ Summary: An extensible library which provides authentication for applications Name: pam Version: 1.0.91 -Release: 7%{?dist} +Release: 8%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+, License: BSD and GPLv2+ @@ -25,6 +25,7 @@ Patch1: pam-1.0.90-redhat-modules.patch Patch2: pam-1.0.91-std-noclose.patch Patch6: pam-1.1.0-xauth-context.patch Patch7: pam-1.1.0-console-fixes.patch +Patch8: pam-1.0.91-mkhomedir-umask.patch %define _sbindir /sbin %define _moduledir /%{_lib}/security @@ -328,6 +329,9 @@ fi %doc doc/adg/*.txt doc/adg/html %changelog +* Mon Nov 2 2009 Tomas Mraz 1.0.91-8 +- pam_mkhomedir: fix umask parameter of the module (#499816) + * Mon Nov 2 2009 Tomas Mraz 1.0.91-7 - pam_console: fix memory corruption when executing handlers (patch by Stas Sergeev) and a few more fixes in the handler execution code (#532302) From nucleo at fedoraproject.org Mon Nov 2 12:39:58 2009 From: nucleo at fedoraproject.org (nucleo) Date: Mon, 2 Nov 2009 12:39:58 +0000 (UTC) Subject: comps comps-f10.xml.in, 1.294, 1.295 comps-f11.xml.in, 1.328, 1.329 comps-f12.xml.in, 1.187, 1.188 comps-f13.xml.in, 1.74, 1.75 Message-ID: <20091102123958.75BD711C00E8@cvs1.fedora.phx.redhat.com> Author: nucleo Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23919 Modified Files: comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in Log Message: Added aria2, netstiff, trickle, youtube-dl, whatmask to text-internet group in F10-F13 Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.294 retrieving revision 1.295 diff -u -p -r1.294 -r1.295 --- comps-f10.xml.in 2 Nov 2009 11:53:11 -0000 1.294 +++ comps-f10.xml.in 2 Nov 2009 12:39:55 -0000 1.295 @@ -4707,6 +4707,7 @@ alpine archivemail argus + aria2 axel centerim cone @@ -4723,6 +4724,7 @@ nail naim ncftp + netstiff ninja nmh offlineimap @@ -4733,10 +4735,13 @@ snownews tftp tin + trickle w3m websec xprobe2 yafc + youtube-dl + whatmask Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.328 retrieving revision 1.329 diff -u -p -r1.328 -r1.329 --- comps-f11.xml.in 2 Nov 2009 11:53:11 -0000 1.328 +++ comps-f11.xml.in 2 Nov 2009 12:39:55 -0000 1.329 @@ -5445,6 +5445,7 @@ alpine archivemail argus + aria2 axel centerim cone @@ -5463,6 +5464,7 @@ lynx naim ncftp + netstiff ninja nmh offlineimap @@ -5473,10 +5475,13 @@ snownews tftp tin + trickle w3m websec xprobe2 yafc + youtube-dl + whatmask Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.187 retrieving revision 1.188 diff -u -p -r1.187 -r1.188 --- comps-f12.xml.in 2 Nov 2009 11:53:12 -0000 1.187 +++ comps-f12.xml.in 2 Nov 2009 12:39:55 -0000 1.188 @@ -5727,6 +5727,7 @@ alpine archivemail argus + aria2 axel centerim cone @@ -5744,6 +5745,7 @@ lynx naim ncftp + netstiff ninja nmh offlineimap @@ -5754,10 +5756,13 @@ snownews tftp tin + trickle w3m websec xprobe2 yafc + youtube-dl + whatmask Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- comps-f13.xml.in 2 Nov 2009 11:53:12 -0000 1.74 +++ comps-f13.xml.in 2 Nov 2009 12:39:56 -0000 1.75 @@ -5682,6 +5682,7 @@ alpine archivemail argus + aria2 axel centerim cone @@ -5699,6 +5700,7 @@ lynx naim ncftp + netstiff ninja nmh offlineimap @@ -5709,10 +5711,13 @@ snownews tftp tin + trickle w3m websec xprobe2 yafc + youtube-dl + whatmask From pfrields at fedoraproject.org Mon Nov 2 12:41:03 2009 From: pfrields at fedoraproject.org (Paul W. Frields) Date: Mon, 2 Nov 2009 12:41:03 +0000 (UTC) Subject: rpms/nautilus-search-tool/F-12 nautilus-search-tool-0.3.0-gstversion.patch, NONE, 1.1 nautilus-search-tool.spec, 1.17, 1.18 Message-ID: <20091102124103.F069D11C0417@cvs1.fedora.phx.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/nautilus-search-tool/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24432/F-12 Modified Files: nautilus-search-tool.spec Added Files: nautilus-search-tool-0.3.0-gstversion.patch Log Message: Cope with missing --version on gnome-search-tool (#516491) nautilus-search-tool-0.3.0-gstversion.patch: configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- NEW FILE nautilus-search-tool-0.3.0-gstversion.patch --- diff -uNr nautilus-search-tool-0.3.0-orig/configure.ac nautilus-search-tool-0.3.0/configure.ac --- nautilus-search-tool-0.3.0-orig/configure.ac 2009-10-25 17:30:07.000000000 -0400 +++ nautilus-search-tool-0.3.0/configure.ac 2009-10-25 17:31:07.000000000 -0400 @@ -57,7 +57,8 @@ AC_SUBST(NAUTILUS_EXTENSION_DIR) # Get gnome-search-tool version -GNOME_SEARCH_TOOL_VERSION=`$GNOME_SEARCH_TOOL --version` +#GNOME_SEARCH_TOOL_VERSION=`$GNOME_SEARCH_TOOL --version` +GNOME_SEARCH_TOOL_VERSION="gnome-search-tool `rpm -qf --qf '%{VERSION}' /usr/bin/gnome-search-tool`" AC_SUBST(GNOME_SEARCH_TOOL_VERSION) AC_DEFINE_UNQUOTED(GNOME_SEARCH_TOOL_VERSION, "$GNOME_SEARCH_TOOL_VERSION", [gnome-search-tool version]) Index: nautilus-search-tool.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-search-tool/F-12/nautilus-search-tool.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- nautilus-search-tool.spec 25 Jul 2009 15:47:59 -0000 1.17 +++ nautilus-search-tool.spec 2 Nov 2009 12:41:00 -0000 1.18 @@ -1,6 +1,6 @@ Name: nautilus-search-tool Version: 0.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Nautilus extension that makes searching for files easier Group: System Environment/Shells @@ -10,9 +10,10 @@ Source0: http://dl.sourceforge.ne Patch0: nautilus-search-tool-0.3.0-headers-typos.patch Patch1: nautilus-search-tool-no-eels.patch Patch2: nautilus-search-tool-0.3.0-noninit.patch +Patch3: nautilus-search-tool-0.3.0-gstversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gnome-desktop-devel >= 2.10.0 eel2-devel >= 2.10.0 +BuildRequires: gnome-desktop-devel >= 2.10.0 BuildRequires: libtool gettext intltool BuildRequires: nautilus-devel BuildRequires: /usr/bin/gnome-search-tool @@ -27,6 +28,7 @@ search for files. %patch0 -p1 -b .headers-typos %patch1 -p1 -b .no-eels %patch2 -p1 -b .noninit +%patch3 -p1 -b .gstversion autoconf %build @@ -48,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/nautilus/extensions-2.0/*.so %changelog +* Mon Nov 02 2009 Paul W. Frields - 0.3.0-4 +- Cope with missing --version in gnome-search-tool (#516491) + * Sat Jul 25 2009 Fedora Release Engineering - 0.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From pfrields at fedoraproject.org Mon Nov 2 12:41:09 2009 From: pfrields at fedoraproject.org (Paul W. Frields) Date: Mon, 2 Nov 2009 12:41:09 +0000 (UTC) Subject: rpms/nautilus-search-tool/devel nautilus-search-tool-0.3.0-gstversion.patch, NONE, 1.1 nautilus-search-tool.spec, 1.17, 1.18 Message-ID: <20091102124109.7128D11C0417@cvs1.fedora.phx.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/nautilus-search-tool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24432/devel Modified Files: nautilus-search-tool.spec Added Files: nautilus-search-tool-0.3.0-gstversion.patch Log Message: Cope with missing --version on gnome-search-tool (#516491) nautilus-search-tool-0.3.0-gstversion.patch: configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- NEW FILE nautilus-search-tool-0.3.0-gstversion.patch --- diff -uNr nautilus-search-tool-0.3.0-orig/configure.ac nautilus-search-tool-0.3.0/configure.ac --- nautilus-search-tool-0.3.0-orig/configure.ac 2009-10-25 17:30:07.000000000 -0400 +++ nautilus-search-tool-0.3.0/configure.ac 2009-10-25 17:31:07.000000000 -0400 @@ -57,7 +57,8 @@ AC_SUBST(NAUTILUS_EXTENSION_DIR) # Get gnome-search-tool version -GNOME_SEARCH_TOOL_VERSION=`$GNOME_SEARCH_TOOL --version` +#GNOME_SEARCH_TOOL_VERSION=`$GNOME_SEARCH_TOOL --version` +GNOME_SEARCH_TOOL_VERSION="gnome-search-tool `rpm -qf --qf '%{VERSION}' /usr/bin/gnome-search-tool`" AC_SUBST(GNOME_SEARCH_TOOL_VERSION) AC_DEFINE_UNQUOTED(GNOME_SEARCH_TOOL_VERSION, "$GNOME_SEARCH_TOOL_VERSION", [gnome-search-tool version]) Index: nautilus-search-tool.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-search-tool/devel/nautilus-search-tool.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- nautilus-search-tool.spec 25 Jul 2009 15:47:59 -0000 1.17 +++ nautilus-search-tool.spec 2 Nov 2009 12:41:05 -0000 1.18 @@ -1,6 +1,6 @@ Name: nautilus-search-tool Version: 0.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Nautilus extension that makes searching for files easier Group: System Environment/Shells @@ -10,9 +10,10 @@ Source0: http://dl.sourceforge.ne Patch0: nautilus-search-tool-0.3.0-headers-typos.patch Patch1: nautilus-search-tool-no-eels.patch Patch2: nautilus-search-tool-0.3.0-noninit.patch +Patch3: nautilus-search-tool-0.3.0-gstversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gnome-desktop-devel >= 2.10.0 eel2-devel >= 2.10.0 +BuildRequires: gnome-desktop-devel >= 2.10.0 BuildRequires: libtool gettext intltool BuildRequires: nautilus-devel BuildRequires: /usr/bin/gnome-search-tool @@ -27,6 +28,7 @@ search for files. %patch0 -p1 -b .headers-typos %patch1 -p1 -b .no-eels %patch2 -p1 -b .noninit +%patch3 -p1 -b .gstversion autoconf %build @@ -48,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/nautilus/extensions-2.0/*.so %changelog +* Mon Nov 02 2009 Paul W. Frields - 0.3.0-4 +- Cope with missing --version in gnome-search-tool (#516491) + * Sat Jul 25 2009 Fedora Release Engineering - 0.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From jsafrane at fedoraproject.org Mon Nov 2 12:51:40 2009 From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=) Date: Mon, 2 Nov 2009 12:51:40 +0000 (UTC) Subject: rpms/ipmitool/F-12 ipmitool-1.8.10-ipmievd-condrestart.patch, NONE, 1.1 ipmitool.spec, 1.6, 1.7 Message-ID: <20091102125140.E3E4011C02BC@cvs1.fedora.phx.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/ipmitool/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27559 Modified Files: ipmitool.spec Added Files: ipmitool-1.8.10-ipmievd-condrestart.patch Log Message: fix ipmievd initscript 'condrestart' action Resolves: #532188 ipmitool-1.8.10-ipmievd-condrestart.patch: ipmievd.init.redhat | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- NEW FILE ipmitool-1.8.10-ipmievd-condrestart.patch --- 532188 - ipmievd init script's condrestart doesn't work Author: Ville Skytt? (ville.skytta at iki.fi) Sent upstream as https://sourceforge.net/tracker/?func=detail&aid=2889888&group_id=95200&atid=610552 Index: contrib/ipmievd.init.redhat =================================================================== RCS file: /cvsroot/ipmitool/ipmitool/contrib/ipmievd.init.redhat,v retrieving revision 1.1 diff -u -r1.1 ipmievd.init.redhat --- contrib/ipmievd.init.redhat 19 Mar 2006 23:05:48 -0000 1.1 +++ contrib/ipmievd.init.redhat 31 Oct 2009 08:50:07 -0000 @@ -62,6 +62,11 @@ return $ret } +restart() { + stop + start +} + case "$1" in start) start @@ -72,11 +77,10 @@ status) status $IPMIEVD_BIN ;; - restart|reload) - stop - start + restart|reload|force-reload) + restart ;; - condrestart) + try-restart|condrestart) [ -f /var/lock/subsys/ipmievd ] && restart || : ;; *) Index: ipmitool.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipmitool/F-12/ipmitool.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- ipmitool.spec 21 Aug 2009 13:58:22 -0000 1.6 +++ ipmitool.spec 2 Nov 2009 12:51:40 -0000 1.7 @@ -1,7 +1,7 @@ Name: ipmitool Summary: Utility for IPMI control Version: 1.8.11 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Base URL: http://ipmitool.sourceforge.net/ @@ -15,6 +15,7 @@ Obsoletes: OpenIPMI-tools < 2.0.14-3 Provides: OpenIPMI-tools = 2.0.14-3 Patch1: ipmitool-1.8.10-ipmievd-init.patch +Patch2: ipmitool-1.8.10-ipmievd-condrestart.patch %description This package contains a utility for interfacing with devices that support @@ -35,6 +36,7 @@ setting LAN configuration, and chassis p %setup -q %patch1 -p1 -b .ipmievd-init +%patch2 -p0 -b .condrestart for f in AUTHORS ChangeLog; do iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8 @@ -85,6 +87,9 @@ fi %changelog +* Mon Nov 2 2009 Jan Safranek 1.8.11-4 +- fix ipmievd initscript 'condrestart' action (#532188) + * Fri Aug 21 2009 Tomas Mraz - 1.8.11-3 - rebuilt with new openssl From jsafrane at fedoraproject.org Mon Nov 2 12:53:16 2009 From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=) Date: Mon, 2 Nov 2009 12:53:16 +0000 (UTC) Subject: rpms/ipmitool/devel ipmitool-1.8.10-ipmievd-condrestart.patch, NONE, 1.1 ipmitool.spec, 1.6, 1.7 Message-ID: <20091102125316.DCA7911C02BC@cvs1.fedora.phx.redhat.com> Author: jsafrane Update of /cvs/pkgs/rpms/ipmitool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28057 Modified Files: ipmitool.spec Added Files: ipmitool-1.8.10-ipmievd-condrestart.patch Log Message: fix ipmievd initscript 'condrestart' action Resolves: #532188 ipmitool-1.8.10-ipmievd-condrestart.patch: ipmievd.init.redhat | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- NEW FILE ipmitool-1.8.10-ipmievd-condrestart.patch --- 532188 - ipmievd init script's condrestart doesn't work Author: Ville Skytt? (ville.skytta at iki.fi) Sent upstream as https://sourceforge.net/tracker/?func=detail&aid=2889888&group_id=95200&atid=610552 Index: contrib/ipmievd.init.redhat =================================================================== RCS file: /cvsroot/ipmitool/ipmitool/contrib/ipmievd.init.redhat,v retrieving revision 1.1 diff -u -r1.1 ipmievd.init.redhat --- contrib/ipmievd.init.redhat 19 Mar 2006 23:05:48 -0000 1.1 +++ contrib/ipmievd.init.redhat 31 Oct 2009 08:50:07 -0000 @@ -62,6 +62,11 @@ return $ret } +restart() { + stop + start +} + case "$1" in start) start @@ -72,11 +77,10 @@ status) status $IPMIEVD_BIN ;; - restart|reload) - stop - start + restart|reload|force-reload) + restart ;; - condrestart) + try-restart|condrestart) [ -f /var/lock/subsys/ipmievd ] && restart || : ;; *) Index: ipmitool.spec =================================================================== RCS file: /cvs/pkgs/rpms/ipmitool/devel/ipmitool.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- ipmitool.spec 21 Aug 2009 13:58:22 -0000 1.6 +++ ipmitool.spec 2 Nov 2009 12:53:16 -0000 1.7 @@ -1,7 +1,7 @@ Name: ipmitool Summary: Utility for IPMI control Version: 1.8.11 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Base URL: http://ipmitool.sourceforge.net/ @@ -15,6 +15,7 @@ Obsoletes: OpenIPMI-tools < 2.0.14-3 Provides: OpenIPMI-tools = 2.0.14-3 Patch1: ipmitool-1.8.10-ipmievd-init.patch +Patch2: ipmitool-1.8.10-ipmievd-condrestart.patch %description This package contains a utility for interfacing with devices that support @@ -35,6 +36,7 @@ setting LAN configuration, and chassis p %setup -q %patch1 -p1 -b .ipmievd-init +%patch2 -p0 -b .condrestart for f in AUTHORS ChangeLog; do iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8 @@ -85,6 +87,9 @@ fi %changelog +* Mon Nov 2 2009 Jan Safranek 1.8.11-4 +- fix ipmievd initscript 'condrestart' action (#532188) + * Fri Aug 21 2009 Tomas Mraz - 1.8.11-3 - rebuilt with new openssl From jfch2222 at fedoraproject.org Mon Nov 2 12:56:26 2009 From: jfch2222 at fedoraproject.org (Jan F. Chadima) Date: Mon, 2 Nov 2009 12:56:26 +0000 (UTC) Subject: rpms/openssh/F-12 openssh-4.3p2-gssapi-canohost.patch, 1.1, 1.2 openssh.spec, 1.171, 1.172 Message-ID: <20091102125626.D815011C00E8@cvs1.fedora.phx.redhat.com> Author: jfch2222 Update of /cvs/pkgs/rpms/openssh/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29262 Modified Files: openssh-4.3p2-gssapi-canohost.patch openssh.spec Log Message: Repair canohost patch to allow gssapi to work when host is acessed via pipe proxy openssh-4.3p2-gssapi-canohost.patch: sshconnect2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) Index: openssh-4.3p2-gssapi-canohost.patch =================================================================== RCS file: /cvs/pkgs/rpms/openssh/F-12/openssh-4.3p2-gssapi-canohost.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- openssh-4.3p2-gssapi-canohost.patch 30 Nov 2006 10:50:12 -0000 1.1 +++ openssh-4.3p2-gssapi-canohost.patch 2 Nov 2009 12:56:25 -0000 1.2 @@ -1,22 +1,20 @@ -Symptom: intermittent errors on GSSAPI authentication vs -machines on DNS loadbalancer, stupid client message "Generic Error", -server-side debug complains about unknown principal. - -Comes from the fact that we resolve the generic DNS name once for -the connection, then again for getting the GSSAPI/Kerberos service -ticket. So the service ticket may be for a different host, if -the DNS alias switches in between the two resolves. ---- openssh-4.3p2/sshconnect2.c.gss-canohost 2006-11-28 21:58:03.000000000 +0100 -+++ openssh-4.3p2/sshconnect2.c 2006-11-30 11:33:14.000000000 +0100 -@@ -485,6 +485,7 @@ +diff -up openssh-5.3p1/sshconnect2.c.canohost openssh-5.3p1/sshconnect2.c +--- openssh-5.3p1/sshconnect2.c.canohost 2009-03-05 14:58:22.000000000 +0100 ++++ openssh-5.3p1/sshconnect2.c 2009-11-02 11:55:00.000000000 +0100 +@@ -542,6 +542,12 @@ userauth_gssapi(Authctxt *authctxt) static u_int mech = 0; OM_uint32 min; int ok = 0; -+ const char* remotehost = get_canonical_hostname(1); ++ char* remotehost = NULL; ++ const char* canonicalhost = get_canonical_hostname(1); ++ if ( strcmp( canonicalhost, "UNKNOWN" ) == 0 ) ++ remotehost = authctxt->host; ++ else ++ remotehost = canonicalhost; /* Try one GSSAPI method at a time, rather than sending them all at * once. */ -@@ -497,7 +498,7 @@ +@@ -554,7 +560,7 @@ userauth_gssapi(Authctxt *authctxt) /* My DER encoding requires length<128 */ if (gss_supported->elements[mech].length < 128 && ssh_gssapi_check_mechanism(&gssctxt, Index: openssh.spec =================================================================== RCS file: /cvs/pkgs/rpms/openssh/F-12/openssh.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -p -r1.171 -r1.172 --- openssh.spec 29 Oct 2009 12:19:37 -0000 1.171 +++ openssh.spec 2 Nov 2009 12:56:26 -0000 1.172 @@ -63,7 +63,7 @@ Summary: An open source implementation of SSH protocol versions 1 and 2 Name: openssh Version: 5.2p1 -Release: 30%{?dist}%{?rescue_rel} +Release: 31%{?dist}%{?rescue_rel} URL: http://www.openssh.com/portable.html #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc @@ -466,6 +466,9 @@ fi %endif %changelog +* Mon Nov 2 2009 Jan F. Chadima - 5.2p1-31 +- Repair canohost patch to allow gssapi to work when host is acessed via pipe proxy (#531849) + * Thu Oct 29 2009 Jan F. Chadima - 5.2p1-30 - Modify the init script to prevent it to hang during generating the keys (#515145) From cwickert at fedoraproject.org Mon Nov 2 13:02:20 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Nov 2009 13:02:20 +0000 (UTC) Subject: rpms/xfce4-power-manager/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xfce4-power-manager.spec, 1.19, 1.20 Message-ID: <20091102130220.EE2C711C02BC@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-power-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31833 Modified Files: .cvsignore sources xfce4-power-manager.spec Log Message: * Mon Nov 02 2009 Christoph Wickert - 0.8.4.1-1 - Update to 0.8.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 29 Sep 2009 10:29:45 -0000 1.14 +++ .cvsignore 2 Nov 2009 13:02:17 -0000 1.15 @@ -1 +1 @@ -xfce4-power-manager-0.8.4.tar.bz2 +xfce4-power-manager-0.8.4.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 29 Sep 2009 10:29:45 -0000 1.14 +++ sources 2 Nov 2009 13:02:18 -0000 1.15 @@ -1 +1 @@ -324be9320d8fae2b91a6111830465b0d xfce4-power-manager-0.8.4.tar.bz2 +ddb9bc27e34572c125ec008759a7bbad xfce4-power-manager-0.8.4.1.tar.bz2 Index: xfce4-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- xfce4-power-manager.spec 29 Sep 2009 10:29:45 -0000 1.19 +++ xfce4-power-manager.spec 2 Nov 2009 13:02:18 -0000 1.20 @@ -1,5 +1,5 @@ Name: xfce4-power-manager -Version: 0.8.4 +Version: 0.8.4.1 Release: 1%{?dist} Summary: Power management for the Xfce desktop environment @@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %changelog +* Mon Nov 02 2009 Christoph Wickert - 0.8.4.1-1 +- Update to 0.8.4.1 + * Tue Sep 29 2009 Christoph Wickert - 0.8.4-1 - Update to 0.8.4 - Drop xfpm_session_set_client_id patch, fixed upstream From twaugh at fedoraproject.org Mon Nov 2 13:08:52 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 2 Nov 2009 13:08:52 +0000 (UTC) Subject: rpms/system-config-printer/devel system-config-printer-de.po-typo.patch, NONE, 1.1 system-config-printer.spec, 1.304, 1.305 Message-ID: <20091102130852.78A8D11C00E8@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1508 Modified Files: system-config-printer.spec Added Files: system-config-printer-de.po-typo.patch Log Message: * Mon Nov 2 2009 Tim Waugh 1.1.13-7 - Fixed typo in de.po (bug #532371). system-config-printer-de.po-typo.patch: de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE system-config-printer-de.po-typo.patch --- diff -up system-config-printer-1.1.13/po/de.po.de.po-typo system-config-printer-1.1.13/po/de.po --- system-config-printer-1.1.13/po/de.po.de.po-typo 2009-09-04 10:35:48.000000000 +0100 +++ system-config-printer-1.1.13/po/de.po 2009-11-02 12:54:11.378978411 +0000 @@ -2204,7 +2204,7 @@ msgstr "Kopien:" #: ../glade/PrinterPropertiesDialog.glade.h:34 msgid "Deny printing for everyone except these users:" -msgstr "Allen Benutzern den Druckern verbieten, au?er:" +msgstr "Allen Benutzern das Drucken verbieten, au?er:" #: ../glade/PrinterPropertiesDialog.glade.h:36 msgid "Device URI:" Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.304 retrieving revision 1.305 diff -u -p -r1.304 -r1.305 --- system-config-printer.spec 30 Oct 2009 12:39:52 -0000 1.304 +++ system-config-printer.spec 2 Nov 2009 13:08:50 -0000 1.305 @@ -7,7 +7,7 @@ Summary: A printer administration tool Name: system-config-printer Version: 1.1.13 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -33,6 +33,7 @@ Patch15: system-config-printer-strip-zjs Patch16: system-config-printer-custom-state-reasons.patch Patch17: system-config-printer-no-epydoc.patch Patch18: system-config-printer-notification-traceback.patch +Patch19: system-config-printer-de.po-typo.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -110,6 +111,7 @@ printers. %patch16 -p1 -b .custom-state-reasons %patch17 -p1 -b .no-epydoc %patch18 -p1 -b .notification-traceback +%patch19 -p1 -b .de.po-typo %build %configure --with-udev-rules --with-polkit-1 @@ -221,6 +223,9 @@ rm -rf %buildroot exit 0 %changelog +* Mon Nov 2 2009 Tim Waugh 1.1.13-7 +- Fixed typo in de.po (bug #532371). + * Fri Oct 30 2009 Tim Waugh 1.1.13-6 - Avoid traceback in IPP notification handlers (bug #530641). - Avoid epydoc dependency. From twaugh at fedoraproject.org Mon Nov 2 13:09:08 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 2 Nov 2009 13:09:08 +0000 (UTC) Subject: rpms/system-config-printer/F-12 system-config-printer-de.po-typo.patch, NONE, 1.1 system-config-printer.spec, 1.309, 1.310 Message-ID: <20091102130908.C1D6911C00E8@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1585 Modified Files: system-config-printer.spec Added Files: system-config-printer-de.po-typo.patch Log Message: * Mon Nov 2 2009 Tim Waugh 1.1.13-7 - Fixed typo in de.po (bug #532371). system-config-printer-de.po-typo.patch: de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE system-config-printer-de.po-typo.patch --- diff -up system-config-printer-1.1.13/po/de.po.de.po-typo system-config-printer-1.1.13/po/de.po --- system-config-printer-1.1.13/po/de.po.de.po-typo 2009-09-04 10:35:48.000000000 +0100 +++ system-config-printer-1.1.13/po/de.po 2009-11-02 12:54:11.378978411 +0000 @@ -2204,7 +2204,7 @@ msgstr "Kopien:" #: ../glade/PrinterPropertiesDialog.glade.h:34 msgid "Deny printing for everyone except these users:" -msgstr "Allen Benutzern den Druckern verbieten, au?er:" +msgstr "Allen Benutzern das Drucken verbieten, au?er:" #: ../glade/PrinterPropertiesDialog.glade.h:36 msgid "Device URI:" Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v retrieving revision 1.309 retrieving revision 1.310 diff -u -p -r1.309 -r1.310 --- system-config-printer.spec 30 Oct 2009 12:39:32 -0000 1.309 +++ system-config-printer.spec 2 Nov 2009 13:09:07 -0000 1.310 @@ -7,7 +7,7 @@ Summary: A printer administration tool Name: system-config-printer Version: 1.1.13 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -33,6 +33,7 @@ Patch15: system-config-printer-strip-zjs Patch16: system-config-printer-custom-state-reasons.patch Patch17: system-config-printer-no-epydoc.patch Patch18: system-config-printer-notification-traceback.patch +Patch19: system-config-printer-de.po-typo.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -110,6 +111,7 @@ printers. %patch16 -p1 -b .custom-state-reasons %patch17 -p1 -b .no-epydoc %patch18 -p1 -b .notification-traceback +%patch19 -p1 -b .de.po-typo %build %configure --with-udev-rules --with-polkit-1 @@ -221,6 +223,9 @@ rm -rf %buildroot exit 0 %changelog +* Mon Nov 2 2009 Tim Waugh 1.1.13-7 +- Fixed typo in de.po (bug #532371). + * Fri Oct 30 2009 Tim Waugh 1.1.13-6 - Avoid traceback in IPP notification handlers (bug #530641). - Avoid epydoc dependency. From twaugh at fedoraproject.org Mon Nov 2 13:09:12 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 2 Nov 2009 13:09:12 +0000 (UTC) Subject: rpms/system-config-printer/F-11 system-config-printer-de.po-typo.patch, NONE, 1.1 system-config-printer.spec, 1.300, 1.301 Message-ID: <20091102130912.48AA911C00E8@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/system-config-printer/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1616 Modified Files: system-config-printer.spec Added Files: system-config-printer-de.po-typo.patch Log Message: * Mon Nov 2 2009 Tim Waugh 1.1.13-7 - Fixed typo in de.po (bug #532371). system-config-printer-de.po-typo.patch: de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE system-config-printer-de.po-typo.patch --- diff -up system-config-printer-1.1.13/po/de.po.de.po-typo system-config-printer-1.1.13/po/de.po --- system-config-printer-1.1.13/po/de.po.de.po-typo 2009-09-04 10:35:48.000000000 +0100 +++ system-config-printer-1.1.13/po/de.po 2009-11-02 12:54:11.378978411 +0000 @@ -2204,7 +2204,7 @@ msgstr "Kopien:" #: ../glade/PrinterPropertiesDialog.glade.h:34 msgid "Deny printing for everyone except these users:" -msgstr "Allen Benutzern den Druckern verbieten, au?er:" +msgstr "Allen Benutzern das Drucken verbieten, au?er:" #: ../glade/PrinterPropertiesDialog.glade.h:36 msgid "Device URI:" Index: system-config-printer.spec =================================================================== RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v retrieving revision 1.300 retrieving revision 1.301 diff -u -p -r1.300 -r1.301 --- system-config-printer.spec 30 Oct 2009 12:38:29 -0000 1.300 +++ system-config-printer.spec 2 Nov 2009 13:09:11 -0000 1.301 @@ -7,7 +7,7 @@ Summary: A printer administration tool Name: system-config-printer Version: 1.1.13 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base @@ -30,6 +30,7 @@ Patch14: system-config-printer-troublesh Patch15: system-config-printer-strip-zjs.patch Patch16: system-config-printer-custom-state-reasons.patch Patch18: system-config-printer-notification-traceback.patch +Patch19: system-config-printer-de.po-typo.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -93,6 +94,7 @@ the configuration tool. %patch15 -p1 -b .strip-zjs %patch16 -p1 -b .custom-state-reasons %patch18 -p1 -b .notification-traceback +%patch19 -p1 -b .de.po-typo %build %configure @@ -194,6 +196,9 @@ rm -rf %buildroot exit 0 %changelog +* Mon Nov 2 2009 Tim Waugh 1.1.13-7 +- Fixed typo in de.po (bug #532371). + * Fri Oct 30 2009 Tim Waugh 1.1.13-6 - Avoid traceback in IPP notification handlers (bug #530641). From tbzatek at fedoraproject.org Mon Nov 2 13:09:59 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Nov 2009 13:09:59 +0000 (UTC) Subject: rpms/seahorse-plugins/devel .cvsignore, 1.14, 1.15 seahorse-plugins.spec, 1.31, 1.32 sources, 1.15, 1.16 Message-ID: <20091102130959.BA79311C00E8@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/seahorse-plugins/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1899 Modified Files: .cvsignore seahorse-plugins.spec sources Log Message: * Mon Nov 2 2009 Tomas Bzatek 2.29.1-1 - Update to 2.29.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse-plugins/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 24 Sep 2009 02:24:26 -0000 1.14 +++ .cvsignore 2 Nov 2009 13:09:59 -0000 1.15 @@ -1 +1 @@ -seahorse-plugins-2.28.0.tar.bz2 +seahorse-plugins-2.29.1.tar.bz2 Index: seahorse-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- seahorse-plugins.spec 2 Nov 2009 04:34:50 -0000 1.31 +++ seahorse-plugins.spec 2 Nov 2009 13:09:59 -0000 1.32 @@ -1,11 +1,11 @@ Name: seahorse-plugins -Version: 2.28.1 +Version: 2.29.1 Release: 1%{?dist} Summary: Plugins and utilities for encryption in GNOME Group: User Interface/Desktops License: GPLv2+ and GFDL URL: http://projects.gnome.org/seahorse/ -Source: http://download.gnome.org/sources/seahorse-plugins/2.28/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/seahorse-plugins/2.29/%{name}-%{version}.tar.bz2 Source1: seahorse-agent.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -183,6 +183,9 @@ fi #%{_libdir}/epiphany/2.27/extensions/seahorse.ephy-extension %changelog +* Mon Nov 2 2009 Tomas Bzatek 2.29.1-1 +- Update to 2.29.1 + * Mon Oct 19 2009 Tomas Bzatek 2.28.1-1 - Update to 2.28.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse-plugins/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 2 Nov 2009 04:34:50 -0000 1.15 +++ sources 2 Nov 2009 13:09:59 -0000 1.16 @@ -1 +1 @@ -cec5ef8b94c16798f53a5876d3718b91 seahorse-plugins-2.28.1.tar.bz2 +9cd2a8d0a324bf97163c227eafcf24d3 seahorse-plugins-2.29.1.tar.bz2 From jcollie at fedoraproject.org Mon Nov 2 13:12:39 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Mon, 2 Nov 2009 13:12:39 +0000 (UTC) Subject: rpms/python-paramiko/devel .cvsignore, 1.12, 1.13 python-paramiko.spec, 1.21, 1.22 sources, 1.12, 1.13 paramiko-channel-race.patch, 1.1, NONE Message-ID: <20091102131239.0445C11C02BC@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/python-paramiko/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2872 Modified Files: .cvsignore python-paramiko.spec sources Removed Files: paramiko-channel-race.patch Log Message: * Mon Nov 2 2009 Jeffrey C. Ollie - 1.7.6-1 - v1.7.6 (Fanny) 1nov09 - --------------------- - * fixed bugs 411099 (sftp chdir isn't unicode-safe), 363163 & 411910 (more - IPv6 problems on windows), 413850 (race when server closes the channel), - 426925 (support port numbers in host keys) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 24 Jul 2009 12:34:12 -0000 1.12 +++ .cvsignore 2 Nov 2009 13:12:37 -0000 1.13 @@ -1 +1 @@ -paramiko-1.7.5.tar.gz +paramiko-1.7.6.tar.gz Index: python-paramiko.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/devel/python-paramiko.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- python-paramiko.spec 14 Oct 2009 01:57:55 -0000 1.21 +++ python-paramiko.spec 2 Nov 2009 13:12:38 -0000 1.22 @@ -3,8 +3,8 @@ %define srcname paramiko Name: python-paramiko -Version: 1.7.5 -Release: 2%{?dist} +Version: 1.7.6 +Release: 1%{?dist} Summary: A SSH2 protocol library for python Group: Development/Libraries @@ -12,7 +12,6 @@ Group: Development/Libraries License: LGPLv2+ URL: http://www.lag.net/paramiko/ Source0: http://www.lag.net/paramiko/download/%{srcname}-%{version}.tar.gz -Patch0: paramiko-channel-race.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,7 +36,6 @@ encrypted tunnel. (This is how sftp work %prep %setup -q -n %{srcname}-%{version} -%patch0 -p0 -b .race %{__chmod} a-x demos/* %{__sed} -i -e '/^#!/,1d' demos/* paramiko/rng* @@ -57,6 +55,13 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog +* Mon Nov 2 2009 Jeffrey C. Ollie - 1.7.6-1 +- v1.7.6 (Fanny) 1nov09 +- --------------------- +- * fixed bugs 411099 (sftp chdir isn't unicode-safe), 363163 & 411910 (more +- IPv6 problems on windows), 413850 (race when server closes the channel), +- 426925 (support port numbers in host keys) + * Tue Oct 13 2009 Jeremy Katz - 1.7.5-2 - Fix race condition (#526341) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-paramiko/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 24 Jul 2009 12:34:12 -0000 1.12 +++ sources 2 Nov 2009 13:12:38 -0000 1.13 @@ -1 +1 @@ -7eac2199bea086cc22966eb223c64e7f paramiko-1.7.5.tar.gz +fa144ab46f1dc639b05ab948c30efac4 paramiko-1.7.6.tar.gz --- paramiko-channel-race.patch DELETED --- From nucleo at fedoraproject.org Mon Nov 2 13:13:59 2009 From: nucleo at fedoraproject.org (nucleo) Date: Mon, 2 Nov 2009 13:13:59 +0000 (UTC) Subject: comps comps-f10.xml.in, 1.295, 1.296 comps-f11.xml.in, 1.329, 1.330 comps-f12.xml.in, 1.188, 1.189 comps-f13.xml.in, 1.75, 1.76 Message-ID: <20091102131359.0202011C00E8@cvs1.fedora.phx.redhat.com> Author: nucleo Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2264 Modified Files: comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in Log Message: Added AcetoneISO2 and subtitlecomposer to sound-and-video group, cups-pdf to printing group, phpMyAdmin to web-server group, qtoctave, scidavis, scidavis-manual to engineering-and-scientific group Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.295 retrieving revision 1.296 diff -u -p -r1.295 -r1.296 --- comps-f10.xml.in 2 Nov 2009 12:39:55 -0000 1.295 +++ comps-f10.xml.in 2 Nov 2009 13:13:56 -0000 1.296 @@ -1261,10 +1261,13 @@ qalculate-kde qcad qtiplot + qtoctave qucs R rrdtool scalapack + scidavis + scidavis-manual scigraphica scrip seaview @@ -3937,6 +3940,7 @@ mpage samba-client system-config-printer + cups-pdf @@ -4195,6 +4199,7 @@ totem-nautilus wodim abcde + AcetoneISO2 adplay alsamixergui amarok @@ -4265,6 +4270,7 @@ serpentine soundconverter soundtracker + subtitlecomposer sweep tagtool tclabc @@ -5005,6 +5011,7 @@ php-pecl-apc php-pgsql phpldapadmin + phpMyAdmin Pound tclhttpd thttpd Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.329 retrieving revision 1.330 diff -u -p -r1.329 -r1.330 --- comps-f11.xml.in 2 Nov 2009 12:39:55 -0000 1.329 +++ comps-f11.xml.in 2 Nov 2009 13:13:56 -0000 1.330 @@ -1440,9 +1440,12 @@ qalculate-kde qcad qtiplot + qtoctave R rrdtool scalapack + scidavis + scidavis-manual scigraphica scrip seaview @@ -4584,6 +4587,7 @@ samba-client system-config-printer a2ps + cups-pdf @@ -4879,6 +4883,7 @@ totem-nautilus wodim abcde + AcetoneISO2 adplay alsamixergui amarok @@ -4953,6 +4958,7 @@ serpentine soundconverter soundtracker + subtitlecomposer sweep tagtool tclabc @@ -5788,6 +5794,7 @@ php-pecl-apc php-pgsql phpldapadmin + phpMyAdmin Pound tclhttpd thttpd Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.188 retrieving revision 1.189 diff -u -p -r1.188 -r1.189 --- comps-f12.xml.in 2 Nov 2009 12:39:55 -0000 1.188 +++ comps-f12.xml.in 2 Nov 2009 13:13:58 -0000 1.189 @@ -1587,9 +1587,12 @@ qalculate-kde qcad qtiplot + qtoctave R rrdtool scalapack + scidavis + scidavis-manual scigraphica scrip seaview @@ -4855,6 +4858,7 @@ system-config-printer system-config-printer-udev a2ps + cups-pdf enscript @@ -5158,6 +5162,7 @@ totem-nautilus wodim abcde + AcetoneISO2 adplay alsamixergui amarok @@ -5233,6 +5238,7 @@ serpentine soundconverter soundtracker + subtitlecomposer sweep tagtool tclabc @@ -6087,6 +6093,7 @@ php-pecl-apc php-pgsql phpldapadmin + phpMyAdmin Pound tclhttpd thttpd Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.75 retrieving revision 1.76 diff -u -p -r1.75 -r1.76 --- comps-f13.xml.in 2 Nov 2009 12:39:56 -0000 1.75 +++ comps-f13.xml.in 2 Nov 2009 13:13:58 -0000 1.76 @@ -1578,9 +1578,12 @@ qalculate-kde qcad qtiplot + qtoctave R rrdtool scalapack + scidavis + scidavis-manual scigraphica scrip seaview @@ -4828,6 +4831,7 @@ system-config-printer system-config-printer-udev a2ps + cups-pdf enscript @@ -5127,6 +5131,7 @@ totem-nautilus wodim abcde + AcetoneISO2 adplay alsamixergui amarok @@ -5202,6 +5207,7 @@ serpentine soundconverter soundtracker + subtitlecomposer sweep tagtool tclabc @@ -6041,6 +6047,7 @@ php-pecl-apc php-pgsql phpldapadmin + phpMyAdmin Pound tclhttpd thttpd From cwickert at fedoraproject.org Mon Nov 2 13:29:25 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Nov 2009 13:29:25 +0000 (UTC) Subject: rpms/xfce4-power-manager/devel xfce4-power-manager.spec, 1.20, 1.21 xfce4-power-manager-0.8.2-dpmsconst.patch, 1.1, NONE Message-ID: <20091102132925.CC5B111C00E8@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-power-manager/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9945 Modified Files: xfce4-power-manager.spec Removed Files: xfce4-power-manager-0.8.2-dpmsconst.patch Log Message: drop obsolete patch Index: xfce4-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/devel/xfce4-power-manager.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- xfce4-power-manager.spec 2 Nov 2009 13:02:18 -0000 1.20 +++ xfce4-power-manager.spec 2 Nov 2009 13:29:25 -0000 1.21 @@ -7,7 +7,6 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} Source0: http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2 -Patch0: %{name}-0.8.2-dpmsconst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfconf-devel >= 4.6.0 @@ -30,9 +29,6 @@ preferences. %prep %setup -q -%if 0%{?fedora} >= 12 -%patch0 -b .dpmsstr -%endif %build %configure --- xfce4-power-manager-0.8.2-dpmsconst.patch DELETED --- From rrakus at fedoraproject.org Mon Nov 2 13:36:33 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Mon, 2 Nov 2009 13:36:33 +0000 (UTC) Subject: rpms/PyXML/devel PyXML.spec,1.37,1.38 Message-ID: <20091102133634.07E2711C00E8@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/PyXML/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13467 Modified Files: PyXML.spec Log Message: Use system expat library Index: PyXML.spec =================================================================== RCS file: /cvs/extras/rpms/PyXML/devel/PyXML.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- PyXML.spec 24 Jul 2009 16:04:50 -0000 1.37 +++ PyXML.spec 2 Nov 2009 13:36:33 -0000 1.38 @@ -1,17 +1,18 @@ Summary: XML libraries for python Name: PyXML Version: 0.8.4 -Release: 15 +Release: 16%{?dist} Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz Patch0: PyXML-0.7.1-intern.patch Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch Patch2: PyXML-memmove.patch Patch3: PyXML-0.8.4-python2.6.patch + License: MIT and Python and ZPLv1.0 and BSD Group: Development/Libraries Requires: python URL: http://pyxml.sourceforge.net/ -BuildRequires: python python-devel +BuildRequires: python python-devel expat-devel BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot # Must have setuptools to build the package @@ -44,7 +45,10 @@ programming interfaces and an interface %patch3 -p1 %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build --with-xslt +# build PyXML with system expat +# Make sure we don't use local one +rm -rf extensions/expat +CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build --with-xslt --with-libexpat=%{_usr} %install rm -fr $RPM_BUILD_ROOT @@ -62,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python?.?/site-packages/_xmlplus %changelog +* Mon Nov 02 2009 Roman Rakus - 0.8.4-16 +- Use system expat library + * Fri Jul 24 2009 Fedora Release Engineering - 0.8.4-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From mapleoin at fedoraproject.org Mon Nov 2 13:45:05 2009 From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=) Date: Mon, 2 Nov 2009 13:45:05 +0000 (UTC) Subject: rpms/python-tornado/devel import.log, NONE, 1.1 python-tornado.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091102134505.37FC211C0086@cvs1.fedora.phx.redhat.com> Author: mapleoin Update of /cvs/pkgs/rpms/python-tornado/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18355/devel Modified Files: .cvsignore sources Added Files: import.log python-tornado.spec Log Message: * Tue Nov 2 2009 Ionu? C. Ar??ri?i - Initial import. --- NEW FILE import.log --- python-tornado-0_2-3_fc11:HEAD:python-tornado-0.2-3.fc11.src.rpm:1257169031 --- NEW FILE python-tornado.spec --- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %global pkgname tornado Name: python-%{pkgname} Version: 0.2 Release: 3%{?dist} Summary: Scalable, non-blocking web server and tools Group: Development/Libraries License: ASL 2.0 URL: http://www.tornadoweb.org Source0: http://www.tornadoweb.org/static/%{pkgname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-pycurl Requires: python-simplejson %description Tornado is an open source version of the scalable, non-blocking web server and and tools. The framework is distinct from most mainstream web server frameworks (and certainly most Python frameworks) because it is non-blocking and reasonably fast. Because it is non-blocking and uses epoll, it can handle thousands of simultaneous standing connections, which means it is ideal for real-time web services. %package doc Summary: Examples for python-tornado Group: Documentation Requires: python-tornado = %{version}-%{release} %description doc Tornado is an open source version of the scalable, non-blocking web server and and tools. This package contains some example applications. %prep %setup -q -n %{pkgname}-%{version} # remove shebang from files for File in `find %{pkgname} -name "*py"`; do %{__sed} -i.orig -e 1d ${File} touch -r ${File}.orig ${File} %{__rm} ${File}.orig done # spurious permission fix %{__chmod} -x demos/*/*py %{__chmod} -x demos/*/*/*py %{__chmod} -x demos/*/*/*/*py # remove empty file rm -rf demos/facebook/static/facebook.js %build python setup.py build %install rm -rf %{buildroot} PATH=$PATH:%{buildroot}%{python_sitelib}/%{pkgname} python setup.py install --root=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README PKG-INFO %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}-%{version}-*.egg-info %files doc %defattr(-,root,root,-) %doc demos %changelog * Wed Oct 21 2009 Ionu? Ar??ri?i - 0.2-3 - changed -doc package group to Documentation - use global instead of define * Tue Oct 20 2009 Ionu? Ar??ri?i - 0.2-2 - create -doc package for examples - altered description to not include references to FriendFeed - rename to python-tornado * Fri Sep 25 2009 Ionu? Ar??ri?i - 0.2-1 - New upstream version - Fixed macro usage and directory ownership in spec * Thu Sep 10 2009 Ionu? Ar??ri?i - 0.1-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-tornado/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:57:06 -0000 1.1 +++ .cvsignore 2 Nov 2009 13:45:03 -0000 1.2 @@ -0,0 +1 @@ +tornado-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-tornado/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:57:06 -0000 1.1 +++ sources 2 Nov 2009 13:45:03 -0000 1.2 @@ -0,0 +1 @@ +4704cbf8baab2562c1e648c76de87b60 tornado-0.2.tar.gz From mapleoin at fedoraproject.org Mon Nov 2 13:49:28 2009 From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=) Date: Mon, 2 Nov 2009 13:49:28 +0000 (UTC) Subject: rpms/python-tornado/F-11 import.log, NONE, 1.1 python-tornado.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091102134928.DF5D511C0086@cvs1.fedora.phx.redhat.com> Author: mapleoin Update of /cvs/pkgs/rpms/python-tornado/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19727/F-11 Modified Files: .cvsignore sources Added Files: import.log python-tornado.spec Log Message: * Tue Nov 2 2009 Ionu? C. Ar??ri?i - Initial import. --- NEW FILE import.log --- python-tornado-0_2-3_fc11:F-11:python-tornado-0.2-3.fc11.src.rpm:1257169478 --- NEW FILE python-tornado.spec --- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %global pkgname tornado Name: python-%{pkgname} Version: 0.2 Release: 3%{?dist} Summary: Scalable, non-blocking web server and tools Group: Development/Libraries License: ASL 2.0 URL: http://www.tornadoweb.org Source0: http://www.tornadoweb.org/static/%{pkgname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-pycurl Requires: python-simplejson %description Tornado is an open source version of the scalable, non-blocking web server and and tools. The framework is distinct from most mainstream web server frameworks (and certainly most Python frameworks) because it is non-blocking and reasonably fast. Because it is non-blocking and uses epoll, it can handle thousands of simultaneous standing connections, which means it is ideal for real-time web services. %package doc Summary: Examples for python-tornado Group: Documentation Requires: python-tornado = %{version}-%{release} %description doc Tornado is an open source version of the scalable, non-blocking web server and and tools. This package contains some example applications. %prep %setup -q -n %{pkgname}-%{version} # remove shebang from files for File in `find %{pkgname} -name "*py"`; do %{__sed} -i.orig -e 1d ${File} touch -r ${File}.orig ${File} %{__rm} ${File}.orig done # spurious permission fix %{__chmod} -x demos/*/*py %{__chmod} -x demos/*/*/*py %{__chmod} -x demos/*/*/*/*py # remove empty file rm -rf demos/facebook/static/facebook.js %build python setup.py build %install rm -rf %{buildroot} PATH=$PATH:%{buildroot}%{python_sitelib}/%{pkgname} python setup.py install --root=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README PKG-INFO %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}-%{version}-*.egg-info %files doc %defattr(-,root,root,-) %doc demos %changelog * Wed Oct 21 2009 Ionu? Ar??ri?i - 0.2-3 - changed -doc package group to Documentation - use global instead of define * Tue Oct 20 2009 Ionu? Ar??ri?i - 0.2-2 - create -doc package for examples - altered description to not include references to FriendFeed - rename to python-tornado * Fri Sep 25 2009 Ionu? Ar??ri?i - 0.2-1 - New upstream version - Fixed macro usage and directory ownership in spec * Thu Sep 10 2009 Ionu? Ar??ri?i - 0.1-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-tornado/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:57:06 -0000 1.1 +++ .cvsignore 2 Nov 2009 13:49:27 -0000 1.2 @@ -0,0 +1 @@ +tornado-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-tornado/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:57:06 -0000 1.1 +++ sources 2 Nov 2009 13:49:28 -0000 1.2 @@ -0,0 +1 @@ +4704cbf8baab2562c1e648c76de87b60 tornado-0.2.tar.gz From mapleoin at fedoraproject.org Mon Nov 2 13:53:49 2009 From: mapleoin at fedoraproject.org (=?utf-8?b?SW9udcibIEFyyJvEg3JpyJlp?=) Date: Mon, 2 Nov 2009 13:53:49 +0000 (UTC) Subject: rpms/python-tornado/F-12 import.log, NONE, 1.1 python-tornado.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091102135349.8A67711C0086@cvs1.fedora.phx.redhat.com> Author: mapleoin Update of /cvs/pkgs/rpms/python-tornado/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20649/F-12 Modified Files: .cvsignore sources Added Files: import.log python-tornado.spec Log Message: * Mon Nov 2 2009 Ionu? C. Ar??ri?i - Initial import. --- NEW FILE import.log --- python-tornado-0_2-3_fc11:F-12:python-tornado-0.2-3.fc11.src.rpm:1257169693 --- NEW FILE python-tornado.spec --- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %global pkgname tornado Name: python-%{pkgname} Version: 0.2 Release: 3%{?dist} Summary: Scalable, non-blocking web server and tools Group: Development/Libraries License: ASL 2.0 URL: http://www.tornadoweb.org Source0: http://www.tornadoweb.org/static/%{pkgname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-pycurl Requires: python-simplejson %description Tornado is an open source version of the scalable, non-blocking web server and and tools. The framework is distinct from most mainstream web server frameworks (and certainly most Python frameworks) because it is non-blocking and reasonably fast. Because it is non-blocking and uses epoll, it can handle thousands of simultaneous standing connections, which means it is ideal for real-time web services. %package doc Summary: Examples for python-tornado Group: Documentation Requires: python-tornado = %{version}-%{release} %description doc Tornado is an open source version of the scalable, non-blocking web server and and tools. This package contains some example applications. %prep %setup -q -n %{pkgname}-%{version} # remove shebang from files for File in `find %{pkgname} -name "*py"`; do %{__sed} -i.orig -e 1d ${File} touch -r ${File}.orig ${File} %{__rm} ${File}.orig done # spurious permission fix %{__chmod} -x demos/*/*py %{__chmod} -x demos/*/*/*py %{__chmod} -x demos/*/*/*/*py # remove empty file rm -rf demos/facebook/static/facebook.js %build python setup.py build %install rm -rf %{buildroot} PATH=$PATH:%{buildroot}%{python_sitelib}/%{pkgname} python setup.py install --root=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README PKG-INFO %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}-%{version}-*.egg-info %files doc %defattr(-,root,root,-) %doc demos %changelog * Wed Oct 21 2009 Ionu? Ar??ri?i - 0.2-3 - changed -doc package group to Documentation - use global instead of define * Tue Oct 20 2009 Ionu? Ar??ri?i - 0.2-2 - create -doc package for examples - altered description to not include references to FriendFeed - rename to python-tornado * Fri Sep 25 2009 Ionu? Ar??ri?i - 0.2-1 - New upstream version - Fixed macro usage and directory ownership in spec * Thu Sep 10 2009 Ionu? Ar??ri?i - 0.1-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-tornado/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:57:06 -0000 1.1 +++ .cvsignore 2 Nov 2009 13:53:48 -0000 1.2 @@ -0,0 +1 @@ +tornado-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-tornado/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:57:06 -0000 1.1 +++ sources 2 Nov 2009 13:53:49 -0000 1.2 @@ -0,0 +1 @@ +4704cbf8baab2562c1e648c76de87b60 tornado-0.2.tar.gz From nucleo at fedoraproject.org Mon Nov 2 13:57:47 2009 From: nucleo at fedoraproject.org (nucleo) Date: Mon, 2 Nov 2009 13:57:47 +0000 (UTC) Subject: comps comps-f10.xml.in, 1.296, 1.297 comps-f11.xml.in, 1.330, 1.331 comps-f12.xml.in, 1.189, 1.190 comps-f13.xml.in, 1.76, 1.77 Message-ID: <20091102135747.8B1BF11C0086@cvs1.fedora.phx.redhat.com> Author: nucleo Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20789 Modified Files: comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in Log Message: Added apcupsd-gui, ddclient, fdupes, htop, iftop, iotop, nethogs, noip, nrg2iso, ntp-perl, ntpdate to system-tools group Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.296 retrieving revision 1.297 diff -u -p -r1.296 -r1.297 --- comps-f10.xml.in 2 Nov 2009 13:13:56 -0000 1.296 +++ comps-f10.xml.in 2 Nov 2009 13:57:45 -0000 1.297 @@ -4469,6 +4469,7 @@ am-utils amanda-client apcupsd + apcupsd-gui apg apt arc @@ -4491,6 +4492,7 @@ crash createrepo dar + ddclient denyhosts dkms dnrd @@ -4507,6 +4509,7 @@ ettercap fatsort fcron + fdupes fedora-package-config-apt fedora-package-config-smart festival @@ -4534,10 +4537,13 @@ gxemul hercules hfsplus-tools + htop hyperestraier ibmonitor + iftop inadyn-mt incron + iotop ip6sic iptraf isic @@ -4561,10 +4567,15 @@ nagios net-snmp-utils netgo + nethogs netstat-nat nfswatch nmap-frontend + noip nomarch + nrg2iso + ntp-perl + ntpdate nut nx obexfs Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.330 retrieving revision 1.331 diff -u -p -r1.330 -r1.331 --- comps-f11.xml.in 2 Nov 2009 13:13:56 -0000 1.330 +++ comps-f11.xml.in 2 Nov 2009 13:57:46 -0000 1.331 @@ -5193,6 +5193,7 @@ am-utils amanda-client apcupsd + apcupsd-gui apg apt arc @@ -5214,6 +5215,7 @@ crash createrepo dar + ddclient denyhosts dkms dnrd @@ -5230,6 +5232,7 @@ ettercap fatsort fcron + fdupes fedora-package-config-apt fedora-package-config-smart festival @@ -5257,10 +5260,13 @@ gxemul hercules hfsplus-tools + htop hyperestraier ibmonitor + iftop inadyn-mt incron + iotop ip6sic iptraf ircp-tray @@ -5283,10 +5289,15 @@ nagios net-snmp-utils netgo + nethogs netstat-nat nfswatch nmap-frontend + noip nomarch + nrg2iso + ntp-perl + ntpdate nut nx obexfs Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.189 retrieving revision 1.190 diff -u -p -r1.189 -r1.190 --- comps-f12.xml.in 2 Nov 2009 13:13:58 -0000 1.189 +++ comps-f12.xml.in 2 Nov 2009 13:57:46 -0000 1.190 @@ -5473,6 +5473,7 @@ am-utils amanda-client apcupsd + apcupsd-gui apg apt arc @@ -5494,6 +5495,7 @@ crash createrepo dar + ddclient denyhosts dkms dnrd @@ -5510,6 +5512,7 @@ ettercap fatsort fcron + fdupes fedora-package-config-apt fedora-package-config-smart festival @@ -5537,10 +5540,13 @@ gxemul hercules hfsplus-tools + htop hyperestraier ibmonitor + iftop inadyn-mt incron + iotop ip6sic iptraf ircp-tray @@ -5563,10 +5569,15 @@ nagios net-snmp-utils netgo + nethogs netstat-nat nfswatch nmap-frontend + noip nomarch + nrg2iso + ntp-perl + ntpdate nut nx obexfs Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.76 retrieving revision 1.77 diff -u -p -r1.76 -r1.77 --- comps-f13.xml.in 2 Nov 2009 13:13:58 -0000 1.76 +++ comps-f13.xml.in 2 Nov 2009 13:57:46 -0000 1.77 @@ -5429,6 +5429,7 @@ am-utils amanda-client apcupsd + apcupsd-gui apg apt arc @@ -5450,6 +5451,7 @@ crash createrepo dar + ddclient denyhosts dkms dnrd @@ -5466,6 +5468,7 @@ ettercap fatsort fcron + fdupes fedora-package-config-apt fedora-package-config-smart festival @@ -5493,10 +5496,13 @@ gxemul hercules hfsplus-tools + htop hyperestraier ibmonitor + iftop inadyn-mt incron + iotop ip6sic iptraf ircp-tray @@ -5519,10 +5525,15 @@ nagios net-snmp-utils netgo + nethogs netstat-nat nfswatch nmap-frontend + noip nomarch + nrg2iso + ntp-perl + ntpdate nut nx obexfs From cwickert at fedoraproject.org Mon Nov 2 14:01:14 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Nov 2009 14:01:14 +0000 (UTC) Subject: rpms/xfce4-power-manager/F-12 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xfce4-power-manager.spec, 1.19, 1.20 xfce4-power-manager-0.8.2-dpmsconst.patch, 1.1, NONE Message-ID: <20091102140115.25D0611C02BC@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-power-manager/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22949 Modified Files: .cvsignore sources xfce4-power-manager.spec Removed Files: xfce4-power-manager-0.8.2-dpmsconst.patch Log Message: * Mon Nov 02 2009 Christoph Wickert - 0.8.4.1-1 - Update to 0.8.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-12/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 29 Sep 2009 10:59:48 -0000 1.14 +++ .cvsignore 2 Nov 2009 14:01:13 -0000 1.15 @@ -1 +1 @@ -xfce4-power-manager-0.8.4.tar.bz2 +xfce4-power-manager-0.8.4.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-12/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 29 Sep 2009 10:59:48 -0000 1.14 +++ sources 2 Nov 2009 14:01:14 -0000 1.15 @@ -1 +1 @@ -324be9320d8fae2b91a6111830465b0d xfce4-power-manager-0.8.4.tar.bz2 +ddb9bc27e34572c125ec008759a7bbad xfce4-power-manager-0.8.4.1.tar.bz2 Index: xfce4-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-12/xfce4-power-manager.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- xfce4-power-manager.spec 29 Sep 2009 10:59:48 -0000 1.19 +++ xfce4-power-manager.spec 2 Nov 2009 14:01:14 -0000 1.20 @@ -1,5 +1,5 @@ Name: xfce4-power-manager -Version: 0.8.4 +Version: 0.8.4.1 Release: 1%{?dist} Summary: Power management for the Xfce desktop environment @@ -7,7 +7,6 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} Source0: http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2 -Patch0: %{name}-0.8.2-dpmsconst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfconf-devel >= 4.6.0 @@ -30,9 +29,6 @@ preferences. %prep %setup -q -%if 0%{?fedora} >= 12 -%patch0 -b .dpmsstr -%endif %build %configure @@ -84,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %changelog +* Mon Nov 02 2009 Christoph Wickert - 0.8.4.1-1 +- Update to 0.8.4.1 + * Tue Sep 29 2009 Christoph Wickert - 0.8.4-1 - Update to 0.8.4 - Drop xfpm_session_set_client_id patch, fixed upstream --- xfce4-power-manager-0.8.2-dpmsconst.patch DELETED --- From rrakus at fedoraproject.org Mon Nov 2 14:10:03 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Mon, 2 Nov 2009 14:10:03 +0000 (UTC) Subject: rpms/PyXML/F-10 PyXML.spec,1.33,1.34 Message-ID: <20091102141003.DA5E511C04B2@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/PyXML/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24947 Modified Files: PyXML.spec Log Message: Use system expat library Index: PyXML.spec =================================================================== RCS file: /cvs/extras/rpms/PyXML/F-10/PyXML.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- PyXML.spec 30 Oct 2009 14:42:40 -0000 1.33 +++ PyXML.spec 2 Nov 2009 14:10:02 -0000 1.34 @@ -1,18 +1,17 @@ Summary: XML libraries for python. Name: PyXML Version: 0.8.4 -Release: 11%{?dist} +Release: 12%{?dist} Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz Patch0: PyXML-0.7.1-intern.patch Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch Patch2: PyXML-memmove.patch -Patch3: PyXML-0.8.4-buffer-over-read.patch License: MIT and Python and ZPLv1.0 and BSD Group: Development/Libraries Requires: python URL: http://pyxml.sourceforge.net/ -BuildRequires: python python-devel +BuildRequires: python python-devel expat-devel BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot # Must have setuptools to build the package @@ -42,10 +41,12 @@ programming interfaces and an interface %patch0 -p1 -b .intern %patch1 -p1 -b .python2.4-backport %patch2 -p1 -%patch3 -p1 -b .buufer_over_read %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build --with-xslt +# build PyXML with system expat +# Make sure we don't use local one +rm -rf extensions/expat +CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build --with-xslt --with-libexpat=%{_usr} %install rm -fr $RPM_BUILD_ROOT @@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python?.?/site-packages/_xmlplus %changelog +* Mon Nov 02 2009 Roman Rakus - 0.8.4-12 +- Use system expat library + * Fri Oct 30 2009 Roman Rakus - 0.8.4-11 - Fix buffer over read From jnovy at fedoraproject.org Mon Nov 2 14:12:15 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Mon, 2 Nov 2009 14:12:15 +0000 (UTC) Subject: rpms/libvorbis/devel r16326.diff, NONE, 1.1 r16597.diff, NONE, 1.1 libvorbis.spec, 1.39, 1.40 Message-ID: <20091102141215.42BA511C0418@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/libvorbis/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25407 Modified Files: libvorbis.spec Added Files: r16326.diff r16597.diff Log Message: * Mon Nov 2 2009 Jindrich Novy 1.2.3-3 - backport patches to fix CVE-2009-3379 (#531765) from upstream r16326.diff: backends.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE r16326.diff --- diff -up libvorbis-1.2.3/lib/backends.h.r16326 libvorbis-1.2.3/lib/backends.h --- libvorbis-1.2.3/lib/backends.h.r16326 2009-07-09 11:12:08.000000000 +0200 +++ libvorbis-1.2.3/lib/backends.h 2009-11-02 14:55:42.000000000 +0100 @@ -111,7 +111,7 @@ typedef struct vorbis_info_residue0{ int partitions; /* possible codebooks for a partition */ int groupbook; /* huffbook for partitioning */ int secondstages[64]; /* expanded out to pointers in lookup */ - int booklist[256]; /* list of second stage books */ + int booklist[512]; /* list of second stage books */ const float classmetric1[64]; const float classmetric2[64]; r16597.diff: codebook.c | 1 + 1 file changed, 1 insertion(+) --- NEW FILE r16597.diff --- diff -up libvorbis-1.2.3/lib/codebook.c.r16597 libvorbis-1.2.3/lib/codebook.c --- libvorbis-1.2.3/lib/codebook.c.r16597 2009-07-09 11:12:08.000000000 +0200 +++ libvorbis-1.2.3/lib/codebook.c 2009-11-02 14:51:15.000000000 +0100 @@ -198,6 +198,7 @@ int vorbis_staticbook_unpack(oggpack_buf for(i=0;ientries;){ long num=oggpack_read(opb,_ilog(s->entries-i)); if(num==-1)goto _eofout; + if(length>32)goto _errout; for(j=0;jentries;j++,i++) s->lengthlist[i]=length; length++; Index: libvorbis.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvorbis/devel/libvorbis.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- libvorbis.spec 25 Jul 2009 08:53:44 -0000 1.39 +++ libvorbis.spec 2 Nov 2009 14:12:13 -0000 1.40 @@ -9,6 +9,8 @@ URL: http://www.xiph.org/ Source: http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel >= 2:1.1 +Patch0: r16326.diff +Patch1: r16597.diff %description Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free, @@ -40,6 +42,8 @@ Documentation for developing application %prep %setup -q +%patch0 -p1 +%patch1 -p1 sed -i "s/-O20/$RPM_OPT_FLAGS/" configure sed -i "s/-ffast-math//" configure @@ -82,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Mon Nov 2 2009 Jindrich Novy 1.2.3-3 +- backport patches to fix CVE-2009-3379 (#531765) from upstream + * Sat Jul 25 2009 Fedora Release Engineering - 1:1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From jnovy at fedoraproject.org Mon Nov 2 14:27:36 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Mon, 2 Nov 2009 14:27:36 +0000 (UTC) Subject: rpms/libvorbis/F-12 r16326.diff, NONE, 1.1 r16597.diff, NONE, 1.1 libvorbis.spec, 1.39, 1.40 Message-ID: <20091102142736.C55EB11C0086@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/libvorbis/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29122 Modified Files: libvorbis.spec Added Files: r16326.diff r16597.diff Log Message: * Mon Nov 2 2009 Jindrich Novy 1.2.3-3 - backport patches to fix CVE-2009-3379 (#531765) from upstream r16326.diff: backends.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE r16326.diff --- diff -up libvorbis-1.2.3/lib/backends.h.r16326 libvorbis-1.2.3/lib/backends.h --- libvorbis-1.2.3/lib/backends.h.r16326 2009-07-09 11:12:08.000000000 +0200 +++ libvorbis-1.2.3/lib/backends.h 2009-11-02 14:55:42.000000000 +0100 @@ -111,7 +111,7 @@ typedef struct vorbis_info_residue0{ int partitions; /* possible codebooks for a partition */ int groupbook; /* huffbook for partitioning */ int secondstages[64]; /* expanded out to pointers in lookup */ - int booklist[256]; /* list of second stage books */ + int booklist[512]; /* list of second stage books */ const float classmetric1[64]; const float classmetric2[64]; r16597.diff: codebook.c | 1 + 1 file changed, 1 insertion(+) --- NEW FILE r16597.diff --- diff -up libvorbis-1.2.3/lib/codebook.c.r16597 libvorbis-1.2.3/lib/codebook.c --- libvorbis-1.2.3/lib/codebook.c.r16597 2009-07-09 11:12:08.000000000 +0200 +++ libvorbis-1.2.3/lib/codebook.c 2009-11-02 14:51:15.000000000 +0100 @@ -198,6 +198,7 @@ int vorbis_staticbook_unpack(oggpack_buf for(i=0;ientries;){ long num=oggpack_read(opb,_ilog(s->entries-i)); if(num==-1)goto _eofout; + if(length>32)goto _errout; for(j=0;jentries;j++,i++) s->lengthlist[i]=length; length++; Index: libvorbis.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvorbis/F-12/libvorbis.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- libvorbis.spec 25 Jul 2009 08:53:44 -0000 1.39 +++ libvorbis.spec 2 Nov 2009 14:27:36 -0000 1.40 @@ -9,6 +9,8 @@ URL: http://www.xiph.org/ Source: http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel >= 2:1.1 +Patch0: r16326.diff +Patch1: r16597.diff %description Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free, @@ -40,6 +42,8 @@ Documentation for developing application %prep %setup -q +%patch0 -p1 +%patch1 -p1 sed -i "s/-O20/$RPM_OPT_FLAGS/" configure sed -i "s/-ffast-math//" configure @@ -82,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Mon Nov 2 2009 Jindrich Novy 1.2.3-3 +- backport patches to fix CVE-2009-3379 (#531765) from upstream + * Sat Jul 25 2009 Fedora Release Engineering - 1:1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From jnovy at fedoraproject.org Mon Nov 2 14:31:45 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Mon, 2 Nov 2009 14:31:45 +0000 (UTC) Subject: rpms/libvorbis/F-12 libvorbis.spec,1.40,1.41 Message-ID: <20091102143145.619D311C02BC@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/libvorbis/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30190 Modified Files: libvorbis.spec Log Message: - release++ Index: libvorbis.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvorbis/F-12/libvorbis.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- libvorbis.spec 2 Nov 2009 14:27:36 -0000 1.40 +++ libvorbis.spec 2 Nov 2009 14:31:45 -0000 1.41 @@ -1,7 +1,7 @@ Summary: The Vorbis General Audio Compression Codec. Name: libvorbis Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: System Environment/Libraries License: BSD From rrakus at fedoraproject.org Mon Nov 2 14:40:39 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Mon, 2 Nov 2009 14:40:39 +0000 (UTC) Subject: rpms/PyXML/F-11 PyXML.spec,1.37,1.38 Message-ID: <20091102144039.0B47C11C0418@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/PyXML/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv457 Modified Files: PyXML.spec Log Message: Use system expat library Index: PyXML.spec =================================================================== RCS file: /cvs/extras/rpms/PyXML/F-11/PyXML.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- PyXML.spec 30 Oct 2009 15:00:44 -0000 1.37 +++ PyXML.spec 2 Nov 2009 14:40:36 -0000 1.38 @@ -1,19 +1,18 @@ Summary: XML libraries for python Name: PyXML Version: 0.8.4 -Release: 15%{?dist} +Release: 16%{?dist} Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz Patch0: PyXML-0.7.1-intern.patch Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch Patch2: PyXML-memmove.patch Patch3: PyXML-0.8.4-python2.6.patch -Patch4: PyXML-0.8.4-buffer-over-read.patch License: MIT and Python and ZPLv1.0 and BSD Group: Development/Libraries Requires: python URL: http://pyxml.sourceforge.net/ -BuildRequires: python python-devel +BuildRequires: python python-devel expat-devel BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot # Must have setuptools to build the package @@ -44,10 +43,12 @@ programming interfaces and an interface %patch1 -p1 -b .python2.4-backport %patch2 -p1 %patch3 -p1 -%patch4 -p1 -b .buffer_over_read %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build --with-xslt +# build PyXML with system expat +# Make sure we don't use local one +rm -rf extensions/expat +CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build --with-xslt --with-libexpat=%{_usr} %install rm -fr $RPM_BUILD_ROOT @@ -65,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python?.?/site-packages/_xmlplus %changelog +* Mon Nov 02 2009 Roman Rakus - 0.8.4-16 +- Use system expat library + * Fri Oct 30 2009 Roman Rakus - 0.8.4-15 - Fix buffer over read From cwickert at fedoraproject.org Mon Nov 2 14:49:07 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Mon, 2 Nov 2009 14:49:07 +0000 (UTC) Subject: rpms/xfce4-power-manager/F-11 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xfce4-power-manager.spec, 1.14, 1.15 xfce4-power-manager-0.8.2-dpmsconst.patch, 1.1, NONE Message-ID: <20091102144907.37F4E11C0086@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/xfce4-power-manager/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2601 Modified Files: .cvsignore sources xfce4-power-manager.spec Removed Files: xfce4-power-manager-0.8.2-dpmsconst.patch Log Message: * Mon Nov 02 2009 Christoph Wickert - 0.8.4.1-1 - Update to 0.8.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- .cvsignore 29 Sep 2009 10:59:49 -0000 1.12 +++ .cvsignore 2 Nov 2009 14:49:05 -0000 1.13 @@ -1 +1 @@ -xfce4-power-manager-0.8.4.tar.bz2 +xfce4-power-manager-0.8.4.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 29 Sep 2009 10:59:49 -0000 1.12 +++ sources 2 Nov 2009 14:49:05 -0000 1.13 @@ -1 +1 @@ -324be9320d8fae2b91a6111830465b0d xfce4-power-manager-0.8.4.tar.bz2 +ddb9bc27e34572c125ec008759a7bbad xfce4-power-manager-0.8.4.1.tar.bz2 Index: xfce4-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/xfce4-power-manager.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- xfce4-power-manager.spec 29 Sep 2009 10:59:49 -0000 1.14 +++ xfce4-power-manager.spec 2 Nov 2009 14:49:06 -0000 1.15 @@ -1,5 +1,5 @@ Name: xfce4-power-manager -Version: 0.8.4 +Version: 0.8.4.1 Release: 1%{?dist} Summary: Power management for the Xfce desktop environment @@ -7,7 +7,6 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} Source0: http://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2 -Patch0: %{name}-0.8.2-dpmsconst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfconf-devel >= 4.6.0 @@ -30,9 +29,6 @@ preferences. %prep %setup -q -%if 0%{?fedora} >= 12 -%patch0 -b .dpmsstr -%endif %build %configure @@ -84,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %changelog +* Mon Nov 02 2009 Christoph Wickert - 0.8.4.1-1 +- Update to 0.8.4.1 + * Tue Sep 29 2009 Christoph Wickert - 0.8.4-1 - Update to 0.8.4 - Drop xfpm_session_set_client_id patch, fixed upstream --- xfce4-power-manager-0.8.2-dpmsconst.patch DELETED --- From ltinkl at fedoraproject.org Mon Nov 2 14:55:20 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 14:55:20 +0000 (UTC) Subject: rpms/kdelibs3/F-10 kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch, NONE, 1.1 kdelibs3.spec, 1.45, 1.46 Message-ID: <20091102145520.9A95111C0086@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs3/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3933/F-10 Modified Files: kdelibs3.spec Added Files: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch Log Message: fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015) kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch: xmlhttprequest.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) --- NEW FILE kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch --- Index: xmlhttprequest.cpp =================================================================== --- khtml/ecma/xmlhttprequest.cpp (revision 954808) +++ khtml/ecma/xmlhttprequest.cpp (working copy) @@ -342,17 +342,17 @@ { aborted = false; + const QString protocol = url.protocol().lower(); + // Abandon the request when the protocol is other than "http", + // instead of blindly doing a KIO::get on other protocols like file:/. + if (!protocol.startsWith("http") && !protocol.startsWith("webdav")) + { + abort(); + return; + } + if (method == "post") { - QString protocol = url.protocol().lower(); - // Abondon the request when the protocol is other than "http", - // instead of blindly changing it to a "get" request. - if (!protocol.startsWith("http") && !protocol.startsWith("webdav")) - { - abort(); - return; - } - // FIXME: determine post encoding correctly by looking in headers // for charset. QByteArray buf; @@ -763,11 +763,11 @@ if (obj.isValid() && obj.inherits(&DOMDocument::info)) { DOM::Node docNode = static_cast(obj.imp())->toNode(); DOM::DocumentImpl *doc = static_cast(docNode.handle()); - + try { body = doc->toString().string(); // FIXME: also need to set content type, including encoding! - + } catch(DOM::DOMException& e) { Object err = Error::create(exec, GeneralError, "Exception serializing document"); exec->setException(err); Index: kdelibs3.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs3/F-10/kdelibs3.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- kdelibs3.spec 6 Sep 2009 02:53:35 -0000 1.45 +++ kdelibs3.spec 2 Nov 2009 14:55:18 -0000 1.46 @@ -36,7 +36,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.10 -Release: 13%{?dist}.1 +Release: 14%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -110,6 +110,8 @@ Patch203: kdelibs-3.5.4-CVE-2009-1690.pa Patch204: kdelibs-3.5.10-cve-2009-1698.patch # fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName Patch205: kdelibs-3.5.10-CVE-2009-2702.patch +#?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs +Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch #{?arts:Requires: arts >= %{arts_ev}} #Requires: %{qt3} >= %{qt3_ev} @@ -292,6 +294,7 @@ format for easy browsing %patch203 -p1 -b .cve-2009-1690 %patch204 -p1 -b .cve-2009-1698 %patch205 -p1 -b .cve-2009-2702 +%patch206 -p0 -b .oCERT-2009-015-xmlhttprequest sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h @@ -643,6 +646,9 @@ touch --no-create %{_datadir}/icons/crys %changelog +* Mon Nov 2 2009 Luk?? Tinkl - 3.5.10-14 +- fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428 + * Sun Sep 06 2009 Kevin Kofler - 3.5.10-13.1 - fix for CVE-2009-2702 From ltinkl at fedoraproject.org Mon Nov 2 14:55:22 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 14:55:22 +0000 (UTC) Subject: rpms/kdelibs3/F-11 kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch, NONE, 1.1 kdelibs3.spec, 1.63, 1.64 Message-ID: <20091102145522.B287011C0086@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs3/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3933/F-11 Modified Files: kdelibs3.spec Added Files: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch Log Message: fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015) kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch: xmlhttprequest.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) --- NEW FILE kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch --- Index: xmlhttprequest.cpp =================================================================== --- khtml/ecma/xmlhttprequest.cpp (revision 954808) +++ khtml/ecma/xmlhttprequest.cpp (working copy) @@ -342,17 +342,17 @@ { aborted = false; + const QString protocol = url.protocol().lower(); + // Abandon the request when the protocol is other than "http", + // instead of blindly doing a KIO::get on other protocols like file:/. + if (!protocol.startsWith("http") && !protocol.startsWith("webdav")) + { + abort(); + return; + } + if (method == "post") { - QString protocol = url.protocol().lower(); - // Abondon the request when the protocol is other than "http", - // instead of blindly changing it to a "get" request. - if (!protocol.startsWith("http") && !protocol.startsWith("webdav")) - { - abort(); - return; - } - // FIXME: determine post encoding correctly by looking in headers // for charset. QByteArray buf; @@ -763,11 +763,11 @@ if (obj.isValid() && obj.inherits(&DOMDocument::info)) { DOM::Node docNode = static_cast(obj.imp())->toNode(); DOM::DocumentImpl *doc = static_cast(docNode.handle()); - + try { body = doc->toString().string(); // FIXME: also need to set content type, including encoding! - + } catch(DOM::DOMException& e) { Object err = Error::create(exec, GeneralError, "Exception serializing document"); exec->setException(err); Index: kdelibs3.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs3/F-11/kdelibs3.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- kdelibs3.spec 6 Sep 2009 02:53:36 -0000 1.63 +++ kdelibs3.spec 2 Nov 2009 14:55:21 -0000 1.64 @@ -36,7 +36,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.10 -Release: 13%{?dist}.1 +Release: 14%{?dist} %if 0%{?fedora} > 8 Name: kdelibs3 @@ -110,6 +110,8 @@ Patch203: kdelibs-3.5.4-CVE-2009-1690.pa Patch204: kdelibs-3.5.10-cve-2009-1698.patch # fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName Patch205: kdelibs-3.5.10-CVE-2009-2702.patch +#?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs +Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch #{?arts:Requires: arts >= %{arts_ev}} #Requires: %{qt3} >= %{qt3_ev} @@ -292,6 +294,7 @@ format for easy browsing %patch203 -p1 -b .cve-2009-1690 %patch204 -p1 -b .cve-2009-1698 %patch205 -p1 -b .cve-2009-2702 +%patch206 -p0 -b .oCERT-2009-015-xmlhttprequest sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h @@ -643,6 +646,9 @@ touch --no-create %{_datadir}/icons/crys %changelog +* Mon Nov 2 2009 Luk?? Tinkl - 3.5.10-14 +- fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428 + * Sun Sep 06 2009 Kevin Kofler - 3.5.10-13.1 - fix for CVE-2009-2702 From ltinkl at fedoraproject.org Mon Nov 2 14:55:24 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 14:55:24 +0000 (UTC) Subject: rpms/kdelibs3/F-12 kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch, NONE, 1.1 kdelibs3.spec, 1.75, 1.76 Message-ID: <20091102145524.A069511C0086@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs3/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3933/F-12 Modified Files: kdelibs3.spec Added Files: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch Log Message: fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015) kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch: xmlhttprequest.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) --- NEW FILE kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch --- Index: xmlhttprequest.cpp =================================================================== --- khtml/ecma/xmlhttprequest.cpp (revision 954808) +++ khtml/ecma/xmlhttprequest.cpp (working copy) @@ -342,17 +342,17 @@ { aborted = false; + const QString protocol = url.protocol().lower(); + // Abandon the request when the protocol is other than "http", + // instead of blindly doing a KIO::get on other protocols like file:/. + if (!protocol.startsWith("http") && !protocol.startsWith("webdav")) + { + abort(); + return; + } + if (method == "post") { - QString protocol = url.protocol().lower(); - // Abondon the request when the protocol is other than "http", - // instead of blindly changing it to a "get" request. - if (!protocol.startsWith("http") && !protocol.startsWith("webdav")) - { - abort(); - return; - } - // FIXME: determine post encoding correctly by looking in headers // for charset. QByteArray buf; @@ -763,11 +763,11 @@ if (obj.isValid() && obj.inherits(&DOMDocument::info)) { DOM::Node docNode = static_cast(obj.imp())->toNode(); DOM::DocumentImpl *doc = static_cast(docNode.handle()); - + try { body = doc->toString().string(); // FIXME: also need to set content type, including encoding! - + } catch(DOM::DOMException& e) { Object err = Error::create(exec, GeneralError, "Exception serializing document"); exec->setException(err); Index: kdelibs3.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs3/F-12/kdelibs3.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -p -r1.75 -r1.76 --- kdelibs3.spec 28 Sep 2009 22:47:21 -0000 1.75 +++ kdelibs3.spec 2 Nov 2009 14:55:22 -0000 1.76 @@ -27,7 +27,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.10 -Release: 19%{?dist} +Release: 20%{?dist} Name: kdelibs3 Obsoletes: kdelibs < 6:%{version}-%{release} @@ -95,6 +95,8 @@ Patch203: kdelibs-3.5.4-CVE-2009-1690.pa Patch204: kdelibs-3.5.10-cve-2009-1698.patch # fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName Patch205: kdelibs-3.5.10-CVE-2009-2702.patch +#?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs +Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch Requires: hicolor-icon-theme %if %{kde_settings} @@ -246,6 +248,7 @@ format for easy browsing %patch203 -p1 -b .cve-2009-1690 %patch204 -p1 -b .cve-2009-1698 %patch205 -p1 -b .cve-2009-2702 +%patch206 -p0 -b .oCERT-2009-015-xmlhttprequest sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h @@ -569,6 +572,9 @@ touch --no-create %{_datadir}/icons/crys %changelog +* Mon Nov 2 2009 Luk?? Tinkl - 3.5.10-20 +- fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428 + * Mon Sep 28 2009 Rex Dieter - 3.5.10-19 - Conflicts with kde-settings (#526109) From ltinkl at fedoraproject.org Mon Nov 2 14:55:25 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 14:55:25 +0000 (UTC) Subject: rpms/kdelibs3/devel kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch, NONE, 1.1 kdelibs3.spec, 1.75, 1.76 Message-ID: <20091102145525.D478311C0086@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs3/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3933/devel Modified Files: kdelibs3.spec Added Files: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch Log Message: fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015) kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch: xmlhttprequest.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) --- NEW FILE kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch --- Index: xmlhttprequest.cpp =================================================================== --- khtml/ecma/xmlhttprequest.cpp (revision 954808) +++ khtml/ecma/xmlhttprequest.cpp (working copy) @@ -342,17 +342,17 @@ { aborted = false; + const QString protocol = url.protocol().lower(); + // Abandon the request when the protocol is other than "http", + // instead of blindly doing a KIO::get on other protocols like file:/. + if (!protocol.startsWith("http") && !protocol.startsWith("webdav")) + { + abort(); + return; + } + if (method == "post") { - QString protocol = url.protocol().lower(); - // Abondon the request when the protocol is other than "http", - // instead of blindly changing it to a "get" request. - if (!protocol.startsWith("http") && !protocol.startsWith("webdav")) - { - abort(); - return; - } - // FIXME: determine post encoding correctly by looking in headers // for charset. QByteArray buf; @@ -763,11 +763,11 @@ if (obj.isValid() && obj.inherits(&DOMDocument::info)) { DOM::Node docNode = static_cast(obj.imp())->toNode(); DOM::DocumentImpl *doc = static_cast(docNode.handle()); - + try { body = doc->toString().string(); // FIXME: also need to set content type, including encoding! - + } catch(DOM::DOMException& e) { Object err = Error::create(exec, GeneralError, "Exception serializing document"); exec->setException(err); Index: kdelibs3.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -p -r1.75 -r1.76 --- kdelibs3.spec 28 Sep 2009 22:47:21 -0000 1.75 +++ kdelibs3.spec 2 Nov 2009 14:55:24 -0000 1.76 @@ -27,7 +27,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.10 -Release: 19%{?dist} +Release: 20%{?dist} Name: kdelibs3 Obsoletes: kdelibs < 6:%{version}-%{release} @@ -95,6 +95,8 @@ Patch203: kdelibs-3.5.4-CVE-2009-1690.pa Patch204: kdelibs-3.5.10-cve-2009-1698.patch # fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName Patch205: kdelibs-3.5.10-CVE-2009-2702.patch +#?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs +Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch Requires: hicolor-icon-theme %if %{kde_settings} @@ -246,6 +248,7 @@ format for easy browsing %patch203 -p1 -b .cve-2009-1690 %patch204 -p1 -b .cve-2009-1698 %patch205 -p1 -b .cve-2009-2702 +%patch206 -p0 -b .oCERT-2009-015-xmlhttprequest sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h @@ -569,6 +572,9 @@ touch --no-create %{_datadir}/icons/crys %changelog +* Mon Nov 2 2009 Luk?? Tinkl - 3.5.10-20 +- fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428 + * Mon Sep 28 2009 Rex Dieter - 3.5.10-19 - Conflicts with kde-settings (#526109) From jnovy at fedoraproject.org Mon Nov 2 14:55:42 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Mon, 2 Nov 2009 14:55:42 +0000 (UTC) Subject: rpms/libvorbis/devel libvorbis.spec,1.40,1.41 Message-ID: <20091102145542.B240C11C0086@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/libvorbis/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4220 Modified Files: libvorbis.spec Log Message: - release++, rebuild Index: libvorbis.spec =================================================================== RCS file: /cvs/pkgs/rpms/libvorbis/devel/libvorbis.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- libvorbis.spec 2 Nov 2009 14:12:13 -0000 1.40 +++ libvorbis.spec 2 Nov 2009 14:55:40 -0000 1.41 @@ -1,7 +1,7 @@ Summary: The Vorbis General Audio Compression Codec. Name: libvorbis Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Group: System Environment/Libraries License: BSD From hadess at fedoraproject.org Mon Nov 2 14:57:15 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Nov 2009 14:57:15 +0000 (UTC) Subject: rpms/bluez/devel bluez.spec,1.102,1.103 Message-ID: <20091102145715.A0C4111C0086@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4646 Modified Files: bluez.spec Log Message: * Mon Nov 02 2009 Bastien Nocera 4.57-2 - Move the rfcomm.conf to the compat package, otherwise the comments at the top of it are confusing Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -p -r1.102 -r1.103 --- bluez.spec 31 Oct 2009 17:04:57 -0000 1.102 +++ bluez.spec 2 Nov 2009 14:57:15 -0000 1.103 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.57 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -225,7 +225,7 @@ fi %{_mandir}/man1/* %{_mandir}/man8/* %dir %{_sysconfdir}/bluetooth/ -%config(noreplace) %{_sysconfdir}/bluetooth/* +%config(noreplace) %{_sysconfdir}/bluetooth/main.conf %config(noreplace) %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf %{_libdir}/bluetooth/ @@ -265,6 +265,7 @@ fi %{_bindir}/dund %{_bindir}/pand %{_bindir}/hidd +%config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf %{_sysconfdir}/rc.d/init.d/dund %{_sysconfdir}/rc.d/init.d/rfcomm %{_sysconfdir}/rc.d/init.d/pand @@ -272,6 +273,10 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/pand %changelog +* Mon Nov 02 2009 Bastien Nocera 4.57-2 +- Move the rfcomm.conf to the compat package, otherwise + the comments at the top of it are confusing + * Sat Oct 31 2009 Bastien Nocera 4.57-1 - Update to 4.57 From rrakus at fedoraproject.org Mon Nov 2 15:03:46 2009 From: rrakus at fedoraproject.org (Roman Rakus) Date: Mon, 2 Nov 2009 15:03:46 +0000 (UTC) Subject: rpms/PyXML/F-12 PyXML.spec,1.38,1.39 Message-ID: <20091102150346.39ABF11C0265@cvs1.fedora.phx.redhat.com> Author: rrakus Update of /cvs/extras/rpms/PyXML/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6497 Modified Files: PyXML.spec Log Message: Use system expat library Index: PyXML.spec =================================================================== RCS file: /cvs/extras/rpms/PyXML/F-12/PyXML.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- PyXML.spec 30 Oct 2009 15:07:55 -0000 1.38 +++ PyXML.spec 2 Nov 2009 15:03:45 -0000 1.39 @@ -1,19 +1,18 @@ Summary: XML libraries for python Name: PyXML Version: 0.8.4 -Release: 16%{?dist} +Release: 17%{?dist} Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz Patch0: PyXML-0.7.1-intern.patch Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch Patch2: PyXML-memmove.patch Patch3: PyXML-0.8.4-python2.6.patch -Patch4: PyXML-0.8.4-buffer-over-read.patch License: MIT and Python and ZPLv1.0 and BSD Group: Development/Libraries Requires: python URL: http://pyxml.sourceforge.net/ -BuildRequires: python python-devel +BuildRequires: python python-devel expat-devel BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot # Must have setuptools to build the package @@ -44,10 +43,12 @@ programming interfaces and an interface %patch1 -p1 -b .python2.4-backport %patch2 -p1 %patch3 -p1 -%patch4 -p1 -b .buffer_over_read %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build --with-xslt +# build PyXML with system expat +# Make sure we don't use local one +rm -rf extensions/expat +CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build --with-xslt --with-libexpat=%{_usr} %install rm -fr $RPM_BUILD_ROOT @@ -65,7 +66,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python?.?/site-packages/_xmlplus %changelog -* Fri Oct 30 2009 Roman Rakus - 0.8.4-15 +* Mon Nov 02 2009 Roman Rakus - 0.8.4-17 +- Use system expat library + +* Fri Oct 30 2009 Roman Rakus - 0.8.4-16 - Fix buffer over read * Fri Jul 24 2009 Fedora Release Engineering - 0.8.4-15 From nucleo at fedoraproject.org Mon Nov 2 15:04:50 2009 From: nucleo at fedoraproject.org (nucleo) Date: Mon, 2 Nov 2009 15:04:50 +0000 (UTC) Subject: comps comps-f10.xml.in, 1.297, 1.298 comps-f11.xml.in, 1.331, 1.332 comps-f12.xml.in, 1.190, 1.191 comps-f13.xml.in, 1.77, 1.78 Message-ID: <20091102150450.585D811C01EA@cvs1.fedora.phx.redhat.com> Author: nucleo Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5034 Modified Files: comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in Log Message: Added socat, procinfo, p7zip-plugins to system-tools. Added qbittorrent to graphical-internet gtoup, xclip to base-x group. Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.297 retrieving revision 1.298 diff -u -p -r1.297 -r1.298 --- comps-f10.xml.in 2 Nov 2009 13:57:45 -0000 1.297 +++ comps-f10.xml.in 2 Nov 2009 15:04:48 -0000 1.298 @@ -351,6 +351,7 @@ uim-gtk2 vnc-server workrave + xclip xdaliclock xkeycaps xlockmore @@ -2261,6 +2262,7 @@ psi psimedia putty + qbittorrent rekonq seamonkey streamtuner @@ -4583,6 +4585,7 @@ oddjob p0f p7zip + p7zip-plugins pam_keyring par2cmdline pbzip2 @@ -4590,6 +4593,7 @@ powerman powertop prelude-manager + procinfo puppet pwgen qdbm @@ -4608,6 +4612,7 @@ smart smart-gui snort + socat stripesnoop swaks swatch Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.331 retrieving revision 1.332 diff -u -p -r1.331 -r1.332 --- comps-f11.xml.in 2 Nov 2009 13:57:46 -0000 1.331 +++ comps-f11.xml.in 2 Nov 2009 15:04:48 -0000 1.332 @@ -376,6 +376,7 @@ tigervnc-server uim-gtk2 workrave + xclip xdaliclock xguest xkeycaps @@ -2634,6 +2635,7 @@ psi psimedia putty + qbittorrent rekonq seamonkey streamtuner @@ -5305,6 +5307,7 @@ oddjob p0f p7zip + p7zip-plugins pam_keyring par2cmdline pbzip2 @@ -5312,6 +5315,7 @@ powerman powertop prelude-manager + procinfo puppet pwgen qdbm @@ -5330,6 +5334,7 @@ smart smart-gui snort + socat stripesnoop swaks swatch Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.190 retrieving revision 1.191 diff -u -p -r1.190 -r1.191 --- comps-f12.xml.in 2 Nov 2009 13:57:46 -0000 1.190 +++ comps-f12.xml.in 2 Nov 2009 15:04:48 -0000 1.191 @@ -394,6 +394,7 @@ tigervnc-server uim-gtk2 workrave + xclip xdaliclock xguest xkeycaps @@ -2827,6 +2828,7 @@ psi psimedia putty + qbittorrent rekonq seamonkey streamtuner @@ -5585,6 +5587,7 @@ oddjob p0f p7zip + p7zip-plugins PackageKit-command-not-found pam_keyring par2cmdline @@ -5593,6 +5596,7 @@ powerman powertop prelude-manager + procinfo puppet pwgen qdbm @@ -5611,6 +5615,7 @@ smart smart-gui snort + socat stripesnoop swaks swatch Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.77 retrieving revision 1.78 diff -u -p -r1.77 -r1.78 --- comps-f13.xml.in 2 Nov 2009 13:57:46 -0000 1.77 +++ comps-f13.xml.in 2 Nov 2009 15:04:48 -0000 1.78 @@ -393,6 +393,7 @@ tigervnc-server uim-gtk2 workrave + xclip xdaliclock xguest xkeycaps @@ -2825,6 +2826,7 @@ psi psimedia putty + qbittorrent rekonq seamonkey streamtuner @@ -5541,6 +5543,7 @@ oddjob p0f p7zip + p7zip-plugins PackageKit-command-not-found pam_keyring par2cmdline @@ -5549,6 +5552,7 @@ powerman powertop prelude-manager + procinfo puppet pwgen qdbm @@ -5567,6 +5571,7 @@ smart smart-gui snort + socat stripesnoop swaks swatch From hadess at fedoraproject.org Mon Nov 2 15:07:45 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Nov 2009 15:07:45 +0000 (UTC) Subject: rpms/bluez/F-12 bluez.spec,1.103,1.104 Message-ID: <20091102150745.3FB6E11C0086@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8425 Modified Files: bluez.spec Log Message: * Mon Nov 02 2009 Bastien Nocera 4.57-2 - Move the rfcomm.conf to the compat package, otherwise the comments at the top of it are confusing Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-12/bluez.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -p -r1.103 -r1.104 --- bluez.spec 1 Nov 2009 00:31:11 -0000 1.103 +++ bluez.spec 2 Nov 2009 15:07:44 -0000 1.104 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.57 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -225,7 +225,7 @@ fi %{_mandir}/man1/* %{_mandir}/man8/* %dir %{_sysconfdir}/bluetooth/ -%config(noreplace) %{_sysconfdir}/bluetooth/* +%config(noreplace) %{_sysconfdir}/bluetooth/main.conf %config(noreplace) %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf %{_libdir}/bluetooth/ @@ -265,6 +265,7 @@ fi %{_bindir}/dund %{_bindir}/pand %{_bindir}/hidd +%config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf %{_sysconfdir}/rc.d/init.d/dund %{_sysconfdir}/rc.d/init.d/rfcomm %{_sysconfdir}/rc.d/init.d/pand @@ -272,6 +273,10 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/pand %changelog +* Mon Nov 02 2009 Bastien Nocera 4.57-2 +- Move the rfcomm.conf to the compat package, otherwise + the comments at the top of it are confusing + * Sun Nov 01 2009 Bastien Nocera 4.57-1 - Update to 4.57 From hadess at fedoraproject.org Mon Nov 2 15:08:06 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Nov 2009 15:08:06 +0000 (UTC) Subject: rpms/bluez/F-11 bluez-4.42-update-hid2hci-rules.patch, NONE, 1.1 bluez.spec, 1.71, 1.72 bluez-correct-udev-dell-mouse-rules.patch, 1.1, NONE Message-ID: <20091102150806.A672711C0086@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8596 Modified Files: bluez.spec Added Files: bluez-4.42-update-hid2hci-rules.patch Removed Files: bluez-correct-udev-dell-mouse-rules.patch Log Message: * Mon Nov 02 2009 Bastien Nocera 4.42-8 - Update hid2hci code from udev master bluez-4.42-update-hid2hci-rules.patch: scripts/bluetooth-hid2hci.rules | 64 ++--- tools/hid2hci.c | 464 ++++++++++++++++++---------------------- 2 files changed, 247 insertions(+), 281 deletions(-) --- NEW FILE bluez-4.42-update-hid2hci-rules.patch --- diff -upr bluez-4.42/scripts/bluetooth-hid2hci.rules bluez-4.42.new/scripts/bluetooth-hid2hci.rules --- bluez-4.42/scripts/bluetooth-hid2hci.rules 2009-05-19 10:04:10.000000000 +0100 +++ bluez-4.42.new/scripts/bluetooth-hid2hci.rules 2009-10-09 13:01:58.000000000 +0100 @@ -1,36 +1,28 @@ -# Variety of Dell Bluetooth devices -# -# it looks like a bit of an odd rule, because it is matching -# on a mouse device that is self powered, but that is where -# a HID report needs to be sent to switch modes. -# -# Known supported devices: -# 413c:8154 -# 413c:8158 -# 413c:8162 -ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" - -# Logitech devices -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c703" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c704" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c705" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c70a" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c70b" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c70c" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c70e" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c713" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c714" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c71b" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c71c" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" - -# CSR devices (in HID mode) -ACTION=="add", ENV{ID_VENDOR}=="0a12", ENV{ID_MODEL}=="1000" RUN+="/usr/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="0458", ENV{ID_MODEL}=="1000" RUN+="/usr/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -ACTION=="add", ENV{ID_VENDOR}=="05ac", ENV{ID_MODEL}=="1000" RUN+="/usr/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" - -# CSR devices (in HCI mode) -#ACTION=="add", ENV{ID_VENDOR}=="0a12", ENV{ID_MODEL}=="0001" RUN+="/usr/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hid" -#ACTION=="add", ENV{ID_VENDOR}=="0458", ENV{ID_MODEL}=="003f" RUN+="/usr/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hid" -#ACTION=="add", ENV{ID_VENDOR}=="05ac", ENV{ID_MODEL}=="8203" RUN+="/usr/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hid" -#ACTION=="add", ENV{ID_VENDOR}=="05ac", ENV{ID_MODEL}=="8204" RUN+="/usr/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hid" -#ACTION=="add", ENV{ID_VENDOR}=="05ac", ENV{ID_MODEL}=="8207" RUN+="/usr/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hid" +# do not edit this file, it will be overwritten on update + +ACTION!="add|change", GOTO="hid2hci_end" +SUBSYSTEM!="usb", GOTO="hid2hci_end" + +# Variety of Dell Bluetooth devices - match on a mouse device that is +# self powered and where a HID report needs to be sent to switch modes +# Known supported devices: 413c:8154, 413c:8158, 413c:8162 +ATTR{bInterfaceClass}=="03", ATTR{bInterfaceSubClass}=="01", ATTR{bInterfaceProtocol}=="02", \ + ATTRS{bDeviceClass}=="00", ATTRS{idVendor}=="413c", ATTRS{bmAttributes}=="e0", \ + RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1" + +# Logitech devices (hidraw) +KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \ + RUN+="hid2hci --method=logitech-hid --devpath=%p" + +ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end" + +# When a Dell device recovers from S3, the mouse child needs to be repoked +# Unfortunately the only event seen is the BT device disappearing, so the mouse +# device needs to be chased down on the USB bus. +ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \ + ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" + +# CSR devices +ATTR{idVendor}=="0a12|0458|05ac", ATTR{idProduct}=="1000", RUN+="hid2hci --method=csr --devpath=%p" + +LABEL="hid2hci_end" diff -upr bluez-4.42/tools/hid2hci.c bluez-4.42.new/tools/hid2hci.c --- bluez-4.42/tools/hid2hci.c 2009-05-19 10:04:10.000000000 +0100 +++ bluez-4.42.new/tools/hid2hci.c 2009-10-09 13:01:58.000000000 +0100 @@ -1,30 +1,26 @@ /* + * hid2hci : switch the radio on devices that support + * it from HID to HCI and back * - * BlueZ - Bluetooth protocol stack for Linux + * Copyright (C) 2003-2009 Marcel Holtmann + * Copyright (C) 2008-2009 Mario Limonciello + * Copyright (C) 2009 Kay Sievers * - * Copyright (C) 2003-2009 Marcel Holtmann + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifdef HAVE_CONFIG_H -#include -#endif - #include #include #include @@ -32,79 +28,24 @@ #include #include #include - +#include #include -#ifdef NEED_USB_GET_BUSSES -static inline struct usb_bus *usb_get_busses(void) -{ - return usb_busses; -} -#endif - -#ifndef USB_DIR_OUT -#define USB_DIR_OUT 0x00 -#endif - -static char devpath[PATH_MAX + 1] = "/dev"; - -struct hiddev_devinfo { - unsigned int bustype; - unsigned int busnum; - unsigned int devnum; - unsigned int ifnum; - short vendor; - short product; - short version; - unsigned num_applications; -}; - -struct hiddev_report_info { - unsigned report_type; - unsigned report_id; - unsigned num_fields; -}; - -typedef __signed__ int __s32; +#include "libudev.h" +#include "libudev-private.h" -struct hiddev_usage_ref { - unsigned report_type; - unsigned report_id; - unsigned field_index; - unsigned usage_index; - unsigned usage_code; - __s32 value; +enum mode { + HCI = 0, + HID = 1, }; -#define HIDIOCGDEVINFO _IOR('H', 0x03, struct hiddev_devinfo) -#define HIDIOCINITREPORT _IO('H', 0x05) -#define HIDIOCSREPORT _IOW('H', 0x08, struct hiddev_report_info) -#define HIDIOCSUSAGE _IOW('H', 0x0C, struct hiddev_usage_ref) - -#define HID_REPORT_TYPE_OUTPUT 2 - -#define HCI 0 -#define HID 1 - -struct device_info { - struct usb_device *dev; - int mode; - uint16_t vendor; - uint16_t product; -}; - -static int switch_csr(struct device_info *devinfo) +static int usb_switch_csr(struct usb_dev_handle *dev, enum mode mode) { - struct usb_dev_handle *udev; int err; - udev = usb_open(devinfo->dev); - if (!udev) - return -errno; - - err = usb_control_msg(udev, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0, devinfo->mode, 0, NULL, 0, 10000); - + err = usb_control_msg(dev, + USB_ENDPOINT_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, + 0, mode, 0, NULL, 0, 10000); if (err == 0) { err = -1; errno = EALREADY; @@ -112,13 +53,10 @@ static int switch_csr(struct device_info if (errno == ETIMEDOUT) err = 0; } - - usb_close(udev); - return err; } -static int send_report(int fd, const char *buf, size_t size) +static int hid_logitech_send_report(int fd, const char *buf, size_t size) { struct hiddev_report_info rinfo; struct hiddev_usage_ref uref; @@ -147,72 +85,42 @@ static int send_report(int fd, const cha return err; } -static int switch_logitech(struct device_info *devinfo) +static int hid_switch_logitech(const char *filename) { - char devname[PATH_MAX + 1]; - int i, fd, err = -1; - - for (i = 0; i < 16; i++) { - struct hiddev_devinfo dinfo; - char rep1[] = { 0xff, 0x80, 0x80, 0x01, 0x00, 0x00 }; - char rep2[] = { 0xff, 0x80, 0x00, 0x00, 0x30, 0x00 }; - char rep3[] = { 0xff, 0x81, 0x80, 0x00, 0x00, 0x00 }; - - sprintf(devname, "%s/hiddev%d", devpath, i); - fd = open(devname, O_RDWR); - if (fd < 0) { - sprintf(devname, "%s/usb/hiddev%d", devpath, i); - fd = open(devname, O_RDWR); - if (fd < 0) { - sprintf(devname, "%s/usb/hid/hiddev%d", devpath, i); - fd = open(devname, O_RDWR); - if (fd < 0) - continue; - } - } - - memset(&dinfo, 0, sizeof(dinfo)); - err = ioctl(fd, HIDIOCGDEVINFO, &dinfo); - if (err < 0 || (int) dinfo.busnum != atoi(devinfo->dev->bus->dirname) || - (int) dinfo.devnum != atoi(devinfo->dev->filename)) { - close(fd); - continue; - } - - err = ioctl(fd, HIDIOCINITREPORT, 0); - if (err < 0) { - close(fd); - break; - } - - err = send_report(fd, rep1, sizeof(rep1)); - if (err < 0) { - close(fd); - break; - } - - err = send_report(fd, rep2, sizeof(rep2)); - if (err < 0) { - close(fd); - break; - } - - err = send_report(fd, rep3, sizeof(rep3)); - close(fd); - break; - } - + char rep1[] = { 0xff, 0x80, 0x80, 0x01, 0x00, 0x00 }; + char rep2[] = { 0xff, 0x80, 0x00, 0x00, 0x30, 0x00 }; + char rep3[] = { 0xff, 0x81, 0x80, 0x00, 0x00, 0x00 }; + int fd; + int err = -1; + + fd = open(filename, O_RDWR); + if (fd < 0) + return err; + + err = ioctl(fd, HIDIOCINITREPORT, 0); + if (err < 0) + goto out; + + err = hid_logitech_send_report(fd, rep1, sizeof(rep1)); + if (err < 0) + goto out; + + err = hid_logitech_send_report(fd, rep2, sizeof(rep2)); + if (err < 0) + goto out; + + err = hid_logitech_send_report(fd, rep3, sizeof(rep3)); +out: + close(fd); return err; } -static int switch_dell(struct device_info *devinfo) +static int usb_switch_dell(struct usb_dev_handle *dev, enum mode mode) { char report[] = { 0x7f, 0x00, 0x00, 0x00 }; - - struct usb_dev_handle *handle; int err; - switch (devinfo->mode) { + switch (mode) { case HCI: report[1] = 0x13; break; @@ -221,22 +129,16 @@ static int switch_dell(struct device_inf break; } - handle = usb_open(devinfo->dev); - if (!handle) - return -EIO; - /* Don't need to check return, as might not be in use */ - usb_detach_kernel_driver_np(handle, 0); + usb_detach_kernel_driver_np(dev, 0); - if (usb_claim_interface(handle, 0) < 0) { - usb_close(handle); + if (usb_claim_interface(dev, 0) < 0) return -EIO; - } - err = usb_control_msg(handle, - USB_ENDPOINT_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, + err = usb_control_msg(dev, + USB_ENDPOINT_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, USB_REQ_SET_CONFIGURATION, 0x7f | (0x03 << 8), 0, - report, sizeof(report), 5000); + report, sizeof(report), 5000); if (err == 0) { err = -1; @@ -245,131 +147,203 @@ static int switch_dell(struct device_inf if (errno == ETIMEDOUT) err = 0; } - - usb_close(handle); - return err; } -static int find_device(struct device_info* devinfo) +/* + * The braindead libusb needs to scan and open all devices, just to + * to find the device we already have. This needs to be fixed in libusb + * or it will be ripped out and we carry our own code. + */ +static struct usb_device *usb_device_open_from_udev(struct udev_device *usb_dev) { struct usb_bus *bus; - struct usb_device *dev; + const char *str; + int busnum; + int devnum; + + str = udev_device_get_sysattr_value(usb_dev, "busnum"); + if (str == NULL) + return NULL; + busnum = strtol(str, NULL, 0); + + str = udev_device_get_sysattr_value(usb_dev, "devnum"); + if (str == NULL) + return NULL; + devnum = strtol(str, NULL, 0); + usb_init(); usb_find_busses(); usb_find_devices(); - for (bus = usb_get_busses(); bus; bus = bus->next) + for (bus = usb_get_busses(); bus; bus = bus->next) { + struct usb_device *dev; + + if (strtol(bus->dirname, NULL, 10) != busnum) + continue; + for (dev = bus->devices; dev; dev = dev->next) { - if (dev->descriptor.idVendor == devinfo->vendor && - dev->descriptor.idProduct == devinfo->product) { - devinfo->dev=dev; - return 1; - } + if (dev->devnum == devnum) + return dev; } - return 0; + } + + return NULL; } -static void usage(char* error) +static struct usb_dev_handle *find_device(struct udev_device *udev_dev) +{ + struct usb_device *dev; + + dev = usb_device_open_from_udev(udev_dev); + if (dev == NULL) + return NULL; + return usb_open(dev); +} + +static void usage(const char *error) { if (error) fprintf(stderr,"\n%s\n", error); else printf("hid2hci - Bluetooth HID to HCI mode switching utility\n\n"); - printf("Usage:\n" - "\thid2hci [options]\n" - "\n"); - - printf("Options:\n" - "\t-h, --help Display help\n" - "\t-q, --quiet Don't display any messages\n" - "\t-r, --mode= Mode to switch to [hid, hci]\n" - "\t-v, --vendor= Vendor ID to act upon\n" - "\t-p, --product= Product ID to act upon\n" - "\t-m, --method= Method to use to switch [csr, logitech, dell]\n" - "\n"); - if (error) - exit(1); + printf("Usage: hid2hci [options]\n" + " --mode= mode to switch to [hid|hci] (default hci)\n" + " --devpath= sys device path\n" + " --method= method to use to switch [csr|logitech-hid|dell]\n" + " --help\n\n"); } -static struct option main_options[] = { - { "help", no_argument, 0, 'h' }, - { "quiet", no_argument, 0, 'q' }, - { "mode", required_argument, 0, 'r' }, - { "vendor", required_argument, 0, 'v' }, - { "product", required_argument, 0, 'p' }, - { "method", required_argument, 0, 'm' }, - { 0, 0, 0, 0 } -}; - int main(int argc, char *argv[]) { - struct device_info dev = { NULL, HCI, 0, 0 }; - int opt, quiet = 0; - int (*method)(struct device_info *dev) = NULL; - - while ((opt = getopt_long(argc, argv, "+r:v:p:m:qh", main_options, NULL)) != -1) { - switch (opt) { - case 'r': - if (optarg && !strcmp(optarg, "hid")) - dev.mode = HID; - else if (optarg && !strcmp(optarg, "hci")) - dev.mode = HCI; - else - usage("ERROR: Undefined radio mode\n"); + static const struct option options[] = { + { "help", no_argument, NULL, 'h' }, + { "mode", required_argument, NULL, 'm' }, + { "devpath", required_argument, NULL, 'p' }, + { "method", required_argument, NULL, 'M' }, + { } + }; + enum method { + METHOD_UNDEF, + METHOD_CSR, + METHOD_LOGITECH_HID, + METHOD_DELL, + } method = METHOD_UNDEF; + struct udev *udev; + struct udev_device *udev_dev = NULL; + char syspath[UTIL_PATH_SIZE]; + int (*usb_switch)(struct usb_dev_handle *dev, enum mode mode) = NULL; + enum mode mode = HCI; + const char *devpath = NULL; + int err = -1; + int rc = 1; + + for (;;) { + int option; + + option = getopt_long(argc, argv, "m:p:M:qh", options, NULL); + if (option == -1) break; - case 'v': - sscanf(optarg, "%4hx", &dev.vendor); + + switch (option) { + case 'm': + if (!strcmp(optarg, "hid")) { + mode = HID; + } else if (!strcmp(optarg, "hci")) { + mode = HCI; + } else { + usage("error: undefined radio mode\n"); + exit(1); + } break; case 'p': - sscanf(optarg, "%4hx", &dev.product); + devpath = optarg; break; - case 'm': - if (optarg && !strcmp(optarg, "csr")) - method = switch_csr; - else if (optarg && !strcmp(optarg, "logitech")) - method = switch_logitech; - else if (optarg && !strcmp(optarg, "dell")) - method = switch_dell; - else - usage("ERROR: Undefined switching method\n"); - break; - case 'q': - quiet = 1; + case 'M': + if (!strcmp(optarg, "csr")) { + method = METHOD_CSR; + usb_switch = usb_switch_csr; + } else if (!strcmp(optarg, "logitech-hid")) { + method = METHOD_LOGITECH_HID; + } else if (!strcmp(optarg, "dell")) { + method = METHOD_DELL; + usb_switch = usb_switch_dell; + } else { + usage("error: undefined switching method\n"); + exit(1); + } break; case 'h': usage(NULL); default: - exit(0); + exit(1); } } - if (!quiet && (!dev.vendor || !dev.product || !method)) - usage("ERROR: Vendor ID, Product ID, and Switching Method must all be defined.\n"); + if (!devpath || method == METHOD_UNDEF) { + usage("error: --devpath= and --method= must be defined\n"); + exit(1); + } - argc -= optind; - argv += optind; - optind = 0; + udev = udev_new(); + if (udev == NULL) + goto exit; + + util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL); + udev_dev = udev_device_new_from_syspath(udev, syspath); + if (udev_dev == NULL) { + fprintf(stderr, "error: could not find '%s'\n", devpath); + goto exit; + } - usb_init(); + switch (method) { + case METHOD_CSR: + case METHOD_DELL: { + struct udev_device *dev; + struct usb_dev_handle *handle; + const char *type; + + /* get the parent usb_device if needed */ + dev = udev_dev; + type = udev_device_get_devtype(dev); + if (type == NULL || strcmp(type, "usb_device") != 0) { + dev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"); + if (dev == NULL) { + fprintf(stderr, "error: could not find usb_device for '%s'\n", devpath); + goto exit; + } + } - if (!find_device(&dev)) { - if (!quiet) - fprintf(stderr, "Device %04x:%04x not found on USB bus.\n", - dev.vendor, dev.product); - exit(1); + handle = find_device(dev); + if (handle == NULL) { + fprintf(stderr, "error: unable to handle '%s'\n", + udev_device_get_syspath(dev)); + goto exit; + } + err = usb_switch(handle, mode); + break; } + case METHOD_LOGITECH_HID: { + const char *device; - if (!quiet) - printf("Attempting to switch device %04x:%04x to %s mode ", - dev.vendor, dev.product, dev.mode ? "HID" : "HCI"); - fflush(stdout); - - if (method(&dev) < 0 && !quiet) - printf("failed (%s)\n", strerror(errno)); - else if (!quiet) - printf("was successful\n"); + device = udev_device_get_devnode(udev_dev); + if (device == NULL) { + fprintf(stderr, "error: could not find hiddev device node\n"); + goto exit; + } + err = hid_switch_logitech(device); + break; + } + default: + break; + } - return errno; + if (err < 0) + fprintf(stderr, "error: switching device '%s' failed.\n", + udev_device_get_syspath(udev_dev)); +exit: + udev_device_unref(udev_dev); + udev_unref(udev); + return rc; } Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -p -r1.71 -r1.72 --- bluez.spec 16 Sep 2009 09:59:29 -0000 1.71 +++ bluez.spec 2 Nov 2009 15:08:05 -0000 1.72 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.42 -Release: 6%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -23,8 +23,8 @@ Patch7: 0002-Actually-read-the-CreateDev # http://thread.gmane.org/gmane.linux.bluez.kernel/3106/focus=3114 Patch8: 0001-Allow-lp-CUPS-to-talk-to-bluetoothd.patch Patch9: 0002-Mark-Bluetooth-printers-as-being-local.patch -# http://thread.gmane.org/gmane.linux.bluez.kernel/3430 -Patch10: bluez-correct-udev-dell-mouse-rules.patch +# Updated from udev-extras master +Patch10: bluez-4.42-update-hid2hci-rules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -214,6 +214,12 @@ fi %{_sysconfdir}/alsa/bluetooth.conf %changelog +* Mon Nov 02 2009 Bastien Nocera 4.42-8 +- Update hid2hci code from udev master + +* Wed Sep 16 2009 Bastien Nocera 4.42-7 +- Backport code to re-enable Dell HID proxies (#513103) + * Wed Sep 16 2009 Bastien Nocera 4.42-6 - Fix hid2hci rules (#517088) --- bluez-correct-udev-dell-mouse-rules.patch DELETED --- From jnovy at fedoraproject.org Mon Nov 2 15:16:46 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Mon, 2 Nov 2009 15:16:46 +0000 (UTC) Subject: rpms/texlive/devel texlive.spec,1.57,1.58 Message-ID: <20091102151646.750BB11C0086@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/texlive/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11455 Modified Files: texlive.spec Log Message: * Mon Nov 02 2009 Jindrich Novy 2007-47 - fix post/postun scriptlets Index: texlive.spec =================================================================== RCS file: /cvs/pkgs/rpms/texlive/devel/texlive.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- texlive.spec 23 Oct 2009 01:20:55 -0000 1.57 +++ texlive.spec 2 Nov 2009 15:16:46 -0000 1.58 @@ -21,7 +21,7 @@ Name: texlive Version: %{texlive_ver} -Release: 46%{?dist} +Release: 47%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -678,24 +678,24 @@ rm -rf %{buildroot}%{_texmf_main}/texcon rm -rf %{buildroot} %post -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/web2c.info.gz %{_infodir}/dir -%{_bindir}/fmtutil-sys --all &> /dev/null -%{_bindir}/updmap-sys --syncwithtrees &> /dev/null +[ -x %{_bindir}/fmtutil-sys ] && %{_bindir}/fmtutil-sys --all &> /dev/null +[ -x %{_bindir}/updmap-sys ] && %{_bindir}/updmap-sys --syncwithtrees &> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post afm -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post context -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi @@ -703,21 +703,21 @@ fi %post dvips [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/dvips.info.gz %{_infodir}/dir -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post dviutils -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post east-asian -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi @@ -725,23 +725,23 @@ fi %post latex [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/latex.info.gz %{_infodir}/dir -%{_bindir}/texconfig-sys init &> /dev/null -%{_bindir}/texconfig-sys rehash 2> /dev/null -%{_bindir}/fmtutil-sys --all &> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys init &> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/fmtutil-sys ] && %{_bindir}/fmtutil-sys --all &> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post xetex -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post -n kpathsea -/sbin/ldconfig +[ -x /sbin/ldconfig ] && /sbin/ldconfig [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/kpathsea.info.gz %{_infodir}/dir if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ @@ -774,7 +774,7 @@ fi : %preun -n kpathsea -/sbin/ldconfig +[ -x /sbin/ldconfig ] && /sbin/ldconfig if [ "$1" = 0 ]; then [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/kpathsea.info.gz %{_infodir}/dir fi @@ -784,63 +784,63 @@ fi : %postun -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun afm -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun context -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun east-asian -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun dviutils -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun dvips -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun latex -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun xetex -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun -n kpathsea -/sbin/ldconfig +[ -x /sbin/ldconfig ] && /sbin/ldconfig if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi @@ -1237,7 +1237,10 @@ fi %{_mandir}/man1/textools.1* %{_mandir}/man1/texutil.1* -%changelog +%changelog +* Mon Nov 02 2009 Jindrich Novy 2007-47 +- fix post/postun scriptlets + * Fri Oct 23 2009 Jindrich Novy 2007-46 - add missing dependency on kpathsea From rdieter at fedoraproject.org Mon Nov 2 15:31:14 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Nov 2009 15:31:14 +0000 (UTC) Subject: rpms/kipi-plugins/devel .cvsignore, 1.32, 1.33 kipi-plugins.spec, 1.101, 1.102 sources, 1.32, 1.33 Message-ID: <20091102153114.BFFA011C02BC@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kipi-plugins/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15227/devel Modified Files: .cvsignore kipi-plugins.spec sources Log Message: * Mon Nov 02 2009 Rex Dieter 0.8.0-1 - kipi-plugins-0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- .cvsignore 28 Sep 2009 14:35:14 -0000 1.32 +++ .cvsignore 2 Nov 2009 15:31:13 -0000 1.33 @@ -1 +1 @@ -kipi-plugins-0.7.0.tar.bz2 +kipi-plugins-0.8.0.tar.bz2 Index: kipi-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -p -r1.101 -r1.102 --- kipi-plugins.spec 28 Sep 2009 14:35:14 -0000 1.101 +++ kipi-plugins.spec 2 Nov 2009 15:31:13 -0000 1.102 @@ -2,7 +2,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi -Version: 0.7.0 +Version: 0.8.0 Release: 1%{?dist} License: GPLv2+ and Adobe @@ -56,12 +56,14 @@ GPSSync : geolocalize picture HTMLExport : export images collections into a static XHTML page ImageViewer : preview images using OpenGL JpegLossLess : rotate/flip images without losing quality +KioExportImport : export/imports pictures to/from accessible via KIO MetadataEdit : edit EXIF, IPTC and XMP metadata PicasaWebExport : export images to a remote Picasa web service RemoveRedEyes : remove red eyes on image automatically RawConverter : convert Raw Image to JPEG/PNG/TIFF SendImages : send images by e-mail SimpleViewerExport : export images to Flash using SimpleViewer +ShwupExport : export images to a remote Shwup web service SmugExport : export images to a remote SmugMug web service FbExport : export images to a remote Facebook web service TimeAdjust : adjust date and time @@ -102,6 +104,7 @@ rm -f %{buildroot}%{_kde4_libdir}/lib*.s %check desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/dngconverter.desktop desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kipiplugins.desktop +desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/scangui.desktop %clean @@ -130,11 +133,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %postun libs -p /sbin/ldconfig - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_kde4_bindir}/dngconverter +%{_kde4_bindir}/scangui %ifnarch s390 s390x %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so %endif @@ -151,15 +154,16 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %{_kde4_libdir}/kde4/kipiplugin_imageviewer.so %{_kde4_libdir}/kde4/kipiplugin_ipodexport.so %{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so +%{_kde4_libdir}/kde4/kipiplugin_kioexportimport.so %{_kde4_libdir}/kde4/kipiplugin_metadataedit.so %{_kde4_libdir}/kde4/kipiplugin_picasawebexport.so %{_kde4_libdir}/kde4/kipiplugin_printimages.so %{_kde4_libdir}/kde4/kipiplugin_rawconverter.so %{_kde4_libdir}/kde4/kipiplugin_removeredeyes.so %{_kde4_libdir}/kde4/kipiplugin_sendimages.so +%{_kde4_libdir}/kde4/kipiplugin_shwup.so %{_kde4_libdir}/kde4/kipiplugin_smug.so %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so -%{_kde4_appsdir}/kipiplugin_advancedslideshow/ %{_kde4_appsdir}/kipiplugin_facebook/ %{_kde4_appsdir}/kipiplugin_flashexport/ %{_kde4_appsdir}/kipiplugin_flickrexport/ @@ -170,9 +174,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %{_kde4_appsdir}/kipiplugin_picasawebexport/ %{_kde4_appsdir}/kipiplugin_printimages/ %{_kde4_appsdir}/kipiplugin_removeredeyes/ +%{_kde4_appsdir}/kipiplugin_shwup/ %{_kde4_appsdir}/kipiplugin_smug/ %{_kde4_datadir}/applications/kde4/dngconverter.desktop %{_kde4_datadir}/applications/kde4/kipiplugins.desktop +%{_kde4_datadir}/applications/kde4/scangui.desktop %{_kde4_datadir}/kde4/services/*.desktop %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* @@ -183,6 +189,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %changelog +* Mon Nov 02 2009 Rex Dieter 0.8.0-1 +- kipi-plugins-0.8.0 + * Mon Sep 28 2009 Rex Dieter 0.7.0-1 - kipi-plugins-0.7.0 - -libs pkg, multilib friendly Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- sources 28 Sep 2009 14:35:14 -0000 1.32 +++ sources 2 Nov 2009 15:31:13 -0000 1.33 @@ -1 +1 @@ -564e766f7afac6169ff0cc591667183c kipi-plugins-0.7.0.tar.bz2 +2049c37dd1bff8f818e379d3c7676389 kipi-plugins-0.8.0.tar.bz2 From rdieter at fedoraproject.org Mon Nov 2 15:31:15 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Nov 2009 15:31:15 +0000 (UTC) Subject: rpms/kipi-plugins/F-12 .cvsignore, 1.32, 1.33 kipi-plugins.spec, 1.101, 1.102 sources, 1.32, 1.33 Message-ID: <20091102153115.277A511C02BC@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kipi-plugins/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15227/F-12 Modified Files: .cvsignore kipi-plugins.spec sources Log Message: * Mon Nov 02 2009 Rex Dieter 0.8.0-1 - kipi-plugins-0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- .cvsignore 28 Sep 2009 14:35:14 -0000 1.32 +++ .cvsignore 2 Nov 2009 15:31:14 -0000 1.33 @@ -1 +1 @@ -kipi-plugins-0.7.0.tar.bz2 +kipi-plugins-0.8.0.tar.bz2 Index: kipi-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/kipi-plugins.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -p -r1.101 -r1.102 --- kipi-plugins.spec 28 Sep 2009 14:35:14 -0000 1.101 +++ kipi-plugins.spec 2 Nov 2009 15:31:14 -0000 1.102 @@ -2,7 +2,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi -Version: 0.7.0 +Version: 0.8.0 Release: 1%{?dist} License: GPLv2+ and Adobe @@ -56,12 +56,14 @@ GPSSync : geolocalize picture HTMLExport : export images collections into a static XHTML page ImageViewer : preview images using OpenGL JpegLossLess : rotate/flip images without losing quality +KioExportImport : export/imports pictures to/from accessible via KIO MetadataEdit : edit EXIF, IPTC and XMP metadata PicasaWebExport : export images to a remote Picasa web service RemoveRedEyes : remove red eyes on image automatically RawConverter : convert Raw Image to JPEG/PNG/TIFF SendImages : send images by e-mail SimpleViewerExport : export images to Flash using SimpleViewer +ShwupExport : export images to a remote Shwup web service SmugExport : export images to a remote SmugMug web service FbExport : export images to a remote Facebook web service TimeAdjust : adjust date and time @@ -102,6 +104,7 @@ rm -f %{buildroot}%{_kde4_libdir}/lib*.s %check desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/dngconverter.desktop desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kipiplugins.desktop +desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/scangui.desktop %clean @@ -130,11 +133,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %postun libs -p /sbin/ldconfig - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_kde4_bindir}/dngconverter +%{_kde4_bindir}/scangui %ifnarch s390 s390x %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so %endif @@ -151,15 +154,16 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %{_kde4_libdir}/kde4/kipiplugin_imageviewer.so %{_kde4_libdir}/kde4/kipiplugin_ipodexport.so %{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so +%{_kde4_libdir}/kde4/kipiplugin_kioexportimport.so %{_kde4_libdir}/kde4/kipiplugin_metadataedit.so %{_kde4_libdir}/kde4/kipiplugin_picasawebexport.so %{_kde4_libdir}/kde4/kipiplugin_printimages.so %{_kde4_libdir}/kde4/kipiplugin_rawconverter.so %{_kde4_libdir}/kde4/kipiplugin_removeredeyes.so %{_kde4_libdir}/kde4/kipiplugin_sendimages.so +%{_kde4_libdir}/kde4/kipiplugin_shwup.so %{_kde4_libdir}/kde4/kipiplugin_smug.so %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so -%{_kde4_appsdir}/kipiplugin_advancedslideshow/ %{_kde4_appsdir}/kipiplugin_facebook/ %{_kde4_appsdir}/kipiplugin_flashexport/ %{_kde4_appsdir}/kipiplugin_flickrexport/ @@ -170,9 +174,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %{_kde4_appsdir}/kipiplugin_picasawebexport/ %{_kde4_appsdir}/kipiplugin_printimages/ %{_kde4_appsdir}/kipiplugin_removeredeyes/ +%{_kde4_appsdir}/kipiplugin_shwup/ %{_kde4_appsdir}/kipiplugin_smug/ %{_kde4_datadir}/applications/kde4/dngconverter.desktop %{_kde4_datadir}/applications/kde4/kipiplugins.desktop +%{_kde4_datadir}/applications/kde4/scangui.desktop %{_kde4_datadir}/kde4/services/*.desktop %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* @@ -183,6 +189,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/ %changelog +* Mon Nov 02 2009 Rex Dieter 0.8.0-1 +- kipi-plugins-0.8.0 + * Mon Sep 28 2009 Rex Dieter 0.7.0-1 - kipi-plugins-0.7.0 - -libs pkg, multilib friendly Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- sources 28 Sep 2009 14:35:14 -0000 1.32 +++ sources 2 Nov 2009 15:31:14 -0000 1.33 @@ -1 +1 @@ -564e766f7afac6169ff0cc591667183c kipi-plugins-0.7.0.tar.bz2 +2049c37dd1bff8f818e379d3c7676389 kipi-plugins-0.8.0.tar.bz2 From mhlavink at fedoraproject.org Mon Nov 2 15:37:43 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 15:37:43 +0000 (UTC) Subject: rpms/nmap/F-12 nmap.spec,1.59,1.60 Message-ID: <20091102153743.6DEF511C0086@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/nmap/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17499 Modified Files: nmap.spec Log Message: * Mon Nov 02 2009 Michal Hlavinka - 2:5.00-4 - spec cleanup Index: nmap.spec =================================================================== RCS file: /cvs/extras/rpms/nmap/F-12/nmap.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- nmap.spec 30 Oct 2009 18:07:53 -0000 1.59 +++ nmap.spec 2 Nov 2009 15:37:42 -0000 1.60 @@ -3,7 +3,7 @@ Summary: Network exploration tool and security scanner Name: nmap Version: 5.00 -Release: 3%{?dist} +Release: 4%{?dist} # libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999) License: GPLv2 Group: Applications/System @@ -38,13 +38,13 @@ and port specification, decoy scanning, predictability characteristics, reverse-identd scanning, and more. %package frontend -Summary: The GTK+ front-end for nmap +Summary: The GTK+ front end for nmap Group: Applications/System Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 python-sqlite2 usermode BuildRequires: python >= 2.5 python-devel pygtk2-devel libpng-devel %description frontend -This package includes zenmap, a GTK+ front-end for nmap. The nmap package must -be installed before installing nmap front-end. +This package includes zenmap, a GTK+ front end for nmap. The nmap package must +be installed before installing nmap front end. %prep %setup -q @@ -54,6 +54,13 @@ be installed before installing nmap fron rm -rf liblua libpcap libpcre +#fix locale dir +mv zenmap/share/zenmap/locale zenmap/share +sed -i -e "s|^locale_dir =.*$|locale_dir = os.path.join('share','locale')|" \ + -e 's|join(self.install_data, data_dir)|join(self.install_data, "share")|' zenmap/setup.py +sed -i 's|^LOCALE_DIR = .*|LOCALE_DIR = join(prefix, "share", "locale")|' zenmap/zenmapCore/Paths.py + + %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" @@ -91,8 +98,17 @@ desktop-file-install --vendor nmap \ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps ln -s ../../../../zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -#mv $RPM_BUILD_ROOT%{_datadir}/zenmap/locale/ $RPM_BUILD_ROOT%{_datadir} -#%find_lang zenmap +# fix end-of-line +pushd $RPM_BUILD_ROOT +for fe in ./%{python_sitelib}/zenmapCore/Paths.py +do + dos2unix <$fe >$fe.new + touch -r $fe $fe.new + mv -f $fe.new $fe +done +popd + +%find_lang zenmap %clean rm -rf $RPM_BUILD_ROOT @@ -128,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xnmap.1.gz %changelog +* Mon Nov 02 2009 Michal Hlavinka - 2:5.00-4 +- spec cleanup + * Fri Aug 21 2009 Tomas Mraz - 2:5.00-3 - rebuilt with new openssl From mhlavink at fedoraproject.org Mon Nov 2 15:40:25 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 15:40:25 +0000 (UTC) Subject: rpms/smartmontools/F-12 smartd.initd, 1.10, 1.11 smartmontools.spec, 1.65, 1.66 Message-ID: <20091102154025.8DA6311C0418@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/smartmontools/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18574 Modified Files: smartd.initd smartmontools.spec Log Message: * Mon Nov 02 2009 Michal Hlavinka - 1:5.38-22 - spec cleanup Index: smartd.initd =================================================================== RCS file: /cvs/extras/rpms/smartmontools/F-12/smartd.initd,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- smartd.initd 9 Oct 2009 18:52:55 -0000 1.10 +++ smartd.initd 2 Nov 2009 15:40:23 -0000 1.11 @@ -14,6 +14,8 @@ # Required-Start: $local_fs $network # Required-Stop: $local_fs $network # Should-Start: +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 # Short-Description: Self Monitoring and Reporting Technology (SMART) Daemon # Description: The smartd daemon monitors SMART status of the local hard drives and # provides advanced warnings of of disk degradation or failures. Index: smartmontools.spec =================================================================== RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -p -r1.65 -r1.66 --- smartmontools.spec 12 Oct 2009 15:17:53 -0000 1.65 +++ smartmontools.spec 2 Nov 2009 15:40:24 -0000 1.66 @@ -1,7 +1,7 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools Version: 5.38 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -10,15 +10,15 @@ Source0: http://prdownloads.sourceforge. Source1: smartd.initd Source2: smartmontools.sysconf Patch1: smartmontools-5.38-cloexec.patch -Patch2: smartmontools-5.37-addrinfo.patch -Patch3: smartmontools-5.38-perc.patch -Patch4: smartmontools-5.38-selinux.patch -Patch5: smartmontools-5.38-defaultconf.patch -Patch6: smartmontools-5.38-lowcap.patch +Patch2: smartmontools-5.37-addrinfo.patch +Patch3: smartmontools-5.38-perc.patch +Patch4: smartmontools-5.38-selinux.patch +Patch5: smartmontools-5.38-defaultconf.patch +Patch6: smartmontools-5.38-lowcap.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: fileutils mailx chkconfig initscripts -BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext -BuildRequires: libselinux-devel libcap-ng-devel +BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext +BuildRequires: libselinux-devel libcap-ng-devel %description The smartmontools package contains two utility programs (smartctl @@ -37,6 +37,14 @@ failure. %patch5 -p1 -b .defaultconf %patch6 -p1 -b .lowcap +# fix encoding +for fe in AUTHORS CHANGELOG +do + iconv -f iso-8859-1 -t utf-8 <$fe >$fe.new + touch -r $fe $fe.new + mv -f $fe.new $fe +done + %build ln -s CHANGELOG ChangeLog autoreconf -i @@ -46,12 +54,14 @@ make CXXFLAGS="$RPM_OPT_FLAGS -fPIE" LDF %else make CXXFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now" %endif + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install #rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd.conf rm -f examplescripts/Makefile* +chmod a-x -R examplescripts/* install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools @@ -79,8 +89,11 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools %changelog -* Mon Oct 12 2009 Michal Hlavinka - 1:5.38-21 -- warn about disabled mail only if capabilities are enabled +* Mon Nov 02 2009 Michal Hlavinka - 1:5.38-22 +- spec cleanup + +* Mon Oct 12 2009 Michal Hlavinka - 1:5.38-21 +- warn about disabled mail only if capabilities are enabled * Fri Oct 09 2009 Michal Hlavinka - 1:5.38-20.1 - fix apostrophes around shell variable From lkundrak at fedoraproject.org Mon Nov 2 15:40:50 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Mon, 2 Nov 2009 15:40:50 +0000 (UTC) Subject: rpms/erlang/devel otp_src_R13B02_OTP-8199.patch, NONE, 1.1 erlang.spec, 1.43, 1.44 otp-install.patch, 1.1, 1.2 Message-ID: <20091102154050.D39E011C0418@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/erlang/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18737 Modified Files: erlang.spec otp-install.patch Added Files: otp_src_R13B02_OTP-8199.patch Log Message: * Thu Oct 22 2009 Lubomir Rintel (Good Data) - R13B-02-1 - Update to R13B-02 (patched for what's released as 02-1 by upstream) otp_src_R13B02_OTP-8199.patch: reltool_target.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE otp_src_R13B02_OTP-8199.patch --- --- otp_src_R13B02/lib/reltool/src/reltool_target.erl 2009-09-18 16:25:49.000000000 +0200 +++ otp_src_R13B02_patched/lib/reltool/src/reltool_target.erl 2009-09-22 17:45:33.000000000 +0200 @@ -1014,7 +1014,7 @@ TargetDir2 = filename:join([TargetDir, Dir]), cleanup_spec(Files, TargetDir2), file:del_dir(TargetDir2); -cleanup_spec({create_dir, _OldDir, NewDir, Files}, TargetDir) -> +cleanup_spec({create_dir, NewDir, _OldDir, Files}, TargetDir) -> TargetDir2 = filename:join([TargetDir, NewDir]), cleanup_spec(Files, TargetDir2), file:del_dir(TargetDir2); @@ -1152,7 +1152,7 @@ "Progname=erl\r\n", "Rootdir=", NativeRootDir, "\r\n"], IniFile = filename:join([BinDir, "erl.ini"]), - file:write(IniFile, IniData); + ok = file:write_file(IniFile, IniData); _ -> subst_src_scripts(start_scripts(), ErtsBinDir, BinDir, [{"FINAL_ROOTDIR", TargetDir2}, {"EMU", "beam"}], Index: erlang.spec =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- erlang.spec 25 Aug 2009 12:22:08 -0000 1.43 +++ erlang.spec 2 Nov 2009 15:40:49 -0000 1.44 @@ -1,9 +1,9 @@ %define ver R13B -%define rel 01 +%define rel 02 Name: erlang Version: %{ver} -Release: %{rel}.2%{?dist} +Release: %{rel}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -15,6 +15,9 @@ Source2: http://www.erlang.org/do Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch +# OTP-8199 In the new release of Reltool (0.5) there is a severe bug that may cause your source files to be deleted. +# http://www.erlang.org/download/patches/otp_src_R13B02_OTP-8199.readme +Patch3: http://www.erlang.org/download/patches/otp_src_R13B02_OTP-8199.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -50,6 +53,7 @@ Documentation for Erlang. %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath +%patch3 -p1 -b .OTP-8199 # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure @@ -123,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 22 2009 Lubomir Rintel (Good Data) - R13B-02-1 +- Update to R13B-02 (patched for what's released as 02-1 by upstream) + * Tue Aug 25 2009 Tomas Mraz - R13B-01.2 - rebuilt with new openssl otp-install.patch: Install.src | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) Index: otp-install.patch =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/otp-install.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- otp-install.patch 6 Sep 2005 15:14:36 -0000 1.1 +++ otp-install.patch 2 Nov 2009 15:40:50 -0000 1.2 @@ -1,15 +1,16 @@ ---- otp_src_R9C-0/erts/etc/unix/Install.src.install 2003-10-17 12:52:14.000000000 +0200 -+++ otp_src_R9C-0/erts/etc/unix/Install.src 2003-10-17 14:26:49.000000000 +0200 -@@ -84,7 +84,7 @@ +diff -up otp_src_R13B02/erts/etc/unix/Install.src.install otp_src_R13B02/erts/etc/unix/Install.src +--- otp_src_R13B02/erts/etc/unix/Install.src.install 2009-09-18 16:07:12.000000000 +0200 ++++ otp_src_R13B02/erts/etc/unix/Install.src 2009-10-22 15:49:01.000000000 +0200 +@@ -111,7 +111,7 @@ if [ -h epmd ]; then /bin/rm -f epmd fi --ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd +-ln -s $TARGET_ERL_ROOT/erts-%I_VSN%/bin/epmd epmd +ln -s ../erts-%I_VSN%/bin/epmd epmd cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . -@@ -145,16 +145,4 @@ +@@ -160,16 +160,4 @@ if [ "X$TARGET" != "Xsunos5" -a -d $ERL_ (ranlib $library) > /dev/null 2>&1 done fi From schwab at fedoraproject.org Mon Nov 2 15:42:30 2009 From: schwab at fedoraproject.org (schwab) Date: Mon, 2 Nov 2009 15:42:30 +0000 (UTC) Subject: rpms/glibc/F-12 .cvsignore, 1.294, 1.295 glibc-fedora.patch, 1.328, 1.329 glibc.spec, 1.421, 1.422 import.log, 1.37, 1.38 sources, 1.319, 1.320 Message-ID: <20091102154230.E777911C0086@cvs1.fedora.phx.redhat.com> Author: schwab Update of /cvs/pkgs/rpms/glibc/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19378/F-12 Modified Files: .cvsignore glibc-fedora.patch glibc.spec import.log sources Log Message: 2.11-1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/glibc/F-12/.cvsignore,v retrieving revision 1.294 retrieving revision 1.295 diff -u -p -r1.294 -r1.295 --- .cvsignore 30 Oct 2009 15:22:46 -0000 1.294 +++ .cvsignore 2 Nov 2009 15:42:28 -0000 1.295 @@ -1,2 +1,2 @@ -glibc-2.10-405-g3a83202-fedora.tar.bz2 -glibc-2.10-405-g3a83202.tar.bz2 +glibc-2.11-fedora.tar.bz2 +glibc-2.11.tar.bz2 glibc-fedora.patch: ChangeLog | 50 +-- ChangeLog.15 | 37 ++ ChangeLog.16 | 25 + Makeconfig | 6 csu/Makefile | 3 csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 25 + elf/tst-stackguard1.c | 8 include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 9 intl/locale.alias | 2 libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/locarchive.c | 10 localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- manual/libc.texinfo | 2 misc/sys/cdefs.h | 20 + nis/nss | 2 nptl/ChangeLog | 19 + nptl/Makefile | 11 nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h | 3 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/nscd.conf | 2 nscd/nscd.init | 32 -- posix/Makefile | 15 - posix/getconf.speclist.h | 39 ++ streams/Makefile | 2 sysdeps/generic/dl-cache.h | 8 sysdeps/i386/Makefile | 10 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/powerpc/powerpc64/Makefile | 1 sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/check_pf.c | 5 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/fcntl.c | 42 --- sysdeps/unix/sysv/linux/futimesat.c | 23 - sysdeps/unix/sysv/linux/i386/bits/fcntl.h | 25 - sysdeps/unix/sysv/linux/i386/clone.S | 4 sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/i386/fcntl.c | 29 -- sysdeps/unix/sysv/linux/ia64/bits/fcntl.h | 25 - sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/kernel-features.h | 5 sysdeps/unix/sysv/linux/netlinkaccess.h | 18 + sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h | 25 - sysdeps/unix/sysv/linux/s390/bits/fcntl.h | 25 - sysdeps/unix/sysv/linux/sh/bits/fcntl.h | 25 - sysdeps/unix/sysv/linux/sparc/bits/fcntl.h | 25 - sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h | 25 - sysdeps/unix/sysv/linux/x86_64/clone.S | 4 timezone/zic.c | 2 67 files changed, 711 insertions(+), 721 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/pkgs/rpms/glibc/F-12/glibc-fedora.patch,v retrieving revision 1.328 retrieving revision 1.329 diff -u -p -r1.328 -r1.329 --- glibc-fedora.patch 30 Oct 2009 15:22:47 -0000 1.328 +++ glibc-fedora.patch 2 Nov 2009 15:42:29 -0000 1.329 @@ -1,6 +1,6 @@ ---- glibc-2.10-405-g3a83202/ChangeLog -+++ glibc-2.10.90-27/ChangeLog -@@ -195,22 +195,6 @@ d2009-10-30 Ulrich Drepper +--- glibc-2.11/ChangeLog ++++ glibc-2.11-1/ChangeLog +@@ -209,22 +209,6 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/netinet/ip.h: Define IPTOS_ENC* and IPTOS_DSCP* macros. Patch by Philip Prindeville . @@ -23,7 +23,7 @@ [BZ #10847] * sysdeps/gnu/getutmp.c: Allow compatibility code to play around with getutmpx symbol. -@@ -298,17 +282,6 @@ d2009-10-30 Ulrich Drepper +@@ -312,17 +296,6 @@ d2009-10-30 Ulrich Drepper * locale/C-time.c: Revert week-1stday back to 19971130 and set first_weekday to 1 and first_workday to 2. @@ -41,7 +41,7 @@ 2009-09-28 Andreas Schwab * stdio-common/printf_fp.c: Check for and avoid integer overflows. -@@ -966,6 +939,11 @@ d2009-10-30 Ulrich Drepper +@@ -980,6 +953,11 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -53,7 +53,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -1231,6 +1209,11 @@ d2009-10-30 Ulrich Drepper +@@ -1245,6 +1223,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -65,7 +65,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -9924,6 +9907,10 @@ d2009-10-30 Ulrich Drepper +@@ -9938,6 +9921,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -76,7 +76,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -11181,6 +11168,15 @@ d2009-10-30 Ulrich Drepper +@@ -11195,6 +11182,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -92,8 +92,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.10-405-g3a83202/ChangeLog.15 -+++ glibc-2.10.90-27/ChangeLog.15 +--- glibc-2.11/ChangeLog.15 ++++ glibc-2.11-1/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -159,8 +159,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.10-405-g3a83202/ChangeLog.16 -+++ glibc-2.10.90-27/ChangeLog.16 +--- glibc-2.11/ChangeLog.16 ++++ glibc-2.11-1/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -214,8 +214,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.10-405-g3a83202/Makeconfig -+++ glibc-2.10.90-27/Makeconfig +--- glibc-2.11/Makeconfig ++++ glibc-2.11-1/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -232,8 +232,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.10-405-g3a83202/csu/Makefile -+++ glibc-2.10.90-27/csu/Makefile +--- glibc-2.11/csu/Makefile ++++ glibc-2.11-1/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -244,8 +244,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.10-405-g3a83202/csu/elf-init.c -+++ glibc-2.10.90-27/csu/elf-init.c +--- glibc-2.11/csu/elf-init.c ++++ glibc-2.11-1/csu/elf-init.c @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -270,8 +270,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.10-405-g3a83202/debug/tst-chk1.c -+++ glibc-2.10.90-27/debug/tst-chk1.c +--- glibc-2.11/debug/tst-chk1.c ++++ glibc-2.11-1/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -300,8 +300,8 @@ # define O 0 # else # define O 1 ---- glibc-2.10-405-g3a83202/elf/ldconfig.c -+++ glibc-2.10.90-27/elf/ldconfig.c +--- glibc-2.11/elf/ldconfig.c ++++ glibc-2.11-1/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -383,8 +383,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.10-405-g3a83202/elf/tst-stackguard1.c -+++ glibc-2.10.90-27/elf/tst-stackguard1.c +--- glibc-2.11/elf/tst-stackguard1.c ++++ glibc-2.11-1/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -409,16 +409,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10-405-g3a83202/include/bits/stdlib-ldbl.h -+++ glibc-2.10.90-27/include/bits/stdlib-ldbl.h +--- glibc-2.11/include/bits/stdlib-ldbl.h ++++ glibc-2.11-1/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10-405-g3a83202/include/bits/wchar-ldbl.h -+++ glibc-2.10.90-27/include/bits/wchar-ldbl.h +--- glibc-2.11/include/bits/wchar-ldbl.h ++++ glibc-2.11-1/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10-405-g3a83202/include/features.h -+++ glibc-2.10.90-27/include/features.h +--- glibc-2.11/include/features.h ++++ glibc-2.11-1/include/features.h @@ -299,8 +299,13 @@ #endif @@ -435,8 +435,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.10-405-g3a83202/intl/locale.alias -+++ glibc-2.10.90-27/intl/locale.alias +--- glibc-2.11/intl/locale.alias ++++ glibc-2.11-1/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -446,8 +446,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.10-405-g3a83202/libio/stdio.h -+++ glibc-2.10.90-27/libio/stdio.h +--- glibc-2.11/libio/stdio.h ++++ glibc-2.11-1/libio/stdio.h @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -461,8 +461,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.10-405-g3a83202/locale/iso-4217.def -+++ glibc-2.10.90-27/locale/iso-4217.def +--- glibc-2.11/locale/iso-4217.def ++++ glibc-2.11-1/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -554,8 +554,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.10-405-g3a83202/locale/programs/locarchive.c -+++ glibc-2.10.90-27/locale/programs/locarchive.c +--- glibc-2.11/locale/programs/locarchive.c ++++ glibc-2.11-1/locale/programs/locarchive.c @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -587,8 +587,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.10-405-g3a83202/localedata/Makefile -+++ glibc-2.10.90-27/localedata/Makefile +--- glibc-2.11/localedata/Makefile ++++ glibc-2.11-1/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -597,8 +597,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.10-405-g3a83202/localedata/SUPPORTED -+++ glibc-2.10.90-27/localedata/SUPPORTED +--- glibc-2.11/localedata/SUPPORTED ++++ glibc-2.11-1/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -623,7 +623,7 @@ en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ en_ZW.UTF-8/UTF-8 \ -@@ -304,6 +307,8 @@ nl_NL/ISO-8859-1 \ +@@ -305,6 +308,8 @@ nl_NL/ISO-8859-1 \ nl_NL at euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ @@ -632,7 +632,7 @@ nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ -@@ -363,6 +368,7 @@ sv_FI/ISO-8859-1 \ +@@ -364,6 +369,7 @@ sv_FI/ISO-8859-1 \ sv_FI at euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -640,8 +640,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.10-405-g3a83202/localedata/locales/cy_GB -+++ glibc-2.10.90-27/localedata/locales/cy_GB +--- glibc-2.11/localedata/locales/cy_GB ++++ glibc-2.11-1/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -656,8 +656,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.10-405-g3a83202/localedata/locales/en_GB -+++ glibc-2.10.90-27/localedata/locales/en_GB +--- glibc-2.11/localedata/locales/en_GB ++++ glibc-2.11-1/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -669,8 +669,8 @@ date_fmt "/ / " ---- glibc-2.10-405-g3a83202/localedata/locales/no_NO -+++ glibc-2.10.90-27/localedata/locales/no_NO +--- glibc-2.11/localedata/locales/no_NO ++++ glibc-2.11-1/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -741,8 +741,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.10-405-g3a83202/localedata/locales/zh_TW -+++ glibc-2.10.90-27/localedata/locales/zh_TW +--- glibc-2.11/localedata/locales/zh_TW ++++ glibc-2.11-1/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -770,8 +770,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.10-405-g3a83202/malloc/mcheck.c -+++ glibc-2.10.90-27/malloc/mcheck.c +--- glibc-2.11/malloc/mcheck.c ++++ glibc-2.11-1/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -847,8 +847,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.10-405-g3a83202/manual/libc.texinfo -+++ glibc-2.10.90-27/manual/libc.texinfo +--- glibc-2.11/manual/libc.texinfo ++++ glibc-2.11-1/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -858,8 +858,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.10-405-g3a83202/misc/sys/cdefs.h -+++ glibc-2.10.90-27/misc/sys/cdefs.h +--- glibc-2.11/misc/sys/cdefs.h ++++ glibc-2.11-1/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -903,17 +903,17 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.10-405-g3a83202/nis/nss -+++ glibc-2.10.90-27/nis/nss +--- glibc-2.11/nis/nss ++++ glibc-2.11-1/nis/nss @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-2.10-405-g3a83202/nptl/ChangeLog -+++ glibc-2.10.90-27/nptl/ChangeLog -@@ -3725,6 +3725,15 @@ +--- glibc-2.11/nptl/ChangeLog ++++ glibc-2.11-1/nptl/ChangeLog +@@ -3727,6 +3727,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -929,7 +929,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4461,6 +4470,11 @@ +@@ -4463,6 +4472,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -941,7 +941,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6535,6 +6549,11 @@ +@@ -6537,6 +6551,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -953,8 +953,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.10-405-g3a83202/nptl/Makefile -+++ glibc-2.10.90-27/nptl/Makefile +--- glibc-2.11/nptl/Makefile ++++ glibc-2.11-1/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -987,8 +987,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.10-405-g3a83202/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.10.90-27/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -997,8 +997,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.10-405-g3a83202/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.10.90-27/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1006,8 +1006,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.10-405-g3a83202/nptl/tst-stackguard1.c -+++ glibc-2.10.90-27/nptl/tst-stackguard1.c +--- glibc-2.11/nptl/tst-stackguard1.c ++++ glibc-2.11-1/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1032,8 +1032,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10-405-g3a83202/nscd/nscd.conf -+++ glibc-2.10.90-27/nscd/nscd.conf +--- glibc-2.11/nscd/nscd.conf ++++ glibc-2.11-1/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1043,8 +1043,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.10-405-g3a83202/nscd/nscd.init -+++ glibc-2.10.90-27/nscd/nscd.init +--- glibc-2.11/nscd/nscd.init ++++ glibc-2.11-1/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1116,8 +1116,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.10-405-g3a83202/posix/Makefile -+++ glibc-2.10.90-27/posix/Makefile +--- glibc-2.11/posix/Makefile ++++ glibc-2.11-1/posix/Makefile @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1138,8 +1138,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.10-405-g3a83202/posix/getconf.speclist.h -+++ glibc-2.10.90-27/posix/getconf.speclist.h +--- glibc-2.11/posix/getconf.speclist.h ++++ glibc-2.11-1/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1180,8 +1180,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.10-405-g3a83202/streams/Makefile -+++ glibc-2.10.90-27/streams/Makefile +--- glibc-2.11/streams/Makefile ++++ glibc-2.11-1/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1191,8 +1191,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.10-405-g3a83202/sysdeps/generic/dl-cache.h -+++ glibc-2.10.90-27/sysdeps/generic/dl-cache.h +--- glibc-2.11/sysdeps/generic/dl-cache.h ++++ glibc-2.11-1/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1208,8 +1208,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-2.10-405-g3a83202/sysdeps/i386/Makefile -+++ glibc-2.10.90-27/sysdeps/i386/Makefile +--- glibc-2.11/sysdeps/i386/Makefile ++++ glibc-2.11-1/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1234,8 +1234,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10-405-g3a83202/sysdeps/ia64/Makefile -+++ glibc-2.10.90-27/sysdeps/ia64/Makefile +--- glibc-2.11/sysdeps/ia64/Makefile ++++ glibc-2.11-1/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1247,8 +1247,8 @@ endif endif ---- glibc-2.10-405-g3a83202/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.10.90-27/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11-1/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1600,8 +1600,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-2.10-405-g3a83202/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.10.90-27/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11-1/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1687,8 +1687,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.10-405-g3a83202/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.10.90-27/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11-1/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1697,8 +1697,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10-405-g3a83202/sysdeps/unix/nice.c -+++ glibc-2.10.90-27/sysdeps/unix/nice.c +--- glibc-2.11/sysdeps/unix/nice.c ++++ glibc-2.11-1/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1713,8 +1713,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1730,8 +1730,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1779,8 +1779,8 @@ } else #endif ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/fcntl.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/fcntl.c +--- glibc-2.11/sysdeps/unix/sysv/linux/fcntl.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/fcntl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002, 2003, 2004, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -1851,8 +1851,8 @@ LIBC_CANCEL_RESET (oldtype); ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1895,8 +1895,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/i386/bits/fcntl.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/i386/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009 @@ -1946,8 +1946,8 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/clone.S -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-2.11/sysdeps/unix/sysv/linux/i386/clone.S ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1966,8 +1966,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2028,8 +2028,8 @@ + } while (0) + +#include_next ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/fcntl.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/fcntl.c +--- glibc-2.11/sysdeps/unix/sysv/linux/i386/fcntl.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/i386/fcntl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000,2002,2003,2004,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2000,2002,2003,2004,2006 Free Software Foundation, Inc. @@ -2077,8 +2077,8 @@ default: return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); } ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux/IA64. - Copyright (C) 1999,2000,2004,2006,2007,2009 Free Software Foundation, Inc. @@ -2128,8 +2128,8 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2162,29 +2162,29 @@ + } while (0) + #include_next ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/kernel-features.h @@ -542,8 +542,3 @@ # define __ASSUME_PREADV 1 # define __ASSUME_PWRITEV 1 @@ -2194,8 +2194,8 @@ -#if __LINUX_KERNEL_VERSION >= 0x020620 -# define __ASSUME_F_GETOWN_EX 1 -#endif ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2221,8 +2221,8 @@ struct netlink_res { ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2232,8 +2232,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux/PowerPC. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009 @@ -2283,8 +2283,8 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/s390/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/s390/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/s390/bits/fcntl.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/s390/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 2000,2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc. @@ -2334,8 +2334,8 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/sh/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/sh/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/sh/bits/fcntl.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/sh/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009 @@ -2385,8 +2385,8 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux/SPARC. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009 @@ -2438,8 +2438,8 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2485,8 +2485,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux/x86-64. - Copyright (C) 2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc. @@ -2536,8 +2536,8 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/x86_64/clone.S -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-2.11/sysdeps/unix/sysv/linux/x86_64/clone.S ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2556,8 +2556,8 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.10-405-g3a83202/timezone/zic.c -+++ glibc-2.10.90-27/timezone/zic.c +--- glibc-2.11/timezone/zic.c ++++ glibc-2.11-1/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; Index: glibc.spec =================================================================== RCS file: /cvs/pkgs/rpms/glibc/F-12/glibc.spec,v retrieving revision 1.421 retrieving revision 1.422 diff -u -p -r1.421 -r1.422 --- glibc.spec 30 Oct 2009 15:22:48 -0000 1.421 +++ glibc.spec 2 Nov 2009 15:42:29 -0000 1.422 @@ -1,5 +1,6 @@ -%define glibcsrcdir glibc-2.10-405-g3a83202 -%define glibcversion 2.10.90 +%define glibcsrcdir glibc-2.11 +%define glibc_release_url ftp://sources.redhat.com/pub/glibc/releases/ +%define glibcversion 2.11 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon sparcv9v sparc64v alphaev6 @@ -18,13 +19,13 @@ %endif %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x %define debuginfocommonarches alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v -%define multiarcharches %{ix86} x86_64 ppc ppc64 +%define multiarcharches %{ix86} x86_64 %define _unpackaged_files_terminate_build 0 Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 27 +Release: 1 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -34,13 +35,7 @@ License: LGPLv2+ and LGPLv2+ with except Group: System Environment/Libraries URL: http://sources.redhat.com/glibc/ Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2 -%if 0%{?glibc_release_url:1} -%define glibc_libidn_srcdir %(echo %{glibcsrcdir} | sed s/glibc-/glibc-libidn-/) -Source1: %{glibc_release_url}%{glibc_libidn_srcdir}.tar.bz2 -%define glibc_release_unpack -a1 -%define glibc_release_setup mv %{glibc_libidn_srcdir} libidn -%endif -Source2: %{glibcsrcdir}-fedora.tar.bz2 +Source1: %{glibcsrcdir}-fedora.tar.bz2 Patch0: %{name}-fedora.patch Patch1: %{name}-ia64-lib64.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -241,8 +236,7 @@ package or when debugging this package. %endif %prep -%setup -q -n %{glibcsrcdir} %{?glibc_release_unpack} -b2 -%{?glibc_release_setup} +%setup -q -n %{glibcsrcdir} -b1 %patch0 -E -p1 %ifarch ia64 %if "%{_lib}" == "lib64" @@ -386,7 +380,7 @@ build_nptl linuxnptl-power6 %endif cd build-%{nptl_target_cpu}-linuxnptl -$GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ +$GCC -static -L. -Os -g ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ -DNO_SIZE_OPTIMIZATION \ %ifarch i386 i486 i586 -DARCH_386 \ @@ -688,13 +682,13 @@ touch -r timezone/northamerica $RPM_BUIL touch -r sunrpc/etc.rpc $RPM_BUILD_ROOT/etc/rpc cd fedora -$GCC -Os -static -o build-locale-archive build-locale-archive.c \ +$GCC -Os -g -static -o build-locale-archive build-locale-archive.c \ ../build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \ ../build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \ -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \ -L../build-%{nptl_target_cpu}-linuxnptl install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive -$GCC -Os -static -o tzdata-update tzdata-update.c \ +$GCC -Os -g -static -o tzdata-update tzdata-update.c \ -L../build-%{nptl_target_cpu}-linuxnptl install -m 700 tzdata-update $RPM_BUILD_ROOT/usr/sbin/tzdata-update cd .. @@ -1035,6 +1029,11 @@ rm -f *.filelist* %endif %changelog +* Mon Nov 2 2009 Andreas Schwab - 2.11-1 +- Update to 2.11 release. +- Disable multi-arch support on PowerPC again since binutils is too old. +- Fix crash in tzdata-update due to use of multi-arch symbol (#532128). + * Fri Oct 30 2009 Andreas Schwab - 2.10.90-27 - Update from master. - Fix races in setXid implementation (BZ#3270). Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/glibc/F-12/import.log,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- import.log 30 Oct 2009 15:22:48 -0000 1.37 +++ import.log 2 Nov 2009 15:42:30 -0000 1.38 @@ -35,3 +35,4 @@ glibc-2_10_90-24:HEAD:glibc-2.10.90-24.s glibc-2_10_90-25:F-12:glibc-2.10.90-25.src.rpm:1255355210 glibc-2_10_90-26:F-12:glibc-2.10.90-26.src.rpm:1255953059 glibc-2_10_90-27:F-12:glibc-2.10.90-27.src.rpm:1256915929 +glibc-2_11-1:F-12:glibc-2.11-1.src.rpm:1257175795 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/glibc/F-12/sources,v retrieving revision 1.319 retrieving revision 1.320 diff -u -p -r1.319 -r1.320 --- sources 30 Oct 2009 15:22:48 -0000 1.319 +++ sources 2 Nov 2009 15:42:30 -0000 1.320 @@ -1,2 +1,2 @@ -86f1d478fff63d6fb0953694fc1ed53d glibc-2.10-405-g3a83202-fedora.tar.bz2 -204a3cdd20ead34cddacad6748af1d04 glibc-2.10-405-g3a83202.tar.bz2 +dfc5c4eb74f1f20003d4523269656699 glibc-2.11-fedora.tar.bz2 +2c990f97e9ff9fb1c3c85fe826e991b9 glibc-2.11.tar.bz2 From mhlavink at fedoraproject.org Mon Nov 2 15:43:31 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 15:43:31 +0000 (UTC) Subject: rpms/setuptool/F-12 setuptool.spec,1.40,1.41 Message-ID: <20091102154331.B50F011C0086@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/setuptool/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19845 Modified Files: setuptool.spec Log Message: * Mon Nov 02 2009 Michal Hlavinka 1.19.9-2 - spec cleanup Index: setuptool.spec =================================================================== RCS file: /cvs/extras/rpms/setuptool/F-12/setuptool.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- setuptool.spec 20 Oct 2009 18:04:22 -0000 1.40 +++ setuptool.spec 2 Nov 2009 15:43:31 -0000 1.41 @@ -1,6 +1,6 @@ Name: setuptool Version: 1.19.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A text mode system configuration tool License: GPLv2+ Group: Applications/System @@ -34,15 +34,18 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc README COPYING %{_bindir}/setup -%config %{_sysconfdir}/pam.d/* -%config(noreplace) %{_sysconfdir}/security/console.apps/* +%config(noreplace) %{_sysconfdir}/pam.d/setup +%config(noreplace) %{_sysconfdir}/security/console.apps/setup %{_sbindir}/setup %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/setuptool.d %dir %{_sysconfdir}/setuptool.d -%config %{_sysconfdir}/setuptool.d/* +%config(noreplace) %{_sysconfdir}/setuptool.d/* %changelog +* Mon Nov 02 2009 Michal Hlavinka 1.19.9-2 +- spec cleanup + * Tue Oct 21 2009 Michal Hlavinka 1.19.9-1 - update path of firewall configuration tool (#529794) - update translations From mhlavink at fedoraproject.org Mon Nov 2 15:51:22 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 15:51:22 +0000 (UTC) Subject: rpms/nmap/F-12 nmap.spec,1.60,1.61 Message-ID: <20091102155122.A345311C0338@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/nmap/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22065 Modified Files: nmap.spec Log Message: add buildrequire: dos2unix Index: nmap.spec =================================================================== RCS file: /cvs/extras/rpms/nmap/F-12/nmap.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- nmap.spec 2 Nov 2009 15:37:42 -0000 1.60 +++ nmap.spec 2 Nov 2009 15:51:22 -0000 1.61 @@ -25,7 +25,7 @@ URL: http://nmap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Epoch: 2 BuildRequires: openssl-devel, gtk2-devel, lua-devel, libpcap-devel, pcre-devel -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, dos2unix %define pixmap_srcdir zenmap/share/pixmaps From dwalsh at fedoraproject.org Mon Nov 2 15:54:16 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 15:54:16 +0000 (UTC) Subject: rpms/setroubleshoot/devel .cvsignore, 1.137, 1.138 setroubleshoot.spec, 1.177, 1.178 sources, 1.150, 1.151 Message-ID: <20091102155416.9E74011C0086@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/setroubleshoot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23053 Modified Files: .cvsignore setroubleshoot.spec sources Log Message: * Mon Nov 2 2009 Dan Walsh - 2.2.44-1 - Get version correct for both RHEL and Fedora Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v retrieving revision 1.137 retrieving revision 1.138 diff -u -p -r1.137 -r1.138 --- .cvsignore 30 Oct 2009 20:58:08 -0000 1.137 +++ .cvsignore 2 Nov 2009 15:54:16 -0000 1.138 @@ -55,3 +55,4 @@ setroubleshoot-2.2.40.tar.gz setroubleshoot-2.2.41.tar.gz setroubleshoot-2.2.42.tar.gz setroubleshoot-2.2.43.tar.gz +setroubleshoot-2.2.44.tar.gz Index: setroubleshoot.spec =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -p -r1.177 -r1.178 --- setroubleshoot.spec 30 Oct 2009 20:58:08 -0000 1.177 +++ setroubleshoot.spec 2 Nov 2009 15:54:16 -0000 1.178 @@ -1,6 +1,6 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 2.2.43 +Version: 2.2.44 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -212,6 +212,9 @@ Setroubleshoot documentation package %doc %{pkgdocdir} %changelog +* Mon Nov 2 2009 Dan Walsh - 2.2.44-1 +- Get version correct for both RHEL and Fedora + * Fri Oct 30 2009 Dan Walsh - 2.2.43-1 - Fix crash on selinux disabled and bad /etc/redhat-release reporing of bugzillas Index: sources =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v retrieving revision 1.150 retrieving revision 1.151 diff -u -p -r1.150 -r1.151 --- sources 30 Oct 2009 20:58:09 -0000 1.150 +++ sources 2 Nov 2009 15:54:16 -0000 1.151 @@ -1 +1 @@ -80345e1271f83d60efd66ee2aa1db55e setroubleshoot-2.2.43.tar.gz +0abc08a312821602405f44316567c6ef setroubleshoot-2.2.44.tar.gz From dwalsh at fedoraproject.org Mon Nov 2 15:54:37 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 15:54:37 +0000 (UTC) Subject: rpms/setroubleshoot/F-12 setroubleshoot.spec, 1.171, 1.172 sources, 1.144, 1.145 Message-ID: <20091102155437.1B71111C0086@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/setroubleshoot/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23235 Modified Files: setroubleshoot.spec sources Log Message: * Mon Nov 2 2009 Dan Walsh - 2.2.44-1 - Get version correct for both RHEL and Fedora Index: setroubleshoot.spec =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/F-12/setroubleshoot.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -p -r1.171 -r1.172 --- setroubleshoot.spec 30 Oct 2009 20:59:53 -0000 1.171 +++ setroubleshoot.spec 2 Nov 2009 15:54:36 -0000 1.172 @@ -1,6 +1,6 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 2.2.43 +Version: 2.2.44 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -212,6 +212,9 @@ Setroubleshoot documentation package %doc %{pkgdocdir} %changelog +* Mon Nov 2 2009 Dan Walsh - 2.2.44-1 +- Get version correct for both RHEL and Fedora + * Fri Oct 30 2009 Dan Walsh - 2.2.43-1 - Fix crash on selinux disabled and bad /etc/redhat-release reporing of bugzillas Index: sources =================================================================== RCS file: /cvs/extras/rpms/setroubleshoot/F-12/sources,v retrieving revision 1.144 retrieving revision 1.145 diff -u -p -r1.144 -r1.145 --- sources 30 Oct 2009 20:59:53 -0000 1.144 +++ sources 2 Nov 2009 15:54:36 -0000 1.145 @@ -1 +1 @@ -80345e1271f83d60efd66ee2aa1db55e setroubleshoot-2.2.43.tar.gz +0abc08a312821602405f44316567c6ef setroubleshoot-2.2.44.tar.gz From vcrhonek at fedoraproject.org Mon Nov 2 15:58:26 2009 From: vcrhonek at fedoraproject.org (vcrhonek) Date: Mon, 2 Nov 2009 15:58:26 +0000 (UTC) Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.79,1.80 Message-ID: <20091102155826.5296811C0086@cvs1.fedora.phx.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/tog-pegasus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24322 Modified Files: tog-pegasus.spec Log Message: Fix wrong multilib flag for i686 arch Index: tog-pegasus.spec =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/devel/tog-pegasus.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -p -r1.79 -r1.80 --- tog-pegasus.spec 30 Sep 2009 11:48:28 -0000 1.79 +++ tog-pegasus.spec 2 Nov 2009 15:58:25 -0000 1.80 @@ -32,7 +32,7 @@ %define multilib 0 %define bsx '' -%ifarch i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 +%ifarch %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 %define multilib 1 %define bsx -32 %ifarch x86_64 ppc64 s390x sparc64 @@ -41,7 +41,7 @@ %endif Version: 2.9.0 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 2 # Summary: OpenPegasus WBEM Services for Linux @@ -463,6 +463,9 @@ fi %changelog +* Mon Nov 2 2009 Vitezslav Crhonek - 2:2.9.0-9 +- Fix wrong multilib flag for ix86 arch + * Wed Sep 30 2009 Vitezslav Crhonek - 2:2.9.0-8 - Rebuilt with new net-snmp From jakub at fedoraproject.org Mon Nov 2 15:58:48 2009 From: jakub at fedoraproject.org (Jakub Jelinek) Date: Mon, 2 Nov 2009 15:58:48 +0000 (UTC) Subject: rpms/gcc/F-12 .cvsignore, 1.307, 1.308 gcc.spec, 1.87, 1.88 sources, 1.312, 1.313 gcc44-pr41762.patch, 1.1, NONE Message-ID: <20091102155848.343A511C0086@cvs1.fedora.phx.redhat.com> Author: jakub Update of /cvs/pkgs/rpms/gcc/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24475 Modified Files: .cvsignore gcc.spec sources Removed Files: gcc44-pr41762.patch Log Message: 4.4.2-8 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v retrieving revision 1.307 retrieving revision 1.308 diff -u -p -r1.307 -r1.308 --- .cvsignore 27 Oct 2009 18:02:14 -0000 1.307 +++ .cvsignore 2 Nov 2009 15:58:47 -0000 1.308 @@ -1,2 +1,2 @@ fastjar-0.97.tar.gz -gcc-4.4.2-20091027.tar.bz2 +gcc-4.4.2-20091102.tar.bz2 Index: gcc.spec =================================================================== RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -p -r1.87 -r1.88 --- gcc.spec 27 Oct 2009 19:41:34 -0000 1.87 +++ gcc.spec 2 Nov 2009 15:58:47 -0000 1.88 @@ -1,9 +1,9 @@ -%global DATE 20091027 -%global SVNREV 153611 +%global DATE 20091102 +%global SVNREV 153815 %global gcc_version 4.4.2 # Note, gcc_release must be integer, if you want to add suffixes to # %{release}, append them after %{gcc_release} on Release: line. -%global gcc_release 7 +%global gcc_release 8 %global _unpackaged_files_terminate_build 0 %global multilib_64_archs sparc64 ppc64 s390x x86_64 %global include_gappletviewer 1 @@ -161,7 +161,6 @@ Patch16: gcc44-unwind-debug-hook.patch Patch17: gcc44-pr38757.patch Patch18: gcc44-libstdc++-docs.patch Patch19: gcc44-ppc64-aixdesc.patch -Patch20: gcc44-pr41762.patch Patch1000: fastjar-0.97-segfault.patch @@ -467,7 +466,6 @@ which are required to compile with the G %patch18 -p0 -b .libstdc++-docs~ %endif %patch19 -p0 -b .ppc64-aixdesc~ -%patch20 -p0 -b .pr41762~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* @@ -1849,6 +1847,14 @@ fi %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Mon Nov 2 2009 Jakub Jelinek 4.4.2-8 +- update from gcc-4_4-branch + - PRs c++/41754, fortran/41777, fortran/41850, libstdc++/40852 +- fix ICE with unmatched #pragma GCC visibility push/pop (PR c++/41774) +- fix VTA ICE with -combine (#531385, PR debug/41893) +- fix RTTI for anon namespace classes +- fix incorrect uses of __restrict keyword in valarray (PR libstdc++/41763) + * Tue Oct 27 2009 Jakub Jelinek 4.4.2-7 - update from gcc-4_4-branch - PRs c++/40808, c/41842, cp-tools/39177 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v retrieving revision 1.312 retrieving revision 1.313 diff -u -p -r1.312 -r1.313 --- sources 27 Oct 2009 19:41:34 -0000 1.312 +++ sources 2 Nov 2009 15:58:47 -0000 1.313 @@ -1,2 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -d1da0b301783d57866ef992131a307a1 gcc-4.4.2-20091027.tar.bz2 +8f38c8b13882de64cc13ecaeb540c3d6 gcc-4.4.2-20091102.tar.bz2 --- gcc44-pr41762.patch DELETED --- From vcrhonek at fedoraproject.org Mon Nov 2 16:02:22 2009 From: vcrhonek at fedoraproject.org (vcrhonek) Date: Mon, 2 Nov 2009 16:02:22 +0000 (UTC) Subject: rpms/tog-pegasus/F-12 tog-pegasus.spec,1.78,1.79 Message-ID: <20091102160223.4361D11C02BC@cvs1.fedora.phx.redhat.com> Author: vcrhonek Update of /cvs/extras/rpms/tog-pegasus/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25526 Modified Files: tog-pegasus.spec Log Message: Fix wrong multilib flag for ix86 arch Index: tog-pegasus.spec =================================================================== RCS file: /cvs/extras/rpms/tog-pegasus/F-12/tog-pegasus.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -p -r1.78 -r1.79 --- tog-pegasus.spec 23 Sep 2009 13:36:42 -0000 1.78 +++ tog-pegasus.spec 2 Nov 2009 16:02:21 -0000 1.79 @@ -32,7 +32,7 @@ %define multilib 0 %define bsx '' -%ifarch i386 x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 +%ifarch %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 %define multilib 1 %define bsx -32 %ifarch x86_64 ppc64 s390x sparc64 @@ -41,7 +41,7 @@ %endif Version: 2.9.0 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 2 # Summary: OpenPegasus WBEM Services for Linux @@ -463,6 +463,9 @@ fi %changelog +* Mon Nov 2 2009 Vitezlsav Crhonek - 2:2.9.0-8 +- Fix wrong multilib flag for ix86 arch + * Wed Sep 23 2009 Vitezslav Crhonek - 2:2.9.0-7 - Fix initscript Resolves: #523370 From rdieter at fedoraproject.org Mon Nov 2 16:06:45 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Nov 2009 16:06:45 +0000 (UTC) Subject: rpms/soprano/devel .cvsignore, 1.25, 1.26 soprano.spec, 1.41, 1.42 sources, 1.26, 1.27 Message-ID: <20091102160646.8083011C0086@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/soprano/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26740 Modified Files: .cvsignore soprano.spec sources Log Message: * Mon Nov 02 2009 Rex Dieter - 2.3.67-0.1.20091102 - soprano-2.3.67 (20091102 snapshot) - Provides: soprano-backend-virtuoso Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- .cvsignore 20 Oct 2009 18:41:08 -0000 1.25 +++ .cvsignore 2 Nov 2009 16:06:44 -0000 1.26 @@ -1 +1 @@ -soprano-20091020svn.tar.bz2 +soprano-20091102svn.tar.bz2 Index: soprano.spec =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- soprano.spec 20 Oct 2009 18:50:33 -0000 1.41 +++ soprano.spec 2 Nov 2009 16:06:45 -0000 1.42 @@ -4,12 +4,12 @@ # undef or set to 0 to disable -apidocs for a faster build %define apidocs 1 -%define snap 20091020 +%define snap 20091102 Summary: Qt wrapper API to different RDF storage solutions Name: soprano -Version: 2.3.65 -Release: 0.2.%{snap}%{?dist} +Version: 2.3.67 +Release: 0.1.%{snap}%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -37,6 +37,7 @@ BuildRequires: qt4-doc ## If/When backends are packaged separately #Requires: soprano-backend ## otherwise, +Provides: soprano-backend-virtuoso = %{version}-%{release} Requires: virtuoso-opensource @@ -162,6 +163,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 02 2009 Rex Dieter - 2.3.67-0.1.20091102 +- soprano-2.3.67 (20091102 snapshot) +- Provides: soprano-backend-virtuoso + * Tue Oct 20 2009 Rex Dieter - 2.3.65-0.2.20091020 - soprano-2.3.65 (20091020 snapshot) - Requires: virtuoso-opensource Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- sources 20 Oct 2009 18:41:08 -0000 1.26 +++ sources 2 Nov 2009 16:06:45 -0000 1.27 @@ -1 +1 @@ -30135522011f69d3880446389bb7f628 soprano-20091020svn.tar.bz2 +d8a8f9f2d00f6e1187250d164c49684e soprano-20091102svn.tar.bz2 From ltinkl at fedoraproject.org Mon Nov 2 16:10:38 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 16:10:38 +0000 (UTC) Subject: rpms/kdelibs/F-10 kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch, NONE, 1.1 kdelibs.spec, 1.444, 1.445 Message-ID: <20091102161038.C2FD311C0418@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27837/F-10 Modified Files: kdelibs.spec Added Files: kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch Log Message: fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015) kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch: xmlhttprequest.cpp | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) --- NEW FILE kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch --- Index: khtml/ecma/xmlhttprequest.cpp =================================================================== --- khtml/ecma/xmlhttprequest.cpp (revision 1035538) +++ khtml/ecma/xmlhttprequest.cpp (revision 1035539) @@ -49,7 +49,7 @@ using namespace KJS; using namespace DOM; -// +// ////////////////////// XMLHttpRequest Object //////////////////////// /* Source for XMLHttpRequestProtoTable. @@ -269,7 +269,7 @@ static bool canSetRequestHeader(const QString& name) { static QSet forbiddenHeaders; - + if (forbiddenHeaders.isEmpty()) { static const char* hdrs[] = { "accept-charset", @@ -298,12 +298,12 @@ "transfer-encoding", "unlock", "upgrade", - "via" + "via" }; for (size_t i = 0; i < sizeof(hdrs)/sizeof(char*); ++i) forbiddenHeaders.insert(CaseInsensitiveString(hdrs[i])); } - + return !forbiddenHeaders.contains(name); } @@ -326,9 +326,9 @@ XMLHttpRequest::~XMLHttpRequest() { - if (onLoadListener) + if (onLoadListener) onLoadListener->deref(); - if (onReadyStateChangeListener) + if (onReadyStateChangeListener) onReadyStateChangeListener->deref(); delete qObject; qObject = 0; @@ -412,18 +412,19 @@ return; } + const QString protocol = url.protocol().toLower(); + // Abandon the request when the protocol is other than "http", + // instead of blindly doing a KIO::get on other protocols like file:/. + if (!protocol.startsWith(QLatin1String("http")) && + !protocol.startsWith(QLatin1String("webdav"))) + { + ec = DOMException::INVALID_ACCESS_ERR; + abort(); + return; + } + if (method == "post") { - QString protocol = url.protocol().toLower(); - // Abondon the request when the protocol is other than "http", - // instead of blindly changing it to a "get" request. - if (!protocol.startsWith(QLatin1String("http")) && - !protocol.startsWith(QLatin1String("webdav"))) - { - abort(); - return; - } - // FIXME: determine post encoding correctly by looking in headers // for charset. QByteArray buf = _body.toUtf8(); @@ -580,7 +581,7 @@ ec = DOMException::INVALID_STATE_ERR; return jsString(""); } - + // ### test error flag, return jsNull if (responseHeaders.isEmpty()) { @@ -809,7 +810,7 @@ setDOMException(exec, ec); return ret; } - case XMLHttpRequest::GetResponseHeader: + case XMLHttpRequest::GetResponseHeader: { if (args.size() < 1) return throwError(exec, SyntaxError, "Not enough arguments"); @@ -852,11 +853,11 @@ DOM::NodeImpl* docNode = toNode(args[0]); if (docNode && docNode->isDocumentNode()) { DOM::DocumentImpl *doc = static_cast(docNode); - + try { body = doc->toString().string(); // FIXME: also need to set content type, including encoding! - + } catch(DOM::DOMException&) { return throwError(exec, GeneralError, "Exception serializing document"); } @@ -866,7 +867,7 @@ } request->send(body, ec); - setDOMException(exec, ec); + setDOMException(exec, ec); return jsUndefined(); } case XMLHttpRequest::SetRequestHeader: Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v retrieving revision 1.444 retrieving revision 1.445 diff -u -p -r1.444 -r1.445 --- kdelibs.spec 12 Oct 2009 16:31:14 -0000 1.444 +++ kdelibs.spec 2 Nov 2009 16:10:36 -0000 1.445 @@ -4,7 +4,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdelibs Epoch: 6 @@ -85,6 +85,8 @@ Patch102: kdelibs-4.3.2-kde#1033984.patc # security fix Patch200: kdelibs-4.3.1-CVE-2009-2702.patch +#?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs +Patch201: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch BuildRequires: qt4-devel >= 4.5.0 # qt4%{_?_isa} isn't provided yet -- Rex @@ -210,6 +212,7 @@ format for easy browsing. # security fix %patch200 -p1 -b .CVE-2009-2702 +%patch201 -p0 -b .oCERT-2009-015-xmlhttprequest %build @@ -399,6 +402,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 2 2009 Luk?? Tinkl - 4.3.2-5 +- fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428 + * Mon Oct 12 2009 Luk?? Tinkl - 4.3.2-4 - khtml kpart crasher nr. 2 (rev.1033984) From ltinkl at fedoraproject.org Mon Nov 2 16:10:39 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 16:10:39 +0000 (UTC) Subject: rpms/kdelibs/F-11 kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch, NONE, 1.1 kdelibs.spec, 1.498, 1.499 Message-ID: <20091102161039.D294E11C0418@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27837/F-11 Modified Files: kdelibs.spec Added Files: kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch Log Message: fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015) kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch: xmlhttprequest.cpp | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) --- NEW FILE kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch --- Index: khtml/ecma/xmlhttprequest.cpp =================================================================== --- khtml/ecma/xmlhttprequest.cpp (revision 1035538) +++ khtml/ecma/xmlhttprequest.cpp (revision 1035539) @@ -49,7 +49,7 @@ using namespace KJS; using namespace DOM; -// +// ////////////////////// XMLHttpRequest Object //////////////////////// /* Source for XMLHttpRequestProtoTable. @@ -269,7 +269,7 @@ static bool canSetRequestHeader(const QString& name) { static QSet forbiddenHeaders; - + if (forbiddenHeaders.isEmpty()) { static const char* hdrs[] = { "accept-charset", @@ -298,12 +298,12 @@ "transfer-encoding", "unlock", "upgrade", - "via" + "via" }; for (size_t i = 0; i < sizeof(hdrs)/sizeof(char*); ++i) forbiddenHeaders.insert(CaseInsensitiveString(hdrs[i])); } - + return !forbiddenHeaders.contains(name); } @@ -326,9 +326,9 @@ XMLHttpRequest::~XMLHttpRequest() { - if (onLoadListener) + if (onLoadListener) onLoadListener->deref(); - if (onReadyStateChangeListener) + if (onReadyStateChangeListener) onReadyStateChangeListener->deref(); delete qObject; qObject = 0; @@ -412,18 +412,19 @@ return; } + const QString protocol = url.protocol().toLower(); + // Abandon the request when the protocol is other than "http", + // instead of blindly doing a KIO::get on other protocols like file:/. + if (!protocol.startsWith(QLatin1String("http")) && + !protocol.startsWith(QLatin1String("webdav"))) + { + ec = DOMException::INVALID_ACCESS_ERR; + abort(); + return; + } + if (method == "post") { - QString protocol = url.protocol().toLower(); - // Abondon the request when the protocol is other than "http", - // instead of blindly changing it to a "get" request. - if (!protocol.startsWith(QLatin1String("http")) && - !protocol.startsWith(QLatin1String("webdav"))) - { - abort(); - return; - } - // FIXME: determine post encoding correctly by looking in headers // for charset. QByteArray buf = _body.toUtf8(); @@ -580,7 +581,7 @@ ec = DOMException::INVALID_STATE_ERR; return jsString(""); } - + // ### test error flag, return jsNull if (responseHeaders.isEmpty()) { @@ -809,7 +810,7 @@ setDOMException(exec, ec); return ret; } - case XMLHttpRequest::GetResponseHeader: + case XMLHttpRequest::GetResponseHeader: { if (args.size() < 1) return throwError(exec, SyntaxError, "Not enough arguments"); @@ -852,11 +853,11 @@ DOM::NodeImpl* docNode = toNode(args[0]); if (docNode && docNode->isDocumentNode()) { DOM::DocumentImpl *doc = static_cast(docNode); - + try { body = doc->toString().string(); // FIXME: also need to set content type, including encoding! - + } catch(DOM::DOMException&) { return throwError(exec, GeneralError, "Exception serializing document"); } @@ -866,7 +867,7 @@ } request->send(body, ec); - setDOMException(exec, ec); + setDOMException(exec, ec); return jsUndefined(); } case XMLHttpRequest::SetRequestHeader: Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v retrieving revision 1.498 retrieving revision 1.499 diff -u -p -r1.498 -r1.499 --- kdelibs.spec 12 Oct 2009 16:31:15 -0000 1.498 +++ kdelibs.spec 2 Nov 2009 16:10:38 -0000 1.499 @@ -4,7 +4,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdelibs Epoch: 6 @@ -85,6 +85,8 @@ Patch102: kdelibs-4.3.2-kde#1033984.patc # security fix Patch200: kdelibs-4.3.1-CVE-2009-2702.patch +#?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs +Patch201: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch BuildRequires: qt4-devel >= 4.5.0 # qt4%{_?_isa} isn't provided yet -- Rex @@ -210,6 +212,7 @@ format for easy browsing. # security fix %patch200 -p1 -b .CVE-2009-2702 +%patch201 -p0 -b .oCERT-2009-015-xmlhttprequest %build @@ -399,6 +402,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 2 2009 Luk?? Tinkl - 4.3.2-5 +- fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428 + * Mon Oct 12 2009 Luk?? Tinkl - 4.3.2-4 - khtml kpart crasher nr. 2 (rev.1033984) From ltinkl at fedoraproject.org Mon Nov 2 16:10:40 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 16:10:40 +0000 (UTC) Subject: rpms/kdelibs/F-12 kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch, NONE, 1.1 kdelibs.spec, 1.522, 1.523 Message-ID: <20091102161040.9C1CA11C0418@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27837/F-12 Modified Files: kdelibs.spec Added Files: kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch Log Message: fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015) kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch: xmlhttprequest.cpp | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) --- NEW FILE kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch --- Index: khtml/ecma/xmlhttprequest.cpp =================================================================== --- khtml/ecma/xmlhttprequest.cpp (revision 1035538) +++ khtml/ecma/xmlhttprequest.cpp (revision 1035539) @@ -49,7 +49,7 @@ using namespace KJS; using namespace DOM; -// +// ////////////////////// XMLHttpRequest Object //////////////////////// /* Source for XMLHttpRequestProtoTable. @@ -269,7 +269,7 @@ static bool canSetRequestHeader(const QString& name) { static QSet forbiddenHeaders; - + if (forbiddenHeaders.isEmpty()) { static const char* hdrs[] = { "accept-charset", @@ -298,12 +298,12 @@ "transfer-encoding", "unlock", "upgrade", - "via" + "via" }; for (size_t i = 0; i < sizeof(hdrs)/sizeof(char*); ++i) forbiddenHeaders.insert(CaseInsensitiveString(hdrs[i])); } - + return !forbiddenHeaders.contains(name); } @@ -326,9 +326,9 @@ XMLHttpRequest::~XMLHttpRequest() { - if (onLoadListener) + if (onLoadListener) onLoadListener->deref(); - if (onReadyStateChangeListener) + if (onReadyStateChangeListener) onReadyStateChangeListener->deref(); delete qObject; qObject = 0; @@ -412,18 +412,19 @@ return; } + const QString protocol = url.protocol().toLower(); + // Abandon the request when the protocol is other than "http", + // instead of blindly doing a KIO::get on other protocols like file:/. + if (!protocol.startsWith(QLatin1String("http")) && + !protocol.startsWith(QLatin1String("webdav"))) + { + ec = DOMException::INVALID_ACCESS_ERR; + abort(); + return; + } + if (method == "post") { - QString protocol = url.protocol().toLower(); - // Abondon the request when the protocol is other than "http", - // instead of blindly changing it to a "get" request. - if (!protocol.startsWith(QLatin1String("http")) && - !protocol.startsWith(QLatin1String("webdav"))) - { - abort(); - return; - } - // FIXME: determine post encoding correctly by looking in headers // for charset. QByteArray buf = _body.toUtf8(); @@ -580,7 +581,7 @@ ec = DOMException::INVALID_STATE_ERR; return jsString(""); } - + // ### test error flag, return jsNull if (responseHeaders.isEmpty()) { @@ -809,7 +810,7 @@ setDOMException(exec, ec); return ret; } - case XMLHttpRequest::GetResponseHeader: + case XMLHttpRequest::GetResponseHeader: { if (args.size() < 1) return throwError(exec, SyntaxError, "Not enough arguments"); @@ -852,11 +853,11 @@ DOM::NodeImpl* docNode = toNode(args[0]); if (docNode && docNode->isDocumentNode()) { DOM::DocumentImpl *doc = static_cast(docNode); - + try { body = doc->toString().string(); // FIXME: also need to set content type, including encoding! - + } catch(DOM::DOMException&) { return throwError(exec, GeneralError, "Exception serializing document"); } @@ -866,7 +867,7 @@ } request->send(body, ec); - setDOMException(exec, ec); + setDOMException(exec, ec); return jsUndefined(); } case XMLHttpRequest::SetRequestHeader: Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v retrieving revision 1.522 retrieving revision 1.523 diff -u -p -r1.522 -r1.523 --- kdelibs.spec 12 Oct 2009 16:31:16 -0000 1.522 +++ kdelibs.spec 2 Nov 2009 16:10:40 -0000 1.523 @@ -4,7 +4,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdelibs Epoch: 6 @@ -85,6 +85,8 @@ Patch102: kdelibs-4.3.2-kde#1033984.patc # security fix Patch200: kdelibs-4.3.1-CVE-2009-2702.patch +#?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs +Patch201: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch BuildRequires: qt4-devel >= 4.5.0 # qt4%{_?_isa} isn't provided yet -- Rex @@ -210,6 +212,7 @@ format for easy browsing. # security fix %patch200 -p1 -b .CVE-2009-2702 +%patch201 -p0 -b .oCERT-2009-015-xmlhttprequest %build @@ -399,6 +402,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 2 2009 Luk?? Tinkl - 4.3.2-5 +- fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428 + * Mon Oct 12 2009 Luk?? Tinkl - 4.3.2-4 - khtml kpart crasher nr. 2 (rev.1033984) From mathstuf at fedoraproject.org Mon Nov 2 16:13:10 2009 From: mathstuf at fedoraproject.org (Ben Boeckel) Date: Mon, 2 Nov 2009 16:13:10 +0000 (UTC) Subject: rpms/git-cola/devel 0001-Don-t-ship-forked-simplejson.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 git-cola.spec, 1.11, 1.12 sources, 1.8, 1.9 Message-ID: <20091102161310.A4E4D11C02BA@cvs1.fedora.phx.redhat.com> Author: mathstuf Update of /cvs/pkgs/rpms/git-cola/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29348 Modified Files: .cvsignore git-cola.spec sources Added Files: 0001-Don-t-ship-forked-simplejson.patch Log Message: Update to 1.4.0.1 0001-Don-t-ship-forked-simplejson.patch: MANIFEST.in | 4 ---- 1 file changed, 4 deletions(-) --- NEW FILE 0001-Don-t-ship-forked-simplejson.patch --- >From 20b7f912442f80995bbf2e28691188beaeaf8897 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 2 Nov 2009 10:58:50 -0500 Subject: [PATCH] Don't ship forked simplejson --- MANIFEST.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 1ec617c..8a36047 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,9 +7,6 @@ include darwin/* include jsonpickle/LICENSE include jsonpickle/*.py include jsonpickle/tests/*.py -include simplejson/LICENSE -include simplejson/*.py -include simplejson/tests/*.py include test/*.py include test/Makefile include README -- 1.6.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/git-cola/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 25 Oct 2009 01:15:26 -0000 1.8 +++ .cvsignore 2 Nov 2009 16:13:08 -0000 1.9 @@ -1 +1 @@ -cola-1.4.0-src.tar.gz +cola-1.4.0.1-src.tar.gz Index: git-cola.spec =================================================================== RCS file: /cvs/pkgs/rpms/git-cola/devel/git-cola.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- git-cola.spec 25 Oct 2009 01:15:26 -0000 1.11 +++ git-cola.spec 2 Nov 2009 16:13:08 -0000 1.12 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: git-cola -Version: 1.4.0 +Version: 1.4.0.1 Release: 1%{?dist} Summary: A highly caffeinated git gui @@ -9,6 +9,7 @@ Group: Development/Tools License: GPLv2+ URL: http://cola.tuxfamily.org/ Source0: http://cola.tuxfamily.org/releases/cola-%{version}-src.tar.gz +Patch0: 0001-Don-t-ship-forked-simplejson.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,6 +24,7 @@ BuildRequires: python-sphinx Requires: git Requires: PyQt4 Requires: python-inotify +Requires: python-simplejson %description A sweet, carbonated git gui known for its @@ -31,6 +33,7 @@ sugary flavour and caffeine-inspired fea %prep %setup -q -n cola-%{version} +%patch0 -p1 %build @@ -76,6 +79,10 @@ update-desktop-database &> /dev/null || %changelog +* Mon Nov 02 2009 Ben Boeckel 1.4.0.1-1 +- Update to 1.4.0.1 +- Add patch to not ship simplejson + * Sat Oct 24 2009 Ben Boeckel 1.4.0-1 - Update to 1.4.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/git-cola/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 25 Oct 2009 01:15:26 -0000 1.8 +++ sources 2 Nov 2009 16:13:08 -0000 1.9 @@ -1 +1 @@ -156a8d8f16583a29dc0ead3667024c45 cola-1.4.0-src.tar.gz +e34c959cb2bd5815fd9519eef2e63a81 cola-1.4.0.1-src.tar.gz From steved at fedoraproject.org Mon Nov 2 16:14:06 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Mon, 2 Nov 2009 16:14:06 +0000 (UTC) Subject: rpms/nfs-utils/devel nfs-utils-1.2.0-v4-enoent.patch, NONE, 1.1 nfs-utils.spec, 1.248, 1.249 Message-ID: <20091102161406.9988E11C0086@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29616 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.2.0-v4-enoent.patch Log Message: - v4 mounts will roll back to v3 mounts when the mount fails with ENOENT. nfs-utils-1.2.0-v4-enoent.patch: stropts.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) --- NEW FILE nfs-utils-1.2.0-v4-enoent.patch --- Author: Steve Dickson Date: Tue Oct 20 10:25:34 EDT 2009 Retry v4 mounts with a v3 mount when the version is not explicitly specified and the mount fails with ENOENT. The will help deal with Linux servers that do not automatically export a pseudo root Signed-off-by: Steve Dickson diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c --- nfs-utils-1.2.0/utils/mount/stropts.c.orig 2009-10-20 10:11:03.000000000 -0400 +++ nfs-utils-1.2.0/utils/mount/stropts.c 2009-10-20 10:24:41.000000000 -0400 @@ -613,8 +613,15 @@ static int nfs_try_mount(struct nfsmount if (linux_version_code() > MAKE_VERSION(2, 6, 31)) { errno = 0; result = nfs_try_mount_v4(mi); - if (errno != EPROTONOSUPPORT) - break; + if (errno != EPROTONOSUPPORT) { + /* + * To deal with legacy Linux servers that don't + * automatically export a pseudo root, retry + * ENOENT errors using version 3 + */ + if (errno != ENOENT) + break; + } } case 2: case 3: Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.248 retrieving revision 1.249 diff -u -p -r1.248 -r1.249 --- nfs-utils.spec 26 Oct 2009 13:27:05 -0000 1.248 +++ nfs-utils.spec 2 Nov 2009 16:14:06 -0000 1.249 @@ -31,6 +31,7 @@ Patch105: nfs-utils-1.2.1-rc6.patch Patch106: nfs-utils-1.2.1-rc7.patch Patch200: nfs-utils-1.2.0-v4root-rel7.patch +Patch201: nfs-utils-1.2.0-v4-enoent.patch Group: System Environment/Daemons Provides: exportfs = %{epoch}:%{version}-%{release} @@ -91,6 +92,7 @@ This package also contains the mount.nfs %patch106 -p1 %patch200 -p1 +%patch201 -p1 # Remove .orig files find . -name "*.orig" | xargs rm -f @@ -262,12 +264,14 @@ fi %attr(4755,root,root) /sbin/umount.nfs4 %changelog -* Mon Oct 26 2009 Steve Dickson 1.2.0-17 +* Mon Nov 2 2009 Steve Dickson 1.2.0-17 - Updated to the latest pseudo root release (rel7). - Added upstream 1.2.1-rc7 patch which fixes: - Stop ignoring the -o v4 option (bz 529407) - Allow network protocol roll backs when proto is set in the config file (bz 529864) +- v4 mounts will roll back to v3 mounts when the mount + fails with ENOENT. * Mon Oct 5 2009 Steve Dickson 1.2.0-16 - Fixed a whole where '-o v4' was not overriding the From ltinkl at fedoraproject.org Mon Nov 2 16:18:05 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 16:18:05 +0000 (UTC) Subject: rpms/kdelibs/F-10 kdelibs.spec,1.445,1.446 Message-ID: <20091102161806.42B5811C0297@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30626/F-10 Modified Files: kdelibs.spec Log Message: fix the patch name Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v retrieving revision 1.445 retrieving revision 1.446 diff -u -p -r1.445 -r1.446 --- kdelibs.spec 2 Nov 2009 16:10:36 -0000 1.445 +++ kdelibs.spec 2 Nov 2009 16:18:04 -0000 1.446 @@ -86,7 +86,7 @@ Patch102: kdelibs-4.3.2-kde#1033984.patc # security fix Patch200: kdelibs-4.3.1-CVE-2009-2702.patch #?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs -Patch201: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch +Patch201: kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch BuildRequires: qt4-devel >= 4.5.0 # qt4%{_?_isa} isn't provided yet -- Rex From ltinkl at fedoraproject.org Mon Nov 2 16:18:06 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 16:18:06 +0000 (UTC) Subject: rpms/kdelibs/F-11 kdelibs.spec,1.499,1.500 Message-ID: <20091102161806.4282011C0086@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30626/F-11 Modified Files: kdelibs.spec Log Message: fix the patch name Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v retrieving revision 1.499 retrieving revision 1.500 diff -u -p -r1.499 -r1.500 --- kdelibs.spec 2 Nov 2009 16:10:38 -0000 1.499 +++ kdelibs.spec 2 Nov 2009 16:18:05 -0000 1.500 @@ -86,7 +86,7 @@ Patch102: kdelibs-4.3.2-kde#1033984.patc # security fix Patch200: kdelibs-4.3.1-CVE-2009-2702.patch #?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs -Patch201: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch +Patch201: kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch BuildRequires: qt4-devel >= 4.5.0 # qt4%{_?_isa} isn't provided yet -- Rex From ltinkl at fedoraproject.org Mon Nov 2 16:18:08 2009 From: ltinkl at fedoraproject.org (Lukas Tinkl) Date: Mon, 2 Nov 2009 16:18:08 +0000 (UTC) Subject: rpms/kdelibs/F-12 kdelibs.spec,1.523,1.524 Message-ID: <20091102161808.2EF9311C0086@cvs1.fedora.phx.redhat.com> Author: ltinkl Update of /cvs/extras/rpms/kdelibs/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30626/F-12 Modified Files: kdelibs.spec Log Message: fix the patch name Index: kdelibs.spec =================================================================== RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v retrieving revision 1.523 retrieving revision 1.524 diff -u -p -r1.523 -r1.524 --- kdelibs.spec 2 Nov 2009 16:10:40 -0000 1.523 +++ kdelibs.spec 2 Nov 2009 16:18:05 -0000 1.524 @@ -86,7 +86,7 @@ Patch102: kdelibs-4.3.2-kde#1033984.patc # security fix Patch200: kdelibs-4.3.1-CVE-2009-2702.patch #?fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs -Patch201: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch +Patch201: kdelibs-4.3.3-oCERT-2009-015-xmlhttprequest.patch BuildRequires: qt4-devel >= 4.5.0 # qt4%{_?_isa} isn't provided yet -- Rex From twaugh at fedoraproject.org Mon Nov 2 16:22:15 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 2 Nov 2009 16:22:15 +0000 (UTC) Subject: rpms/hplip/F-11 hplip-hpcups-plugin.patch, NONE, 1.1 hplip.spec, 1.236, 1.237 Message-ID: <20091102162215.D892811C02BC@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32199 Modified Files: hplip.spec Added Files: hplip-hpcups-plugin.patch Log Message: * Mon Nov 2 2009 Tim Waugh 3.9.8-18 - Added 'requires proprietary plugin' to appropriate model names (bug #513283). hplip-hpcups-plugin.patch: hpcups.drv.in | 70 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) --- NEW FILE hplip-hpcups-plugin.patch --- diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin hplip-3.9.8/prnt/drv/hpcups.drv.in --- hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin 2009-11-02 13:47:00.325103235 +0000 +++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-11-02 14:48:00.070102977 +0000 @@ -6659,7 +6659,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1522nf MFP" - Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;" PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" @@ -6723,7 +6723,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035n" - Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" PCFileName "hp-laserjet_p2035n-pcl3.ppd" @@ -6731,7 +6731,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" PCFileName "hp-laserjet_p2035-pcl3.ppd" @@ -6864,7 +6864,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m2727 MFP" - Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m2727 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m2727 mfp;DES:hp laserjet m2727 mfp;" PCFileName "hp-laserjet_m2727_mfp-pcl3.ppd" @@ -7734,7 +7734,7 @@ Manufacturer "HP" // <%LJColor:Normal%> { ModelName "HP Color LaserJet cm1312 MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm1312 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;" PCFileName "hp-color_laserjet_cm1312_mfp-pcl3.ppd" @@ -7742,7 +7742,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm1312nfi MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" @@ -7816,7 +7816,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320 MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;" PCFileName "hp-color_laserjet_cm2320_mfp-pcl3.ppd" @@ -7824,7 +7824,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320fxi MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320fxi MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;" PCFileName "hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd" @@ -7832,7 +7832,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320n MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320n MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;" PCFileName "hp-color_laserjet_cm2320n_mfp-pcl3.ppd" @@ -7840,7 +7840,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320nf MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" @@ -10287,7 +10287,7 @@ Manufacturer "HP" // <%LJZjsMono:Normal%> { ModelName "HP LaserJet 1000" - Attribute "NickName" "" "HP LaserJet 1000, $Version" + Attribute "NickName" "" "HP LaserJet 1000, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1000" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1000;DES:hp laserjet 1000;" PCFileName "hp-laserjet_1000.ppd" @@ -10295,7 +10295,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1005 Series" - Attribute "NickName" "" "HP LaserJet 1005 Series, $Version" + Attribute "NickName" "" "HP LaserJet 1005 Series, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1005 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1005 series;DES:hp laserjet 1005 series;" PCFileName "hp-laserjet_1005_series.ppd" @@ -10303,7 +10303,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1018" - Attribute "NickName" "" "HP LaserJet 1018, $Version" + Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" PCFileName "hp-laserjet_1018.ppd" @@ -10312,7 +10312,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1020" - Attribute "NickName" "" "HP LaserJet 1020, $Version" + Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" PCFileName "hp-laserjet_1020.ppd" @@ -10321,7 +10321,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1022nw" - Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version" + Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1022nw" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022nw;DES:hp laserjet 1022nw;" PCFileName "hp-laserjet_1022nw-zjs.ppd" @@ -10329,7 +10329,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1022n" - Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version" + Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1022n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022n;DES:hp laserjet 1022n;" PCFileName "hp-laserjet_1022n-zjs.ppd" @@ -10338,7 +10338,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1022" - Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version" + Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1022" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022;DES:hp laserjet 1022;" PCFileName "hp-laserjet_1022-zjs.ppd" @@ -10346,7 +10346,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1120 MFP" - Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version" + Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" PCFileName "hp-laserjet_m1120_mfp.ppd" @@ -10354,7 +10354,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1120n MFP" - Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version" + Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120n MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120n mfp;DES:hp laserjet m1120n mfp;" PCFileName "hp-laserjet_m1120n_mfp.ppd" @@ -10362,7 +10362,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1319f MFP" - Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version" + Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" PCFileName "hp-laserjet_m1319f_mfp.ppd" @@ -10370,7 +10370,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035n" - Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version" + Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" PCFileName "hp-laserjet_p2035n-zjs.ppd" @@ -10378,7 +10378,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version" + Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" PCFileName "hp-laserjet_p2035-zjs.ppd" @@ -10498,7 +10498,7 @@ Manufacturer "HP" // <%LJZjsColor:Normal%> { ModelName "HP Color LaserJet cp1215" - Attribute "NickName" "" "HP Color LaserJet cp1215, $Version" + Attribute "NickName" "" "HP Color LaserJet cp1215, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cp1215" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;" PCFileName "hp-color_laserjet_cp1215.ppd" @@ -10506,7 +10506,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet 1600" - Attribute "NickName" "" "HP Color LaserJet 1600, $Version" + Attribute "NickName" "" "HP Color LaserJet 1600, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 1600" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;" PCFileName "hp-color_laserjet_1600.ppd" @@ -10514,7 +10514,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet 2600n" - Attribute "NickName" "" "HP Color LaserJet 2600n, $Version" + Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" PCFileName "hp-color_laserjet_2600n.ppd" @@ -10791,7 +10791,7 @@ Manufacturer "HP" // <%LJm1005:Normal%> { ModelName "HP LaserJet m1005" - Attribute "NickName" "" "HP LaserJet m1005, $Version" + Attribute "NickName" "" "HP LaserJet m1005, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1005" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1005;DES:hp laserjet m1005;" PCFileName "hp-laserjet_m1005.ppd" @@ -10799,7 +10799,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1505n" - Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version" + Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505n;DES:hp laserjet p1505n;" PCFileName "hp-laserjet_p1505n-zxs.ppd" @@ -10807,7 +10807,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1505" - Attribute "NickName" "" "HP LaserJet p1505, $Version" + Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;" PCFileName "hp-laserjet_p1505.ppd" @@ -10815,7 +10815,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2014" - Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version" + Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2014" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014;DES:hp laserjet p2014;" PCFileName "hp-laserjet_p2014-zxs.ppd" @@ -10823,7 +10823,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2014n" - Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version" + Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2014n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014n;DES:hp laserjet p2014n;" PCFileName "hp-laserjet_p2014n-zxs.ppd" @@ -10941,7 +10941,7 @@ Manufacturer "HP" // <%LJP1XXX:Normal%> { ModelName "HP LaserJet p1005" - Attribute "NickName" "" "HP LaserJet p1005, $Version" + Attribute "NickName" "" "HP LaserJet p1005, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1005" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;" PCFileName "hp-laserjet_p1005.ppd" @@ -10949,7 +10949,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1006" - Attribute "NickName" "" "HP LaserJet p1006, $Version" + Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" PCFileName "hp-laserjet_p1006.ppd" @@ -10957,7 +10957,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1007" - Attribute "NickName" "" "HP LaserJet p1007, $Version" + Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" PCFileName "hp-laserjet_p1007.ppd" @@ -10965,7 +10965,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1008" - Attribute "NickName" "" "HP LaserJet p1008, $Version" + Attribute "NickName" "" "HP LaserJet p1008, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1008" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1008;DES:hp laserjet p1008;" PCFileName "hp-laserjet_p1008.ppd" @@ -10973,7 +10973,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1009" - Attribute "NickName" "" "HP LaserJet p1009, $Version" + Attribute "NickName" "" "HP LaserJet p1009, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1009" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1009;DES:hp laserjet p1009;" PCFileName "hp-laserjet_p1009.ppd" Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v retrieving revision 1.236 retrieving revision 1.237 diff -u -p -r1.236 -r1.237 --- hplip.spec 29 Oct 2009 12:23:26 -0000 1.236 +++ hplip.spec 2 Nov 2009 16:22:15 -0000 1.237 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -28,6 +28,7 @@ Patch11: hplip-device-reconnected.patch Patch12: hplip-retry-open.patch Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch +Patch15: hplip-hpcups-plugin.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -160,6 +161,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe +# Added 'requires proprietary plugin' to appropriate model names +# (bug #513283). +%patch15 -p1 -b .hpcups-plugin + %build aclocal automake --foreign --add-missing --copy @@ -377,6 +382,10 @@ fi exit 0 %changelog +* Mon Nov 2 2009 Tim Waugh 3.9.8-18 +- Added 'requires proprietary plugin' to appropriate model names + (bug #513283). + * Thu Oct 29 2009 Tim Waugh 3.9.8-17 - Avoid busy loop in hpcups when backend has exited (bug #525944). From rdieter at fedoraproject.org Mon Nov 2 16:25:43 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Nov 2009 16:25:43 +0000 (UTC) Subject: rpms/kipi-plugins/F-12 kipi-plugins.spec,1.102,1.103 Message-ID: <20091102162543.DF3E111C0086@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kipi-plugins/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv745/F-12 Modified Files: kipi-plugins.spec Log Message: fix shwup, BR: qca2-devel Index: kipi-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/F-12/kipi-plugins.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -p -r1.102 -r1.103 --- kipi-plugins.spec 2 Nov 2009 15:31:14 -0000 1.102 +++ kipi-plugins.spec 2 Nov 2009 16:25:43 -0000 1.103 @@ -35,6 +35,8 @@ BuildRequires: libxslt-devel BuildRequires: expat-devel ## RemoveRedeye BuildRequires: opencv-devel +## Shwup +BuildRequires: qca2-devel # when -libs split happened Obsoletes: kipi-plugins < 0.7.0 From rdieter at fedoraproject.org Mon Nov 2 16:25:43 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Nov 2009 16:25:43 +0000 (UTC) Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.102,1.103 Message-ID: <20091102162544.2461111C0297@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kipi-plugins/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv745/devel Modified Files: kipi-plugins.spec Log Message: fix shwup, BR: qca2-devel Index: kipi-plugins.spec =================================================================== RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -p -r1.102 -r1.103 --- kipi-plugins.spec 2 Nov 2009 15:31:13 -0000 1.102 +++ kipi-plugins.spec 2 Nov 2009 16:25:42 -0000 1.103 @@ -35,6 +35,8 @@ BuildRequires: libxslt-devel BuildRequires: expat-devel ## RemoveRedeye BuildRequires: opencv-devel +## Shwup +BuildRequires: qca2-devel # when -libs split happened Obsoletes: kipi-plugins < 0.7.0 From tbzatek at fedoraproject.org Mon Nov 2 16:28:52 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Nov 2009 16:28:52 +0000 (UTC) Subject: rpms/nautilus/F-12 nautilus-2.28.2-infopanel-selection-crash.patch, NONE, 1.1 nautilus.spec, 1.291, 1.292 Message-ID: <20091102162852.C43AA11C0086@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/nautilus/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1731 Modified Files: nautilus.spec Added Files: nautilus-2.28.2-infopanel-selection-crash.patch Log Message: * Mon Nov 2 2009 Tomas Bzatek - 2.28.1-2 - Don't crash in infopanel on invalid selection (#531826) nautilus-2.28.2-infopanel-selection-crash.patch: nautilus-information-panel.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- NEW FILE nautilus-2.28.2-infopanel-selection-crash.patch --- >From b10717e1634128f08009c11f0a570888ee314350 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mon, 2 Nov 2009 17:10:47 +0100 Subject: [PATCH] Fall back to display parent folder info when selection is invalid See bug 590591. --- src/nautilus-information-panel.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index ce162ef..03e398b 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -1114,15 +1114,20 @@ selection_changed_callback (NautilusWindowInfo *window, selection = nautilus_window_info_get_selection (window); selection_count = g_list_length (selection); + file = NULL; + if (selection_count == 1) { selection = nautilus_window_info_get_selection (window); selected = selection->data; - /* this should never fail here, as we're displaying the file */ + /* FIXME: in some cases we're unable to get a NautilusFile + for the selected file. See bug 590591 for details. */ file = nautilus_file_get_existing (selected); + } + + if (file) { uri = nautilus_file_get_uri (file); name = nautilus_file_get_display_name (file); - nautilus_file_unref (file); } else { uri = nautilus_window_info_get_current_location (window); -- 1.6.5.1 Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/F-12/nautilus.spec,v retrieving revision 1.291 retrieving revision 1.292 diff -u -p -r1.291 -r1.292 --- nautilus.spec 21 Oct 2009 13:56:13 -0000 1.291 +++ nautilus.spec 2 Nov 2009 16:28:52 -0000 1.292 @@ -15,7 +15,7 @@ Name: nautilus Summary: File manager for GNOME Version: 2.28.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2 @@ -90,6 +90,12 @@ Patch17: nautilus-filetype-symlink-fix.p # Need to file upstream and investigate a real fix Patch18: nautilus-2.28.0-revert-bg-fade-break.patch +# nautilus crashed with SIGSEGV in nautilus_file_peek_display_name() +# https://bugzilla.gnome.org/show_bug.cgi?id=590591 +# https://bugzilla.redhat.com/show_bug.cgi?id=531826 +# TODO: push upstream once confirmed as fixed +Patch19: nautilus-2.28.2-infopanel-selection-crash.patch + %description Nautilus is the file manager and graphical shell for the GNOME desktop @@ -129,6 +135,7 @@ for developing nautilus extensions. %patch10 -p1 -b .gvfs-desktop-key %patch17 -p0 -b .symlink %patch18 -p1 -b .revert-bg-fade-break +%patch19 -p1 -b .infopanel-crash %build @@ -264,6 +271,9 @@ fi %changelog +* Mon Nov 2 2009 Tomas Bzatek - 2.28.1-2 +- Don't crash in infopanel on invalid selection (#531826) + * Wed Oct 21 2009 Tomas Bzatek - 2.28.1-1 - Update to 2.28.1 From tbzatek at fedoraproject.org Mon Nov 2 16:33:13 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Nov 2009 16:33:13 +0000 (UTC) Subject: rpms/nautilus/devel nautilus-2.28.1-dynamic-search.patch, NONE, 1.1 nautilus-2.28.1-tracker-0.7-failed-connection.patch, NONE, 1.1 nautilus-2.28.2-infopanel-selection-crash.patch, NONE, 1.1 .cvsignore, 1.101, 1.102 nautilus.spec, 1.290, 1.291 sources, 1.106, 1.107 Message-ID: <20091102163313.D316E11C0338@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/nautilus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2995 Modified Files: .cvsignore nautilus.spec sources Added Files: nautilus-2.28.1-dynamic-search.patch nautilus-2.28.1-tracker-0.7-failed-connection.patch nautilus-2.28.2-infopanel-selection-crash.patch Log Message: Sync with F12 nautilus-2.28.1-dynamic-search.patch: configure.in | 62 -------- libnautilus-private/Makefile.am | 20 -- libnautilus-private/nautilus-search-engine-beagle.c | 132 +++++++++++++++++ libnautilus-private/nautilus-search-engine-tracker.c | 142 +++++++++++++++---- libnautilus-private/nautilus-search-engine.c | 5 5 files changed, 248 insertions(+), 113 deletions(-) --- NEW FILE nautilus-2.28.1-dynamic-search.patch --- >From 62ec35a733aee0a7ce7a820027e8507183ac212d Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Wed, 21 Oct 2009 15:23:26 +0200 Subject: [PATCH] Load beagle/tracker at runtime Dynamically load beagle and tracker client libraries on demand if available. This allows more flexibility for packagers and users. See bug 589345 for details. --- configure.in | 62 --------- libnautilus-private/Makefile.am | 20 +--- .../nautilus-search-engine-beagle.c | 132 ++++++++++++++++++- .../nautilus-search-engine-tracker.c | 142 ++++++++++++++++---- libnautilus-private/nautilus-search-engine.c | 4 - 5 files changed, 248 insertions(+), 112 deletions(-) diff --git a/configure.in b/configure.in index 45f0b26..866e8f3 100644 --- a/configure.in +++ b/configure.in @@ -195,66 +195,6 @@ if test "x$enable_xmp" != "xno"; then fi dnl ========================================================================== -dnl search implementations -dnl **************************** - -AM_CONDITIONAL(HAVE_TRACKER, false) - -dnl libtracker checking - -AC_ARG_ENABLE(tracker, - AC_HELP_STRING([--disable-tracker], - [build without tracker support])) -msg_tracker=no -if test "x$enable_tracker" != "xno"; then - PKG_CHECK_MODULES(TRACKER, tracker-client-0.7, [ - AM_CONDITIONAL(HAVE_TRACKER, true) - AC_DEFINE(HAVE_TRACKER, 1, [Define to enable tracker support]) - AC_DEFINE(HAVE_TRACKER_0_7, 1, [Define to enable tracker support]) - ] - msg_tracker=yes, - [ - PKG_CHECK_MODULES(TRACKER, tracker >= tracker_minver, [ - AM_CONDITIONAL(HAVE_TRACKER, true) - AC_DEFINE(HAVE_TRACKER, 1, [Define to enable tracker support]) - ] - msg_tracker=yes, - [AM_CONDITIONAL(HAVE_TRACKER, false)]) - ]) - AC_SUBST(TRACKER_CFLAGS) - AC_SUBST(TRACKER_LIBS) -fi - -dnl ========================================================================== - - -AM_CONDITIONAL(HAVE_BEAGLE, false) - -dnl libbeagle checking - -AC_ARG_ENABLE(beagle, - AC_HELP_STRING([--disable-beagle], - [build without beagle support])) -msg_beagle=no -if test "x$enable_beagle" != "xno"; then - BEAGLE_PKGCONFIG= - if $PKG_CONFIG --exists libbeagle-1.0; then - BEAGLE_PKGCONFIG=libbeagle-1.0 - else - BEAGLE_PKGCONFIG=libbeagle-0.0 - fi - - PKG_CHECK_MODULES(BEAGLE, $BEAGLE_PKGCONFIG >= beagle_minver, [ - AM_CONDITIONAL(HAVE_BEAGLE, true) - AC_DEFINE(HAVE_BEAGLE, 1, [Define to enable beagle support]) - ] - msg_beagle=yes, - [AM_CONDITIONAL(HAVE_BEAGLE, false)]) - AC_SUBST(BEAGLE_CFLAGS) - AC_SUBST(BEAGLE_LIBS) -fi - -dnl ========================================================================== dnl **************************** dnl *** Check for libselinux *** @@ -470,8 +410,6 @@ nautilus-$VERSION: prefix: ${prefix} source code location: ${srcdir} compiler: ${CC} - tracker support: $msg_tracker - beagle support: $msg_beagle xmp support: $msg_xmp PackageKit support: $msg_packagekit diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am index e831d43..0f817fc 100644 --- a/libnautilus-private/Makefile.am +++ b/libnautilus-private/Makefile.am @@ -154,6 +154,10 @@ libnautilus_private_la_SOURCES = \ nautilus-search-engine.h \ nautilus-search-engine-simple.c \ nautilus-search-engine-simple.h \ + nautilus-search-engine-beagle.c \ + nautilus-search-engine-beagle.h \ + nautilus-search-engine-tracker.c \ + nautilus-search-engine-tracker.h \ nautilus-sidebar-provider.c \ nautilus-sidebar-provider.h \ nautilus-sidebar.c \ @@ -195,22 +199,6 @@ libnautilus_private_la_SOURCES = \ nautilus-window-slot-info.h \ $(NULL) -BEAGLE_SOURCES = \ - nautilus-search-engine-beagle.c \ - nautilus-search-engine-beagle.h - -if HAVE_BEAGLE -libnautilus_private_la_SOURCES += $(BEAGLE_SOURCES) -endif - -TRACKER_SOURCES = \ - nautilus-search-engine-tracker.c \ - nautilus-search-engine-tracker.h - -if HAVE_TRACKER -libnautilus_private_la_SOURCES += $(TRACKER_SOURCES) -endif - $(lib_LTLIBRARIES): $(dependency_static_libs) nautilus-marshal.h: nautilus-marshal.list $(GLIB_GENMARSHAL) diff --git a/libnautilus-private/nautilus-search-engine-beagle.c b/libnautilus-private/nautilus-search-engine-beagle.c index 3ab6507..930923f 100644 --- a/libnautilus-private/nautilus-search-engine-beagle.c +++ b/libnautilus-private/nautilus-search-engine-beagle.c @@ -23,10 +23,20 @@ #include #include "nautilus-search-engine-beagle.h" -#include #include #include +#include + +typedef struct _BeagleHit BeagleHit; +typedef struct _BeagleQuery BeagleQuery; +typedef struct _BeagleClient BeagleClient; +typedef struct _BeagleRequest BeagleRequest; +typedef struct _BeagleFinishedResponse BeagleFinishedResponse; +typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse; +typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty; +typedef struct _BeagleQueryPart BeagleQueryPart; +typedef struct _BeagleHitsSubtractedResponse BeagleHitsSubtractedResponse; struct NautilusSearchEngineBeagleDetails { BeagleClient *client; @@ -37,6 +47,121 @@ struct NautilusSearchEngineBeagleDetails { gboolean query_finished; }; +/* We dlopen() all the following from libbeagle at runtime */ +#define BEAGLE_HIT(x) ((BeagleHit *)(x)) +#define BEAGLE_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_request_get_type(), BeagleRequest)) +#define BEAGLE_QUERY_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_query_part_get_type(), BeagleQueryPart)) + +typedef enum { + BEAGLE_QUERY_PART_LOGIC_REQUIRED = 1, + BEAGLE_QUERY_PART_LOGIC_PROHIBITED = 2 +} BeagleQueryPartLogic; + +typedef enum { + BEAGLE_PROPERTY_TYPE_UNKNOWN = 0, + BEAGLE_PROPERTY_TYPE_TEXT = 1, + BEAGLE_PROPERTY_TYPE_KEYWORD = 2, + BEAGLE_PROPERTY_TYPE_DATE = 3, + BEAGLE_PROPERTY_TYPE_LAST = 4 +} BeaglePropertyType; + +/* *static* wrapper function pointers */ +static gboolean (*beagle_client_send_request_async) (BeagleClient *client, + BeagleRequest *request, + GError **err) = NULL; +static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL; +static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL; +static BeagleQuery *(*beagle_query_new) (void) = NULL; +static void (*beagle_query_add_text) (BeagleQuery *query, + const char *str) = NULL; +static BeagleQueryPartProperty *(*beagle_query_part_property_new) (void) = NULL; +static void (*beagle_query_part_set_logic) (BeagleQueryPart *part, + BeagleQueryPartLogic logic) = NULL; +static void (*beagle_query_part_property_set_key) (BeagleQueryPartProperty *part, + const char *key) = NULL; +static void (*beagle_query_part_property_set_value) (BeagleQueryPartProperty *part, + const char * value) = NULL; +static void (*beagle_query_part_property_set_property_type) (BeagleQueryPartProperty *part, + BeaglePropertyType prop_type) = NULL; +static void (*beagle_query_add_part) (BeagleQuery *query, + BeagleQueryPart *part) = NULL; +static GType (*beagle_request_get_type) (void) = NULL; +static GType (*beagle_query_part_get_type) (void) = NULL; +static gboolean (*beagle_util_daemon_is_running) (void) = NULL; +static BeagleClient *(*beagle_client_new_real) (const char *client_name) = NULL; +static void (*beagle_query_set_max_hits) (BeagleQuery *query, + int max_hits) = NULL; +static GSList *(*beagle_hits_subtracted_response_get_uris) (BeagleHitsSubtractedResponse *response) = NULL; + +static struct BeagleDlMapping +{ + const char *fn_name; + gpointer *fn_ptr_ref; +} beagle_dl_mapping[] = +{ +#define MAP(a) { #a, (gpointer *)&a } + MAP (beagle_client_send_request_async), + MAP (beagle_hit_get_uri), + MAP (beagle_hits_added_response_get_hits), + MAP (beagle_query_new), + MAP (beagle_query_add_text), + MAP (beagle_query_part_property_new), + MAP (beagle_query_part_set_logic), + MAP (beagle_query_part_property_set_key), + MAP (beagle_query_part_property_set_value), + MAP (beagle_query_part_property_set_property_type), + MAP (beagle_query_add_part), + MAP (beagle_request_get_type), + MAP (beagle_query_part_get_type), + MAP (beagle_util_daemon_is_running), + MAP (beagle_query_set_max_hits), + MAP (beagle_hits_subtracted_response_get_uris), +#undef MAP + { "beagle_client_new", (gpointer *)&beagle_client_new_real }, +}; + +static void +open_libbeagle (void) +{ + static gboolean done = FALSE; + + if (!done) + { + int i; + GModule *beagle; + + done = TRUE; + + beagle = g_module_open ("libbeagle.so.1", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + if (!beagle) + return; + + for (i = 0; i < G_N_ELEMENTS (beagle_dl_mapping); i++) + { + if (!g_module_symbol (beagle, beagle_dl_mapping[i].fn_name, + beagle_dl_mapping[i].fn_ptr_ref)) + { + g_warning ("Missing symbol '%s' in libbeagle\n", + beagle_dl_mapping[i].fn_name); + g_module_close (beagle); + + for (i = 0; i < G_N_ELEMENTS (beagle_dl_mapping); i++) + beagle_dl_mapping[i].fn_ptr_ref = NULL; + + return; + } + } + } +} + +static BeagleClient * +beagle_client_new (const char *client_name) +{ + if (beagle_client_new_real) + return beagle_client_new_real (client_name); + + return NULL; +} static void nautilus_search_engine_beagle_class_init (NautilusSearchEngineBeagleClass *class); static void nautilus_search_engine_beagle_init (NautilusSearchEngineBeagle *engine); @@ -276,8 +401,11 @@ nautilus_search_engine_beagle_new (void) { NautilusSearchEngineBeagle *engine; BeagleClient *client; + + open_libbeagle (); - if (!beagle_util_daemon_is_running ()) { + if (beagle_util_daemon_is_running == NULL || + !beagle_util_daemon_is_running ()) { /* check whether daemon is running as beagle_client_new * doesn't fail when a stale socket file exists */ return NULL; diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c index eec8d74..ff1e2d3 100644 --- a/libnautilus-private/nautilus-search-engine-tracker.c +++ b/libnautilus-private/nautilus-search-engine-tracker.c @@ -25,13 +25,103 @@ #include "nautilus-search-engine-tracker.h" #include #include +#include + + +typedef struct _TrackerClient TrackerClient; + +typedef void (*TrackerArrayReply) (char **result, GError *error, gpointer user_data); + +static TrackerClient * (*tracker_connect) (gboolean enable_warnings) = NULL; +static TrackerClient * (*tracker_connect_07) (gboolean enable_warnings, + gint timeout) = NULL; +static void (*tracker_disconnect) (TrackerClient *client) = NULL; +static void (*tracker_cancel_last_call) (TrackerClient *client) = NULL; +static int (*tracker_get_version) (TrackerClient *client, GError **error) = NULL; + + +static void (*tracker_search_metadata_by_text_async) (TrackerClient *client, + const char *query, + TrackerArrayReply callback, + gpointer user_data) = NULL; +static void (*tracker_search_metadata_by_text_and_mime_async) (TrackerClient *client, + const char *query, + const char **mimes, + TrackerArrayReply callback, + gpointer user_data) = NULL; +static void (*tracker_search_metadata_by_text_and_location_async) (TrackerClient *client, + const char *query, + const char *location, + TrackerArrayReply callback, + gpointer user_data) = NULL; +static void (*tracker_search_metadata_by_text_and_mime_and_location_async) (TrackerClient *client, + const char *query, + const char **mimes, + const char *location, + TrackerArrayReply callback, + gpointer user_data) = NULL; + +static struct TrackerDlMapping { + const char *fn_name; + gpointer *fn_ptr_ref; + gboolean mandatory; +} tracker_dl_mapping[] = +{ +#define MAP(a, b) { #a, (gpointer *)&a, b } + MAP (tracker_connect, TRUE), + MAP (tracker_disconnect, TRUE), + MAP (tracker_cancel_last_call, TRUE), + MAP (tracker_search_metadata_by_text_async, TRUE), + MAP (tracker_search_metadata_by_text_and_mime_async, TRUE), + MAP (tracker_search_metadata_by_text_and_location_async, TRUE), + MAP (tracker_search_metadata_by_text_and_mime_and_location_async, TRUE), + MAP (tracker_get_version, FALSE) +#undef MAP +}; + +static gboolean tracker_07; -#ifdef HAVE_TRACKER_0_7 -#include -#else -#include -#endif +static void +open_libtracker (void) +{ + static gboolean done = FALSE; + + if (! done) { + int i; + GModule *tracker; + + done = TRUE; + tracker_07 = TRUE; + tracker_connect_07 = NULL; + + tracker = g_module_open ("libtracker-client-0.7.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + if (! tracker) { + tracker = g_module_open ("libtrackerclient.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + tracker_07 = FALSE; + } + if (! tracker) + return; + + for (i = 0; i < G_N_ELEMENTS (tracker_dl_mapping); i++) { + if (! g_module_symbol (tracker, tracker_dl_mapping[i].fn_name, + tracker_dl_mapping[i].fn_ptr_ref) && + tracker_dl_mapping[i].mandatory) { + g_warning ("Missing symbol '%s' in libtracker\n", + tracker_dl_mapping[i].fn_name); + g_module_close (tracker); + + for (i = 0; i < G_N_ELEMENTS (tracker_dl_mapping); i++) + tracker_dl_mapping[i].fn_ptr_ref = NULL; + + return; + } + } + if (tracker_07) { + tracker_connect_07 = (gpointer)tracker_connect; + } + } +} struct NautilusSearchEngineTrackerDetails { @@ -96,11 +186,7 @@ search_callback (char **results, GError *error, gpointer user_data) char *uri; -#ifdef HAVE_TRACKER_0_7 - uri = g_strdup ((char *)*results_p); -#else - uri = g_filename_to_uri ((char *)*results_p, NULL, NULL); -#endif + uri = tracker_07 ? g_strdup ((char *)*results_p) : g_filename_to_uri ((char *)*results_p, NULL, NULL); if (uri) { hit_uris = g_list_prepend (hit_uris, (char *)uri); } @@ -139,11 +225,7 @@ nautilus_search_engine_tracker_start (NautilusSearchEngine *engine) location_uri = nautilus_query_get_location (tracker->details->query); if (location_uri) { -#ifdef HAVE_TRACKER_0_7 - location = g_strdup (location_uri); -#else - location = g_filename_from_uri (location_uri, NULL, NULL); -#endif + location = tracker_07 ? g_strdup (location_uri) : g_filename_from_uri (location_uri, NULL, NULL); g_free (location_uri); } else { location = NULL; @@ -271,27 +353,31 @@ nautilus_search_engine_tracker_new (void) NautilusSearchEngineTracker *engine; TrackerClient *tracker_client; -#ifdef HAVE_TRACKER_0_7 - tracker_client = tracker_connect (FALSE, -1); -#else - tracker_client = tracker_connect (FALSE); -#endif + open_libtracker (); + + if (! tracker_connect) + return NULL; + + if (tracker_07) + tracker_client = tracker_connect_07 (FALSE, -1); + else + tracker_client = tracker_connect (FALSE); if (!tracker_client) { return NULL; } -#ifndef HAVE_TRACKER_0_7 - GError *err = NULL; + if (! tracker_07) { + GError *err = NULL; - tracker_get_version (tracker_client, &err); + tracker_get_version (tracker_client, &err); - if (err != NULL) { - g_error_free (err); - tracker_disconnect (tracker_client); - return NULL; + if (err != NULL) { + g_error_free (err); + tracker_disconnect (tracker_client); + return NULL; + } } -#endif engine = g_object_new (NAUTILUS_TYPE_SEARCH_ENGINE_TRACKER, NULL); diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c index 2030d95..d225237 100644 --- a/libnautilus-private/nautilus-search-engine.c +++ b/libnautilus-private/nautilus-search-engine.c @@ -126,19 +126,15 @@ nautilus_search_engine_new (void) { NautilusSearchEngine *engine; -#ifdef HAVE_BEAGLE engine = nautilus_search_engine_beagle_new (); if (engine) { return engine; } -#endif -#ifdef HAVE_TRACKER engine = nautilus_search_engine_tracker_new (); if (engine) { return engine; } -#endif engine = nautilus_search_engine_simple_new (); return engine; -- 1.6.5.rc2 nautilus-2.28.1-tracker-0.7-failed-connection.patch: nautilus-search-engine-tracker.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) --- NEW FILE nautilus-2.28.1-tracker-0.7-failed-connection.patch --- >From 2a1c0cca80bb8a910c0026e0eab1f16c6e4c845b Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 20 Oct 2009 17:01:55 +0200 Subject: [PATCH] Handle failed connection to tracker daemon 0.7 series Also, consolidate string memory management, to be consistent and clear on a first sight. Related to changes in bug 596082. --- .../nautilus-search-engine-tracker.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c index 3d2b465..eec8d74 100644 --- a/libnautilus-private/nautilus-search-engine-tracker.c +++ b/libnautilus-private/nautilus-search-engine-tracker.c @@ -97,7 +97,7 @@ search_callback (char **results, GError *error, gpointer user_data) char *uri; #ifdef HAVE_TRACKER_0_7 - uri = *results_p; + uri = g_strdup ((char *)*results_p); #else uri = g_filename_to_uri ((char *)*results_p, NULL, NULL); #endif @@ -109,12 +109,7 @@ search_callback (char **results, GError *error, gpointer user_data) nautilus_search_engine_hits_added (NAUTILUS_SEARCH_ENGINE (tracker), hit_uris); nautilus_search_engine_finished (NAUTILUS_SEARCH_ENGINE (tracker)); g_strfreev (results); -#ifdef HAVE_TRACKER_0_7 - g_list_free (hit_uris); -#else eel_g_list_free_deep (hit_uris); -#endif - } @@ -145,11 +140,11 @@ nautilus_search_engine_tracker_start (NautilusSearchEngine *engine) if (location_uri) { #ifdef HAVE_TRACKER_0_7 - location = location_uri; + location = g_strdup (location_uri); #else location = g_filename_from_uri (location_uri, NULL, NULL); - g_free (location_uri); #endif + g_free (location_uri); } else { location = NULL; } @@ -279,14 +274,16 @@ nautilus_search_engine_tracker_new (void) #ifdef HAVE_TRACKER_0_7 tracker_client = tracker_connect (FALSE, -1); #else - GError *err = NULL; - - tracker_client = tracker_connect (FALSE); + tracker_client = tracker_connect (FALSE); +#endif if (!tracker_client) { return NULL; } +#ifndef HAVE_TRACKER_0_7 + GError *err = NULL; + tracker_get_version (tracker_client, &err); if (err != NULL) { -- 1.6.5.rc2 nautilus-2.28.2-infopanel-selection-crash.patch: nautilus-information-panel.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- NEW FILE nautilus-2.28.2-infopanel-selection-crash.patch --- >From b10717e1634128f08009c11f0a570888ee314350 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mon, 2 Nov 2009 17:10:47 +0100 Subject: [PATCH] Fall back to display parent folder info when selection is invalid See bug 590591. --- src/nautilus-information-panel.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index ce162ef..03e398b 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -1114,15 +1114,20 @@ selection_changed_callback (NautilusWindowInfo *window, selection = nautilus_window_info_get_selection (window); selection_count = g_list_length (selection); + file = NULL; + if (selection_count == 1) { selection = nautilus_window_info_get_selection (window); selected = selection->data; - /* this should never fail here, as we're displaying the file */ + /* FIXME: in some cases we're unable to get a NautilusFile + for the selected file. See bug 590591 for details. */ file = nautilus_file_get_existing (selected); + } + + if (file) { uri = nautilus_file_get_uri (file); name = nautilus_file_get_display_name (file); - nautilus_file_unref (file); } else { uri = nautilus_window_info_get_current_location (window); -- 1.6.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v retrieving revision 1.101 retrieving revision 1.102 diff -u -p -r1.101 -r1.102 --- .cvsignore 21 Sep 2009 15:22:59 -0000 1.101 +++ .cvsignore 2 Nov 2009 16:33:11 -0000 1.102 @@ -1 +1 @@ -nautilus-2.28.0.tar.bz2 +nautilus-2.28.1.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.290 retrieving revision 1.291 diff -u -p -r1.290 -r1.291 --- nautilus.spec 24 Sep 2009 14:13:31 -0000 1.290 +++ nautilus.spec 2 Nov 2009 16:33:12 -0000 1.291 @@ -14,8 +14,8 @@ Name: nautilus Summary: File manager for GNOME -Version: 2.28.0 -Release: 3%{?dist} +Version: 2.28.1 +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2 @@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version Requires: gamin Requires: filesystem >= 2.1.1-1 Requires: redhat-menus >= %{redhat_menus_version} -Requires: gvfs >= 1.0.3 +Requires: gvfs >= 1.4.0 Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: libexif >= %{libexif_version} %ifnarch s390 s390x @@ -72,10 +72,12 @@ Obsoletes: gnome-volume-manager < 2 # Some changes to default config Patch1: nautilus-config.patch -Patch5: nautilus-2.23.5-selinux.patch +Patch4: nautilus-2.23.5-selinux.patch -# Why is this not upstream ? -Patch6: nautilus-2.23.5-dynamic-search.patch +# from upstream +Patch5: nautilus-2.28.1-tracker-0.7-failed-connection.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=589345 +Patch6: nautilus-2.28.1-dynamic-search.patch Patch7: rtl-fix.patch #Patch8: nautilus-2.22.1-hide-white-screen.patch @@ -88,8 +90,12 @@ Patch17: nautilus-filetype-symlink-fix.p # Need to file upstream and investigate a real fix Patch18: nautilus-2.28.0-revert-bg-fade-break.patch -# from upstream -Patch19: nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch +# nautilus crashed with SIGSEGV in nautilus_file_peek_display_name() +# https://bugzilla.gnome.org/show_bug.cgi?id=590591 +# https://bugzilla.redhat.com/show_bug.cgi?id=531826 +# TODO: push upstream once confirmed as fixed +Patch19: nautilus-2.28.2-infopanel-selection-crash.patch + %description Nautilus is the file manager and graphical shell for the GNOME desktop @@ -121,14 +127,15 @@ for developing nautilus extensions. %setup -q -n %{name}-%{version} %patch1 -p1 -b .config -%patch5 -p1 -b .selinux +%patch4 -p1 -b .selinux +%patch5 -p1 -b .tracker-0.7 %patch6 -p1 -b .dynamic-search %patch7 -p1 -b .rtl-fix # %patch8 -p1 -b .hide-white-screen %patch10 -p1 -b .gvfs-desktop-key %patch17 -p0 -b .symlink %patch18 -p1 -b .revert-bg-fade-break -%patch19 -p1 -b .mount-do-not-use-activation-uri +%patch19 -p1 -b .infopanel-crash %build @@ -264,6 +271,12 @@ fi %changelog +* Mon Nov 2 2009 Tomas Bzatek - 2.28.1-2 +- Don't crash in infopanel on invalid selection (#531826) + +* Wed Oct 21 2009 Tomas Bzatek - 2.28.1-1 +- Update to 2.28.1 + * Thu Sep 24 2009 Matthias Clasen - 2.28.0-3 - Avoid lingering menuitems (#518570) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus/devel/sources,v retrieving revision 1.106 retrieving revision 1.107 diff -u -p -r1.106 -r1.107 --- sources 21 Sep 2009 15:22:59 -0000 1.106 +++ sources 2 Nov 2009 16:33:12 -0000 1.107 @@ -1 +1 @@ -14d9464043848eddd0bd0d35bbe63415 nautilus-2.28.0.tar.bz2 +e759af11a0844828e2b484ff42ee0498 nautilus-2.28.1.tar.bz2 From twaugh at fedoraproject.org Mon Nov 2 16:36:25 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 2 Nov 2009 16:36:25 +0000 (UTC) Subject: rpms/hplip/F-12 hplip-hpcups-plugin.patch, NONE, 1.1 hplip.spec, 1.244, 1.245 Message-ID: <20091102163625.60F8011C0086@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3973 Modified Files: hplip.spec Added Files: hplip-hpcups-plugin.patch Log Message: * Mon Nov 2 2009 Tim Waugh 3.9.8-21 - Added 'requires proprietary plugin' to appropriate model names (bug #513283). hplip-hpcups-plugin.patch: hpcups.drv.in | 70 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) --- NEW FILE hplip-hpcups-plugin.patch --- diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin hplip-3.9.8/prnt/drv/hpcups.drv.in --- hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin 2009-11-02 13:47:00.325103235 +0000 +++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-11-02 14:48:00.070102977 +0000 @@ -6659,7 +6659,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1522nf MFP" - Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;" PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" @@ -6723,7 +6723,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035n" - Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" PCFileName "hp-laserjet_p2035n-pcl3.ppd" @@ -6731,7 +6731,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" PCFileName "hp-laserjet_p2035-pcl3.ppd" @@ -6864,7 +6864,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m2727 MFP" - Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m2727 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m2727 mfp;DES:hp laserjet m2727 mfp;" PCFileName "hp-laserjet_m2727_mfp-pcl3.ppd" @@ -7734,7 +7734,7 @@ Manufacturer "HP" // <%LJColor:Normal%> { ModelName "HP Color LaserJet cm1312 MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm1312 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;" PCFileName "hp-color_laserjet_cm1312_mfp-pcl3.ppd" @@ -7742,7 +7742,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm1312nfi MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" @@ -7816,7 +7816,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320 MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;" PCFileName "hp-color_laserjet_cm2320_mfp-pcl3.ppd" @@ -7824,7 +7824,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320fxi MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320fxi MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;" PCFileName "hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd" @@ -7832,7 +7832,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320n MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320n MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;" PCFileName "hp-color_laserjet_cm2320n_mfp-pcl3.ppd" @@ -7840,7 +7840,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320nf MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" @@ -10287,7 +10287,7 @@ Manufacturer "HP" // <%LJZjsMono:Normal%> { ModelName "HP LaserJet 1000" - Attribute "NickName" "" "HP LaserJet 1000, $Version" + Attribute "NickName" "" "HP LaserJet 1000, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1000" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1000;DES:hp laserjet 1000;" PCFileName "hp-laserjet_1000.ppd" @@ -10295,7 +10295,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1005 Series" - Attribute "NickName" "" "HP LaserJet 1005 Series, $Version" + Attribute "NickName" "" "HP LaserJet 1005 Series, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1005 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1005 series;DES:hp laserjet 1005 series;" PCFileName "hp-laserjet_1005_series.ppd" @@ -10303,7 +10303,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1018" - Attribute "NickName" "" "HP LaserJet 1018, $Version" + Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" PCFileName "hp-laserjet_1018.ppd" @@ -10312,7 +10312,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1020" - Attribute "NickName" "" "HP LaserJet 1020, $Version" + Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" PCFileName "hp-laserjet_1020.ppd" @@ -10321,7 +10321,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1022nw" - Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version" + Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1022nw" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022nw;DES:hp laserjet 1022nw;" PCFileName "hp-laserjet_1022nw-zjs.ppd" @@ -10329,7 +10329,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1022n" - Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version" + Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1022n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022n;DES:hp laserjet 1022n;" PCFileName "hp-laserjet_1022n-zjs.ppd" @@ -10338,7 +10338,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1022" - Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version" + Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1022" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022;DES:hp laserjet 1022;" PCFileName "hp-laserjet_1022-zjs.ppd" @@ -10346,7 +10346,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1120 MFP" - Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version" + Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" PCFileName "hp-laserjet_m1120_mfp.ppd" @@ -10354,7 +10354,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1120n MFP" - Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version" + Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120n MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120n mfp;DES:hp laserjet m1120n mfp;" PCFileName "hp-laserjet_m1120n_mfp.ppd" @@ -10362,7 +10362,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1319f MFP" - Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version" + Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" PCFileName "hp-laserjet_m1319f_mfp.ppd" @@ -10370,7 +10370,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035n" - Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version" + Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" PCFileName "hp-laserjet_p2035n-zjs.ppd" @@ -10378,7 +10378,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version" + Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" PCFileName "hp-laserjet_p2035-zjs.ppd" @@ -10498,7 +10498,7 @@ Manufacturer "HP" // <%LJZjsColor:Normal%> { ModelName "HP Color LaserJet cp1215" - Attribute "NickName" "" "HP Color LaserJet cp1215, $Version" + Attribute "NickName" "" "HP Color LaserJet cp1215, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cp1215" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;" PCFileName "hp-color_laserjet_cp1215.ppd" @@ -10506,7 +10506,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet 1600" - Attribute "NickName" "" "HP Color LaserJet 1600, $Version" + Attribute "NickName" "" "HP Color LaserJet 1600, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 1600" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;" PCFileName "hp-color_laserjet_1600.ppd" @@ -10514,7 +10514,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet 2600n" - Attribute "NickName" "" "HP Color LaserJet 2600n, $Version" + Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" PCFileName "hp-color_laserjet_2600n.ppd" @@ -10791,7 +10791,7 @@ Manufacturer "HP" // <%LJm1005:Normal%> { ModelName "HP LaserJet m1005" - Attribute "NickName" "" "HP LaserJet m1005, $Version" + Attribute "NickName" "" "HP LaserJet m1005, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1005" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1005;DES:hp laserjet m1005;" PCFileName "hp-laserjet_m1005.ppd" @@ -10799,7 +10799,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1505n" - Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version" + Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505n;DES:hp laserjet p1505n;" PCFileName "hp-laserjet_p1505n-zxs.ppd" @@ -10807,7 +10807,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1505" - Attribute "NickName" "" "HP LaserJet p1505, $Version" + Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;" PCFileName "hp-laserjet_p1505.ppd" @@ -10815,7 +10815,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2014" - Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version" + Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2014" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014;DES:hp laserjet p2014;" PCFileName "hp-laserjet_p2014-zxs.ppd" @@ -10823,7 +10823,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2014n" - Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version" + Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2014n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014n;DES:hp laserjet p2014n;" PCFileName "hp-laserjet_p2014n-zxs.ppd" @@ -10941,7 +10941,7 @@ Manufacturer "HP" // <%LJP1XXX:Normal%> { ModelName "HP LaserJet p1005" - Attribute "NickName" "" "HP LaserJet p1005, $Version" + Attribute "NickName" "" "HP LaserJet p1005, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1005" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;" PCFileName "hp-laserjet_p1005.ppd" @@ -10949,7 +10949,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1006" - Attribute "NickName" "" "HP LaserJet p1006, $Version" + Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" PCFileName "hp-laserjet_p1006.ppd" @@ -10957,7 +10957,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1007" - Attribute "NickName" "" "HP LaserJet p1007, $Version" + Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" PCFileName "hp-laserjet_p1007.ppd" @@ -10965,7 +10965,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1008" - Attribute "NickName" "" "HP LaserJet p1008, $Version" + Attribute "NickName" "" "HP LaserJet p1008, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1008" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1008;DES:hp laserjet p1008;" PCFileName "hp-laserjet_p1008.ppd" @@ -10973,7 +10973,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1009" - Attribute "NickName" "" "HP LaserJet p1009, $Version" + Attribute "NickName" "" "HP LaserJet p1009, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1009" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1009;DES:hp laserjet p1009;" PCFileName "hp-laserjet_p1009.ppd" Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v retrieving revision 1.244 retrieving revision 1.245 diff -u -p -r1.244 -r1.245 --- hplip.spec 30 Oct 2009 17:04:23 -0000 1.244 +++ hplip.spec 2 Nov 2009 16:36:24 -0000 1.245 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,6 +26,7 @@ Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch +Patch15: hplip-hpcups-plugin.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -155,6 +156,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe +# Added 'requires proprietary plugin' to appropriate model names +# (bug #513283). +%patch15 -p1 -b .hpcups-plugin + %build aclocal automake --foreign --add-missing --copy @@ -358,6 +363,10 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Mon Nov 2 2009 Tim Waugh 3.9.8-21 +- Added 'requires proprietary plugin' to appropriate model names + (bug #513283). + * Fri Oct 30 2009 Tim Waugh 3.9.8-20 - Reverted retry patch until it can be tested some more. From twaugh at fedoraproject.org Mon Nov 2 16:36:51 2009 From: twaugh at fedoraproject.org (Tim Waugh) Date: Mon, 2 Nov 2009 16:36:51 +0000 (UTC) Subject: rpms/hplip/devel hplip-hpcups-plugin.patch, NONE, 1.1 hplip.spec, 1.243, 1.244 Message-ID: <20091102163651.2D4A011C0086@cvs1.fedora.phx.redhat.com> Author: twaugh Update of /cvs/pkgs/rpms/hplip/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4157 Modified Files: hplip.spec Added Files: hplip-hpcups-plugin.patch Log Message: * Mon Nov 2 2009 Tim Waugh 3.9.8-21 - Added 'requires proprietary plugin' to appropriate model names (bug #513283). hplip-hpcups-plugin.patch: hpcups.drv.in | 70 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) --- NEW FILE hplip-hpcups-plugin.patch --- diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin hplip-3.9.8/prnt/drv/hpcups.drv.in --- hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin 2009-11-02 13:47:00.325103235 +0000 +++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-11-02 14:48:00.070102977 +0000 @@ -6659,7 +6659,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1522nf MFP" - Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;" PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" @@ -6723,7 +6723,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035n" - Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" PCFileName "hp-laserjet_p2035n-pcl3.ppd" @@ -6731,7 +6731,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" PCFileName "hp-laserjet_p2035-pcl3.ppd" @@ -6864,7 +6864,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m2727 MFP" - Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m2727 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m2727 mfp;DES:hp laserjet m2727 mfp;" PCFileName "hp-laserjet_m2727_mfp-pcl3.ppd" @@ -7734,7 +7734,7 @@ Manufacturer "HP" // <%LJColor:Normal%> { ModelName "HP Color LaserJet cm1312 MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm1312 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;" PCFileName "hp-color_laserjet_cm1312_mfp-pcl3.ppd" @@ -7742,7 +7742,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm1312nfi MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" @@ -7816,7 +7816,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320 MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;" PCFileName "hp-color_laserjet_cm2320_mfp-pcl3.ppd" @@ -7824,7 +7824,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320fxi MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320fxi MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;" PCFileName "hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd" @@ -7832,7 +7832,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320n MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320n MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;" PCFileName "hp-color_laserjet_cm2320n_mfp-pcl3.ppd" @@ -7840,7 +7840,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet cm2320nf MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" @@ -10287,7 +10287,7 @@ Manufacturer "HP" // <%LJZjsMono:Normal%> { ModelName "HP LaserJet 1000" - Attribute "NickName" "" "HP LaserJet 1000, $Version" + Attribute "NickName" "" "HP LaserJet 1000, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1000" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1000;DES:hp laserjet 1000;" PCFileName "hp-laserjet_1000.ppd" @@ -10295,7 +10295,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1005 Series" - Attribute "NickName" "" "HP LaserJet 1005 Series, $Version" + Attribute "NickName" "" "HP LaserJet 1005 Series, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1005 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1005 series;DES:hp laserjet 1005 series;" PCFileName "hp-laserjet_1005_series.ppd" @@ -10303,7 +10303,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1018" - Attribute "NickName" "" "HP LaserJet 1018, $Version" + Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" PCFileName "hp-laserjet_1018.ppd" @@ -10312,7 +10312,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1020" - Attribute "NickName" "" "HP LaserJet 1020, $Version" + Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" PCFileName "hp-laserjet_1020.ppd" @@ -10321,7 +10321,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1022nw" - Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version" + Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1022nw" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022nw;DES:hp laserjet 1022nw;" PCFileName "hp-laserjet_1022nw-zjs.ppd" @@ -10329,7 +10329,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1022n" - Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version" + Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1022n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022n;DES:hp laserjet 1022n;" PCFileName "hp-laserjet_1022n-zjs.ppd" @@ -10338,7 +10338,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet 1022" - Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version" + Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1022" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022;DES:hp laserjet 1022;" PCFileName "hp-laserjet_1022-zjs.ppd" @@ -10346,7 +10346,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1120 MFP" - Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version" + Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" PCFileName "hp-laserjet_m1120_mfp.ppd" @@ -10354,7 +10354,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1120n MFP" - Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version" + Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120n MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120n mfp;DES:hp laserjet m1120n mfp;" PCFileName "hp-laserjet_m1120n_mfp.ppd" @@ -10362,7 +10362,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet m1319f MFP" - Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version" + Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" PCFileName "hp-laserjet_m1319f_mfp.ppd" @@ -10370,7 +10370,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035n" - Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version" + Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;" PCFileName "hp-laserjet_p2035n-zjs.ppd" @@ -10378,7 +10378,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version" + Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" PCFileName "hp-laserjet_p2035-zjs.ppd" @@ -10498,7 +10498,7 @@ Manufacturer "HP" // <%LJZjsColor:Normal%> { ModelName "HP Color LaserJet cp1215" - Attribute "NickName" "" "HP Color LaserJet cp1215, $Version" + Attribute "NickName" "" "HP Color LaserJet cp1215, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet cp1215" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;" PCFileName "hp-color_laserjet_cp1215.ppd" @@ -10506,7 +10506,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet 1600" - Attribute "NickName" "" "HP Color LaserJet 1600, $Version" + Attribute "NickName" "" "HP Color LaserJet 1600, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 1600" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;" PCFileName "hp-color_laserjet_1600.ppd" @@ -10514,7 +10514,7 @@ Manufacturer "HP" } { ModelName "HP Color LaserJet 2600n" - Attribute "NickName" "" "HP Color LaserJet 2600n, $Version" + Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" PCFileName "hp-color_laserjet_2600n.ppd" @@ -10791,7 +10791,7 @@ Manufacturer "HP" // <%LJm1005:Normal%> { ModelName "HP LaserJet m1005" - Attribute "NickName" "" "HP LaserJet m1005, $Version" + Attribute "NickName" "" "HP LaserJet m1005, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1005" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1005;DES:hp laserjet m1005;" PCFileName "hp-laserjet_m1005.ppd" @@ -10799,7 +10799,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1505n" - Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version" + Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505n;DES:hp laserjet p1505n;" PCFileName "hp-laserjet_p1505n-zxs.ppd" @@ -10807,7 +10807,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1505" - Attribute "NickName" "" "HP LaserJet p1505, $Version" + Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;" PCFileName "hp-laserjet_p1505.ppd" @@ -10815,7 +10815,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2014" - Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version" + Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2014" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014;DES:hp laserjet p2014;" PCFileName "hp-laserjet_p2014-zxs.ppd" @@ -10823,7 +10823,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p2014n" - Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version" + Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2014n" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014n;DES:hp laserjet p2014n;" PCFileName "hp-laserjet_p2014n-zxs.ppd" @@ -10941,7 +10941,7 @@ Manufacturer "HP" // <%LJP1XXX:Normal%> { ModelName "HP LaserJet p1005" - Attribute "NickName" "" "HP LaserJet p1005, $Version" + Attribute "NickName" "" "HP LaserJet p1005, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1005" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;" PCFileName "hp-laserjet_p1005.ppd" @@ -10949,7 +10949,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1006" - Attribute "NickName" "" "HP LaserJet p1006, $Version" + Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" PCFileName "hp-laserjet_p1006.ppd" @@ -10957,7 +10957,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1007" - Attribute "NickName" "" "HP LaserJet p1007, $Version" + Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" PCFileName "hp-laserjet_p1007.ppd" @@ -10965,7 +10965,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1008" - Attribute "NickName" "" "HP LaserJet p1008, $Version" + Attribute "NickName" "" "HP LaserJet p1008, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1008" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1008;DES:hp laserjet p1008;" PCFileName "hp-laserjet_p1008.ppd" @@ -10973,7 +10973,7 @@ Manufacturer "HP" } { ModelName "HP LaserJet p1009" - Attribute "NickName" "" "HP LaserJet p1009, $Version" + Attribute "NickName" "" "HP LaserJet p1009, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1009" Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1009;DES:hp laserjet p1009;" PCFileName "hp-laserjet_p1009.ppd" Index: hplip.spec =================================================================== RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v retrieving revision 1.243 retrieving revision 1.244 diff -u -p -r1.243 -r1.244 --- hplip.spec 30 Oct 2009 17:05:13 -0000 1.243 +++ hplip.spec 2 Nov 2009 16:36:50 -0000 1.244 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,6 +26,7 @@ Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch +Patch15: hplip-hpcups-plugin.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -155,6 +156,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe +# Added 'requires proprietary plugin' to appropriate model names +# (bug #513283). +%patch15 -p1 -b .hpcups-plugin + %build aclocal automake --foreign --add-missing --copy @@ -358,6 +363,10 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Mon Nov 2 2009 Tim Waugh 3.9.8-21 +- Added 'requires proprietary plugin' to appropriate model names + (bug #513283). + * Fri Oct 30 2009 Tim Waugh 3.9.8-20 - Reverted retry patch until it can be tested some more. From dwalsh at fedoraproject.org Mon Nov 2 16:40:04 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 16:40:04 +0000 (UTC) Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.451, 1.452 policycoreutils.spec, 1.655, 1.656 Message-ID: <20091102164004.0E5AA11C0417@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4887 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Fri Oct 30 2009 Dan Walsh 2.0.74-15 - Fix typo in seobject.py policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 14 load_policy/Makefile | 5 restorecond/Makefile | 24 - restorecond/org.selinux.Restorecond.service | 3 restorecond/restorecond.8 | 15 restorecond/restorecond.c | 426 +++--------------- restorecond/restorecond.conf | 5 restorecond/restorecond.desktop | 7 restorecond/restorecond.h | 18 restorecond/restorecond.init | 5 restorecond/restorecond_user.conf | 2 restorecond/user.c | 237 ++++++++++ restorecond/watch.c | 253 ++++++++++ sandbox/Makefile | 31 + sandbox/deliverables/README | 32 + sandbox/deliverables/basicwrapper | 4 sandbox/deliverables/run-in-sandbox.py | 49 ++ sandbox/deliverables/sandbox | 216 +++++++++ sandbox/sandbox | 242 ++++++++++ sandbox/sandbox.8 | 26 + sandbox/sandboxX.sh | 16 sandbox/seunshare.c | 265 +++++++++++ scripts/Makefile | 2 scripts/chcat | 2 scripts/fixfiles | 28 - scripts/fixfiles.8 | 17 semanage/semanage | 136 ++++- semanage/seobject.py | 470 +++++++++++++------- semodule/semodule.8 | 6 semodule/semodule.c | 53 +- setfiles/Makefile | 2 setfiles/restore.c | 519 ++++++++++++++++++++++ setfiles/restore.h | 49 ++ setfiles/restorecon.8 | 7 setfiles/setfiles.8 | 3 setfiles/setfiles.c | 647 +++------------------------- 37 files changed, 2667 insertions(+), 1171 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.451 retrieving revision 1.452 diff -u -p -r1.451 -r1.452 --- policycoreutils-rhat.patch 30 Oct 2009 21:01:42 -0000 1.451 +++ policycoreutils-rhat.patch 2 Nov 2009 16:40:00 -0000 1.452 @@ -2667,7 +2667,7 @@ diff --exclude-from=exclude --exclude=se else: diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.74/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2009-09-08 09:03:10.000000000 -0400 -+++ policycoreutils-2.0.74/semanage/seobject.py 2009-10-30 16:31:59.000000000 -0400 ++++ policycoreutils-2.0.74/semanage/seobject.py 2009-11-02 11:39:02.000000000 -0500 @@ -37,40 +37,6 @@ import syslog @@ -3142,15 +3142,6 @@ diff --exclude-from=exclude --exclude=se (rc, node) = semanage_node_create(self.sh) if rc < 0: -@@ -1097,7 +1147,7 @@ - if rc < 0: - raise ValueError(_("Could not set role in addr context for %s") % addr) - -- rc = semanage_context_set_type(self.sh, con, ctype) -+So rc = semanage_context_set_type(self.sh, con, ctype) - if rc < 0: - raise ValueError(_("Could not set type in addr context for %s") % addr) - @@ -1120,7 +1170,7 @@ def add(self, addr, mask, proto, serange, ctype): Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.655 retrieving revision 1.656 diff -u -p -r1.655 -r1.656 --- policycoreutils.spec 30 Oct 2009 21:01:44 -0000 1.655 +++ policycoreutils.spec 2 Nov 2009 16:40:03 -0000 1.656 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.74 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -296,6 +296,9 @@ fi exit 0 %changelog +* Fri Oct 30 2009 Dan Walsh 2.0.74-15 +- Fix typo in seobject.py + * Fri Oct 30 2009 Dan Walsh 2.0.74-14 - Allow semanage -i and semanage -o to generate customization files. - semanage -o will generate a customization file that semanage -i can read and set a machines to the same selinux configuration From dwalsh at fedoraproject.org Mon Nov 2 16:40:36 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 16:40:36 +0000 (UTC) Subject: rpms/policycoreutils/F-12 policycoreutils-rhat.patch, 1.450, 1.451 policycoreutils.spec, 1.653, 1.654 Message-ID: <20091102164036.ED81A11C0417@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/policycoreutils/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5090 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Fri Oct 30 2009 Dan Walsh 2.0.74-15 - Fix typo in seobject.py policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 14 load_policy/Makefile | 5 restorecond/Makefile | 24 - restorecond/org.selinux.Restorecond.service | 3 restorecond/restorecond.8 | 15 restorecond/restorecond.c | 426 +++--------------- restorecond/restorecond.conf | 5 restorecond/restorecond.desktop | 7 restorecond/restorecond.h | 18 restorecond/restorecond.init | 5 restorecond/restorecond_user.conf | 2 restorecond/user.c | 237 ++++++++++ restorecond/watch.c | 253 ++++++++++ sandbox/Makefile | 31 + sandbox/deliverables/README | 32 + sandbox/deliverables/basicwrapper | 4 sandbox/deliverables/run-in-sandbox.py | 49 ++ sandbox/deliverables/sandbox | 216 +++++++++ sandbox/sandbox | 242 ++++++++++ sandbox/sandbox.8 | 26 + sandbox/sandboxX.sh | 16 sandbox/seunshare.c | 265 +++++++++++ scripts/Makefile | 2 scripts/chcat | 2 scripts/fixfiles | 28 - scripts/fixfiles.8 | 17 semanage/semanage | 136 ++++- semanage/seobject.py | 470 +++++++++++++------- semodule/semodule.8 | 6 semodule/semodule.c | 53 +- setfiles/Makefile | 2 setfiles/restore.c | 519 ++++++++++++++++++++++ setfiles/restore.h | 49 ++ setfiles/restorecon.8 | 7 setfiles/setfiles.8 | 3 setfiles/setfiles.c | 647 +++------------------------- 37 files changed, 2667 insertions(+), 1171 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v retrieving revision 1.450 retrieving revision 1.451 diff -u -p -r1.450 -r1.451 --- policycoreutils-rhat.patch 16 Oct 2009 13:38:03 -0000 1.450 +++ policycoreutils-rhat.patch 2 Nov 2009 16:40:35 -0000 1.451 @@ -1,6 +1,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.74/audit2allow/audit2allow --- nsapolicycoreutils/audit2allow/audit2allow 2009-01-13 08:45:35.000000000 -0500 -+++ policycoreutils-2.0.74/audit2allow/audit2allow 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/audit2allow/audit2allow 2009-10-15 10:37:41.000000000 -0400 @@ -42,6 +42,8 @@ from optparse import OptionParser @@ -40,7 +40,7 @@ diff --exclude-from=exclude --exclude=se f = sys.stdin diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.74/load_policy/Makefile --- nsapolicycoreutils/load_policy/Makefile 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.74/load_policy/Makefile 2009-09-25 15:28:19.000000000 -0400 ++++ policycoreutils-2.0.74/load_policy/Makefile 2009-10-15 10:37:41.000000000 -0400 @@ -1,6 +1,7 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr @@ -61,7 +61,7 @@ diff --exclude-from=exclude --exclude=se -rm -f $(TARGETS) *.o diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.74/Makefile --- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.74/Makefile 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/Makefile 2009-10-15 10:37:41.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui @@ -70,7 +70,7 @@ diff --exclude-from=exclude --exclude=se diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.74/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 2009-08-20 15:49:21.000000000 -0400 -+++ policycoreutils-2.0.74/restorecond/Makefile 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/Makefile 2009-10-15 10:37:41.000000000 -0400 @@ -1,17 +1,28 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr @@ -119,16 +119,65 @@ diff --exclude-from=exclude --exclude=se /sbin/restorecon $(SBINDIR)/restorecond diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.selinux.Restorecond +Exec=/usr/sbin/restorecond -u -Binary files nsapolicycoreutils/restorecond/restorecond and policycoreutils-2.0.74/restorecond/restorecond differ +diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-2.0.74/restorecond/restorecond.8 +--- nsapolicycoreutils/restorecond/restorecond.8 2009-08-20 15:49:21.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/restorecond.8 2009-10-20 09:32:14.000000000 -0400 +@@ -3,7 +3,7 @@ + restorecond \- daemon that watches for file creation and then sets the default SELinux file context + + .SH "SYNOPSIS" +-.B restorecond [\-d] ++.B restorecond [\-d] [\-f restorecond_file ] [\-u] [\-v] + .P + + .SH "DESCRIPTION" +@@ -19,13 +19,22 @@ + .B \-d + Turns on debugging mode. Application will stay in the foreground and lots of + debugs messages start printing. ++.TP ++.B \-f restorecond_file ++Use alternative restorecond.conf file. ++.TP ++.B \-u ++Turns on user mode. Runs restorecond in the user session and reads /etc/selinux/restorecond_user.conf. Uses dbus to make sure only one restorecond is running per user session. ++.TP ++.B \-v ++Turns on verbose debugging. (Report missing files) + + .SH "AUTHOR" +-This man page was written by Dan Walsh . +-The program was written by Dan Walsh . ++This man page and program was written by Dan Walsh . + + .SH "FILES" + /etc/selinux/restorecond.conf ++/etc/selinux/restorecond_user.conf + + .SH "SEE ALSO" + .BR restorecon (8), diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.74/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2009-08-20 15:49:21.000000000 -0400 -+++ policycoreutils-2.0.74/restorecond/restorecond.c 2009-09-24 22:59:01.000000000 -0400 -@@ -48,294 +48,38 @@ ++++ policycoreutils-2.0.74/restorecond/restorecond.c 2009-10-20 09:29:06.000000000 -0400 +@@ -30,9 +30,11 @@ + * and makes sure that there security context matches the systems defaults + * + * USAGE: +- * restorecond [-d] [-v] ++ * restorecond [-d] [-u] [-v] [-f restorecond_file ] + * + * -d Run in debug mode ++ * -f Use alternative restorecond_file ++ * -u Run in user mode + * -v Run in verbose mode (Report missing files) + * + * EXAMPLE USAGE: +@@ -48,294 +50,38 @@ #include #include #include @@ -289,7 +338,7 @@ diff --exclude-from=exclude --exclude=se - return; - } - retcontext = fgetfilecon_raw(fd, &prev_context); -- + - if (retcontext >= 0 || errno == ENODATA) { - if (retcontext < 0) - prev_context = NULL; @@ -356,15 +405,16 @@ diff --exclude-from=exclude --exclude=se - Files specified one per line. Files with "~" will be expanded to the logged in users - homedirs. -*/ - --static void read_config(int fd) --{ -- char *watch_file_path = "/etc/selinux/restorecond.conf"; +static char *server_watch_file = "/etc/selinux/restorecond.conf"; +static char *user_watch_file = "/etc/selinux/restorecond_user.conf"; +static char *watch_file; +static struct restore_opts r_opts; +-static void read_config(int fd) +-{ +- char *watch_file_path = "/etc/selinux/restorecond.conf"; ++#include + - FILE *cfg = NULL; - if (debug_mode) - printf("Read Config\n"); @@ -383,7 +433,10 @@ diff --exclude-from=exclude --exclude=se - if (master_wd == -1) - exitApp("Error watching config file."); -} -+#include ++int debug_mode = 0; ++int terminate = 0; ++int master_wd = -1; ++int run_as_user = 0; -/* - Inotify watch loop @@ -427,11 +480,7 @@ diff --exclude-from=exclude --exclude=se - break; - } - } -+int debug_mode = 0; -+int terminate = 0; -+int master_wd = -1; -+int run_as_user = 0; - +- - i += EVENT_SIZE + event->len; - } - return 0; @@ -443,16 +492,16 @@ diff --exclude-from=exclude --exclude=se } static const char *pidfile = "/var/run/restorecond.pid"; -@@ -374,7 +118,7 @@ +@@ -374,7 +120,7 @@ static void usage(char *program) { - printf("%s [-d] [-v] \n", program); -+ printf("%s [-d] [-s] [-f restorecond_file ] [-v] \n", program); ++ printf("%s [-d] [-f restorecond_file ] [-u] [-v] \n", program); exit(0); } -@@ -390,74 +134,33 @@ +@@ -390,74 +136,33 @@ to see if it is one that we are watching. */ @@ -549,7 +598,7 @@ diff --exclude-from=exclude --exclude=se /* Register sighandlers */ sa.sa_flags = 0; -@@ -467,38 +170,59 @@ +@@ -467,38 +172,59 @@ set_matchpathcon_flags(MATCHPATHCON_NOTRANS); @@ -559,7 +608,7 @@ diff --exclude-from=exclude --exclude=se - - while ((opt = getopt(argc, argv, "dv")) > 0) { + atexit( done ); -+ while ((opt = getopt(argc, argv, "uf:dv")) > 0) { ++ while ((opt = getopt(argc, argv, "df:uv")) > 0) { switch (opt) { case 'd': debug_mode = 1; @@ -620,7 +669,7 @@ diff --exclude-from=exclude --exclude=se + diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.74/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2009-08-20 15:49:21.000000000 -0400 -+++ policycoreutils-2.0.74/restorecond/restorecond.conf 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/restorecond.conf 2009-10-15 10:37:41.000000000 -0400 @@ -4,8 +4,5 @@ /etc/mtab /var/run/utmp @@ -633,7 +682,7 @@ diff --exclude-from=exclude --exclude=se - diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.74/restorecond/restorecond.desktop --- nsapolicycoreutils/restorecond/restorecond.desktop 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/restorecond/restorecond.desktop 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/restorecond.desktop 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=File Context maintainer @@ -644,7 +693,7 @@ diff --exclude-from=exclude --exclude=se +StartupNotify=false diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.74/restorecond/restorecond.h --- nsapolicycoreutils/restorecond/restorecond.h 2009-08-20 15:49:21.000000000 -0400 -+++ policycoreutils-2.0.74/restorecond/restorecond.h 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/restorecond.h 2009-10-15 10:37:41.000000000 -0400 @@ -24,7 +24,21 @@ #ifndef RESTORED_CONFIG_H #define RESTORED_CONFIG_H @@ -671,7 +720,7 @@ diff --exclude-from=exclude --exclude=se #endif diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.74/restorecond/restorecond.init --- nsapolicycoreutils/restorecond/restorecond.init 2009-08-20 15:49:21.000000000 -0400 -+++ policycoreutils-2.0.74/restorecond/restorecond.init 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/restorecond.init 2009-10-15 10:37:41.000000000 -0400 @@ -75,16 +75,15 @@ status restorecond RETVAL=$? @@ -691,17 +740,15 @@ diff --exclude-from=exclude --exclude=se exit $RETVAL - -Binary files nsapolicycoreutils/restorecond/restorecond.o and policycoreutils-2.0.74/restorecond/restorecond.o differ diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.74/restorecond/restorecond_user.conf --- nsapolicycoreutils/restorecond/restorecond_user.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/restorecond/restorecond_user.conf 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/restorecond_user.conf 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,2 @@ +~/* +~/public_html/* -Binary files nsapolicycoreutils/restorecond/stringslist.o and policycoreutils-2.0.74/restorecond/stringslist.o differ diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.74/restorecond/user.c --- nsapolicycoreutils/restorecond/user.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/restorecond/user.c 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/user.c 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,237 @@ +/* + * restorecond @@ -940,11 +987,9 @@ diff --exclude-from=exclude --exclude=se + return 0; +} + -Binary files nsapolicycoreutils/restorecond/user.o and policycoreutils-2.0.74/restorecond/user.o differ -Binary files nsapolicycoreutils/restorecond/utmpwatcher.o and policycoreutils-2.0.74/restorecond/utmpwatcher.o differ diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c --- nsapolicycoreutils/restorecond/watch.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/restorecond/watch.c 2009-10-06 12:06:56.000000000 -0400 ++++ policycoreutils-2.0.74/restorecond/watch.c 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,253 @@ +#define _GNU_SOURCE +#include @@ -1199,10 +1244,9 @@ diff --exclude-from=exclude --exclude=se + exitApp("Error watching config file."); +} + -Binary files nsapolicycoreutils/restorecond/watch.o and policycoreutils-2.0.74/restorecond/watch.o differ diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.74/sandbox/deliverables/basicwrapper --- nsapolicycoreutils/sandbox/deliverables/basicwrapper 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper 2009-08-14 10:53:53.000000000 -0400 ++++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,4 @@ +import os, sys +SANDBOX_ARGS = ['-f%s' % os.environ['_CONDOR_SCRATCH_DIR']] @@ -1210,7 +1254,7 @@ diff --exclude-from=exclude --exclude=se +os.execv('/usr/bin/sandbox',SANDBOX_ARGS) diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/README policycoreutils-2.0.74/sandbox/deliverables/README --- nsapolicycoreutils/sandbox/deliverables/README 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/sandbox/deliverables/README 2009-08-14 10:56:22.000000000 -0400 ++++ policycoreutils-2.0.74/sandbox/deliverables/README 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,32 @@ +Files: +run-in-sandbox.py: @@ -1246,7 +1290,7 @@ diff --exclude-from=exclude --exclude=se +Chris Pardy diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py policycoreutils-2.0.74/sandbox/deliverables/run-in-sandbox.py --- nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/sandbox/deliverables/run-in-sandbox.py 2009-08-14 10:25:38.000000000 -0400 ++++ policycoreutils-2.0.74/sandbox/deliverables/run-in-sandbox.py 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,49 @@ +import os +import os.path @@ -1299,7 +1343,7 @@ diff --exclude-from=exclude --exclude=se + diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/sandbox policycoreutils-2.0.74/sandbox/deliverables/sandbox --- nsapolicycoreutils/sandbox/deliverables/sandbox 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/sandbox/deliverables/sandbox 2009-08-14 10:22:47.000000000 -0400 ++++ policycoreutils-2.0.74/sandbox/deliverables/sandbox 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,216 @@ +#!/usr/bin/python -E +import os, sys, getopt, socket, random, fcntl, shutil @@ -1519,7 +1563,7 @@ diff --exclude-from=exclude --exclude=se + diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.74/sandbox/Makefile --- nsapolicycoreutils/sandbox/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/sandbox/Makefile 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/sandbox/Makefile 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,31 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -1554,7 +1598,7 @@ diff --exclude-from=exclude --exclude=se +relabel: diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.74/sandbox/sandbox --- nsapolicycoreutils/sandbox/sandbox 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/sandbox/sandbox 2009-10-06 11:48:36.000000000 -0400 ++++ policycoreutils-2.0.74/sandbox/sandbox 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,242 @@ +#!/usr/bin/python -E +import os, sys, getopt, socket, random, fcntl, shutil @@ -1800,7 +1844,7 @@ diff --exclude-from=exclude --exclude=se + diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.74/sandbox/sandbox.8 --- nsapolicycoreutils/sandbox/sandbox.8 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/sandbox/sandbox.8 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/sandbox/sandbox.8 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,26 @@ +.TH SANDBOX "8" "May 2009" "chcat" "User Commands" +.SH NAME @@ -1830,7 +1874,7 @@ diff --exclude-from=exclude --exclude=se +.PP diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.74/sandbox/sandboxX.sh --- nsapolicycoreutils/sandbox/sandboxX.sh 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/sandbox/sandboxX.sh 2009-09-20 21:51:31.000000000 -0400 ++++ policycoreutils-2.0.74/sandbox/sandboxX.sh 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,16 @@ +#!/bin/bash +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`" @@ -1850,7 +1894,7 @@ diff --exclude-from=exclude --exclude=se +done diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.74/sandbox/seunshare.c --- nsapolicycoreutils/sandbox/seunshare.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/sandbox/seunshare.c 2009-09-20 21:48:31.000000000 -0400 ++++ policycoreutils-2.0.74/sandbox/seunshare.c 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,265 @@ +#include +#include @@ -2119,7 +2163,7 @@ diff --exclude-from=exclude --exclude=se +} diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.74/scripts/chcat --- nsapolicycoreutils/scripts/chcat 2009-06-23 15:36:07.000000000 -0400 -+++ policycoreutils-2.0.74/scripts/chcat 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/scripts/chcat 2009-10-15 10:37:41.000000000 -0400 @@ -435,6 +435,8 @@ continue except ValueError, e: @@ -2131,18 +2175,121 @@ diff --exclude-from=exclude --exclude=se diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.74/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2009-08-05 15:10:56.000000000 -0400 -+++ policycoreutils-2.0.74/scripts/fixfiles 2009-10-14 08:51:36.000000000 -0400 -@@ -136,6 +136,7 @@ ++++ policycoreutils-2.0.74/scripts/fixfiles 2009-10-22 08:49:41.000000000 -0400 +@@ -27,7 +27,6 @@ + FORCEFLAG="" + DIRS="" + RPMILES="" +-OUTFILES="" + LOGFILE=`tty` + if [ $? != 0 ]; then + LOGFILE="/dev/null" +@@ -122,7 +121,7 @@ + fi + if [ ! -z "$RPMFILES" ]; then + for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do +- rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -R -i -f - 2>&1 >> $LOGFILE ++ rpmlist $i | ${RESTORECON} ${FORCEFLAG} $* -R -i -f - 2>&1 >> $LOGFILE + done + exit $? + fi +@@ -130,14 +129,15 @@ + if [ -x /usr/bin/find ]; then + /usr/bin/find "$FILEPATH" \ + ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o -fstype btrfs \) -prune -o -print0 | \ +- ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE ++ ${RESTORECON} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE + else +- ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE ++ ${RESTORECON} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE fi return fi +[ -x /usr/sbin/genhomedircon ] && /usr/sbin/genhomedircon LogReadOnly - ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE +-${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE ++${SETFILES} -q ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* + find /tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \; + find /var/tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \; +@@ -193,10 +193,15 @@ + esac + } + usage() { +- echo $"Usage: $0 [-l logfile ] [-o outputfile ] { check | restore|[-F] relabel } [[dir] ... ] " +- echo or +- echo $"Usage: $0 -R rpmpackage[,rpmpackage...] -C PREVIOUS_FILECONTEXT [-l logfile ] [-o outputfile ] { check | restore }" +- echo $"Usage: $0 onboot" ++ echo $""" ++Usage: $0 [-F] [-l logfile ] { check | restore| [-f] relabel | verify } [[dir/file] ... ] ++or ++Usage: $0 [-F] -R rpmpackage[,rpmpackage...] [-l logfile ] { check | restore | verify } ++or ++Usage: $0 [-F] -C PREVIOUS_FILECONTEXT { check | restore | verify } ++or ++Usage: $0 onboot ++""" + } + + if [ $# = 0 ]; then +@@ -205,7 +210,7 @@ + fi + + # See how we were called. +-while getopts "C:Ffo:R:l:" i; do ++while getopts "C:FfR:l:" i; do + case "$i" in + f) + fullFlag=1 +@@ -213,9 +218,6 @@ + R) + RPMFILES=$OPTARG + ;; +- o) +- OUTFILES=$OPTARG +- ;; + l) + LOGFILE=$OPTARG + ;; +diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-2.0.74/scripts/fixfiles.8 +--- nsapolicycoreutils/scripts/fixfiles.8 2008-08-28 09:34:24.000000000 -0400 ++++ policycoreutils-2.0.74/scripts/fixfiles.8 2009-10-22 08:55:09.000000000 -0400 +@@ -3,11 +3,18 @@ + fixfiles \- fix file SELinux security contexts. + + .SH "SYNOPSIS" +-.B fixfiles [-F] [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel | verify }" + +-.B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel | verify } [[dir/file] ... ] ++.B fixfiles ++.I [-F] [-l logfile ] { check | restore|[-f] relabel | verify } [[dir/file] ... ] + +-.B fixfiles onboot ++.B fixfiles ++.I [-F] [ -R rpmpackagename[,rpmpackagename...] ] [-l logfile ] { check | restore | verify } ++ ++.B fixfiles ++.I [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] { check | restore | verify } ++ ++.B fixfiles ++.I onboot + + .SH "DESCRIPTION" + This manual page describes the +@@ -31,10 +38,6 @@ + .B -l logfile + Save the output to the specified logfile + .TP +-.B -o outputfile +-Save all files that have file_context that differs from the default, in outputfile. +- +-.TP + .B -F + Force reset of context to match file_context for customizable files + diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.74/scripts/Makefile --- nsapolicycoreutils/scripts/Makefile 2008-08-28 09:34:24.000000000 -0400 -+++ policycoreutils-2.0.74/scripts/Makefile 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/scripts/Makefile 2009-10-15 10:37:41.000000000 -0400 @@ -5,7 +5,7 @@ MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale @@ -2154,13 +2301,14 @@ diff --exclude-from=exclude --exclude=se -mkdir -p $(BINDIR) diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.74/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2009-09-08 09:03:10.000000000 -0400 -+++ policycoreutils-2.0.74/semanage/semanage 2009-10-01 11:43:48.000000000 -0400 -@@ -39,19 +39,26 @@ ++++ policycoreutils-2.0.74/semanage/semanage 2009-10-30 16:31:40.000000000 -0400 +@@ -39,19 +39,27 @@ __builtin__.__dict__['_'] = unicode if __name__ == '__main__': +- + action = False - ++ manageditems=[ "boolean", "login", "user", "port", "interface", "node", "fcontext"] + def set_action(option): + global action + if action: @@ -2170,9 +2318,10 @@ diff --exclude-from=exclude --exclude=se def usage(message = ""): text = _(""" semanage [ -S store ] -i [ input_file | - ] ++semanage [ -S store ] -o [ output_file | - ] -semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n] -+semanage {boolean|login|user|port|interface|module|node|fcontext} -{l|D} [-n] ++semanage {boolean|login|user|port|interface|module|node|fcontext} -{l|D|E} [-n] semanage login -{a|d|m} [-sr] login_name | %groupname semanage user -{a|d|m} [-LrRP] selinux_name semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range @@ -2184,7 +2333,17 @@ diff --exclude-from=exclude --exclude=se semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file semanage permissive -{d|a} type semanage dontaudit [ on | off ] -@@ -85,14 +92,15 @@ +@@ -62,7 +70,9 @@ + -d, --delete Delete a OBJECT record NAME + -m, --modify Modify a OBJECT record NAME + -i, --input Input multiple semange commands in a transaction ++ -o, --output Output current customizations as semange commands + -l, --list List the OBJECTS ++ -E, --extract extract customizable commands + -C, --locallist List OBJECTS local customizations + -D, --deleteall Remove all OBJECTS local customizations + +@@ -85,14 +95,15 @@ -F, --file Treat target as an input file for command, change multiple settings -p, --proto Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6) -M, --mask Netmask @@ -2202,7 +2361,16 @@ diff --exclude-from=exclude --exclude=se """) raise ValueError("%s\n%s" % (text, message)) -@@ -115,11 +123,11 @@ +@@ -104,7 +115,7 @@ + + def get_options(): + valid_option={} +- valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading', '-C', '--locallist', '-D', '--deleteall', '-S', '--store' ] ++ valid_everyone=[ '-a', '--add', '-d', '--delete', '-E', '--extract', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading', '-C', '--locallist', '-D', '--deleteall', '-S', '--store' ] + valid_option["login"] = [] + valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range'] + valid_option["user"] = [] +@@ -115,11 +126,11 @@ valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range'] valid_option["node"] = [] valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol'] @@ -2217,7 +2385,16 @@ diff --exclude-from=exclude --exclude=se valid_option["boolean"] = [] valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0", "-F", "--file"] valid_option["permissive"] = [] -@@ -180,7 +188,6 @@ +@@ -173,6 +184,8 @@ + return ret + + def process_args(argv): ++ global action ++ action = False + serange = "" + port = "" + proto = "" +@@ -180,7 +193,6 @@ selevel = "" setype = "" ftype = "" @@ -2225,11 +2402,12 @@ diff --exclude-from=exclude --exclude=se roles = "" seuser = "" prefix = "user" -@@ -190,10 +197,13 @@ +@@ -190,10 +202,14 @@ modify = False delete = False deleteall = False + enable = False ++ extract = False + disable = False list = False locallist = False @@ -2239,22 +2417,23 @@ diff --exclude-from=exclude --exclude=se object = argv[0] option_dict=get_options() -@@ -203,10 +213,13 @@ +@@ -203,10 +219,14 @@ args = argv[1:] gopts, cmds = getopt.getopt(args, - '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:', -+ '01ade:f:i:lhmnp:s:FCDR:L:r:t:P:S:M:', ++ '01adEe:f:i:lhmnp:s:FCDR:L:r:t:P:S:M:', ['add', 'delete', 'deleteall', + 'equal=', + 'enable', ++ 'extract', + 'disable', 'ftype=', 'file', 'help', -@@ -225,7 +238,6 @@ +@@ -225,7 +245,6 @@ 'level=', 'roles=', 'type=', @@ -2262,7 +2441,7 @@ diff --exclude-from=exclude --exclude=se 'prefix=', 'mask=' ]) -@@ -235,26 +247,39 @@ +@@ -235,26 +254,42 @@ for o,a in gopts: if o == "-a" or o == "--add": @@ -2283,6 +2462,9 @@ diff --exclude-from=exclude --exclude=se + set_action(o) deleteall = True + ++ if o == "-E" or o == "--extract": ++ set_action(o) ++ extract = True if o == "-f" or o == "--ftype": ftype=a @@ -2309,7 +2491,7 @@ diff --exclude-from=exclude --exclude=se if o == "-n" or o == "--noheading": heading = False -@@ -263,8 +288,7 @@ +@@ -263,8 +298,7 @@ locallist = True if o == "-m"or o == "--modify": @@ -2319,7 +2501,7 @@ diff --exclude-from=exclude --exclude=se modify = True if o == "-S" or o == '--store': -@@ -297,9 +321,6 @@ +@@ -297,14 +331,12 @@ if o == "-t" or o == "--type": setype = a @@ -2329,7 +2511,13 @@ diff --exclude-from=exclude --exclude=se if o == "--on" or o == "-1": value = "on" if o == "--off" or o == "-0": -@@ -325,9 +346,10 @@ + value = "off" + ++ + if object == "login": + OBJECT = seobject.loginRecords(store) + +@@ -325,9 +357,10 @@ if object == "boolean": OBJECT = seobject.booleanRecords(store) @@ -2342,7 +2530,22 @@ diff --exclude-from=exclude --exclude=se if object == "permissive": OBJECT = seobject.permissiveRecords(store) -@@ -358,9 +380,6 @@ +@@ -343,8 +376,13 @@ + OBJECT.deleteall() + return + ++ if extract: ++ for i in OBJECT.customized(): ++ print "%s %s" % (object, str(i)) ++ return ++ + if len(cmds) != 1: +- raise ValueError(_("%s bad option") % o) ++ raise ValueError(_("bad option")) + + target = cmds[0] + +@@ -358,9 +396,6 @@ if object == "login": OBJECT.add(target, seuser, serange) @@ -2352,7 +2555,7 @@ diff --exclude-from=exclude --exclude=se if object == "user": OBJECT.add(target, roles.split(), selevel, serange, prefix) -@@ -370,11 +389,17 @@ +@@ -370,11 +405,17 @@ if object == "interface": OBJECT.add(target, serange, setype) @@ -2371,7 +2574,7 @@ diff --exclude-from=exclude --exclude=se if object == "permissive": OBJECT.add(target) -@@ -387,13 +412,18 @@ +@@ -387,13 +428,18 @@ if object == "login": OBJECT.modify(target, seuser, serange) @@ -2393,7 +2596,7 @@ diff --exclude-from=exclude --exclude=se if object == "port": OBJECT.modify(target, proto, serange, setype) -@@ -404,7 +434,10 @@ +@@ -404,7 +450,10 @@ OBJECT.modify(target, mask, proto, serange, setype) if object == "fcontext": @@ -2405,7 +2608,7 @@ diff --exclude-from=exclude --exclude=se return -@@ -423,7 +456,7 @@ +@@ -423,12 +472,13 @@ return @@ -2414,13 +2617,103 @@ diff --exclude-from=exclude --exclude=se # # + # + try: ++ output = None + input = None + store = "" + +@@ -436,7 +486,7 @@ + usage(_("Requires 2 or more arguments")) + + gopts, cmds = getopt.getopt(sys.argv[1:], +- '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:', ++ '01adf:i:lhmno:p:s:FCDR:L:r:t:T:P:S:', + ['add', + 'delete', + 'deleteall', +@@ -450,6 +500,7 @@ + 'localist', + 'off', + 'on', ++ 'output=', + 'proto=', + 'seuser=', + 'store=', +@@ -465,6 +516,16 @@ + store = a + if o == "-i" or o == '--input': + input = a ++ if o == "-o" or o == '--output': ++ output = a ++ ++ if output != None: ++ if output != "-": ++ sys.stdout = open(output, 'w') ++ for i in manageditems: ++ print "%s -D" % i ++ process_args([i, "-E"]) ++ sys.exit(0) + + if input != None: + if input == "-": +@@ -474,6 +535,7 @@ + trans = seobject.semanageRecords(store) + trans.start() + for l in fd.readlines(): ++ print l + process_args(mkargv(l)) + trans.finish() + else: diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.74/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2009-09-08 09:03:10.000000000 -0400 -+++ policycoreutils-2.0.74/semanage/seobject.py 2009-10-01 11:34:19.000000000 -0400 -@@ -195,88 +195,6 @@ ++++ policycoreutils-2.0.74/semanage/seobject.py 2009-11-02 11:39:02.000000000 -0500 +@@ -37,40 +37,6 @@ + + import syslog + +-handle = None +- +-def get_handle(store): +- global handle +- global is_mls_enabled +- +- handle = semanage_handle_create() +- if not handle: +- raise ValueError(_("Could not create semanage handle")) +- +- if store != "": +- semanage_select_store(handle, store, SEMANAGE_CON_DIRECT); +- +- if not semanage_is_managed(handle): +- semanage_handle_destroy(handle) +- raise ValueError(_("SELinux policy is not managed or store cannot be accessed.")) +- +- rc = semanage_access_check(handle) +- if rc < SEMANAGE_CAN_READ: +- semanage_handle_destroy(handle) +- raise ValueError(_("Cannot read policy store.")) +- +- rc = semanage_connect(handle) +- if rc < 0: +- semanage_handle_destroy(handle) +- raise ValueError(_("Could not establish semanage connection")) +- +- is_mls_enabled = semanage_mls_enabled(handle) +- if is_mls_enabled < 0: +- semanage_handle_destroy(handle) +- raise ValueError(_("Could not test MLS enabled status")) +- +- return handle +- + file_types = {} + file_types[""] = SEMANAGE_FCONTEXT_ALL; + file_types["all files"] = SEMANAGE_FCONTEXT_ALL; +@@ -194,127 +160,152 @@ + return trans else: return raw - +- -class setransRecords: - def __init__(self): - self.filename = selinux.selinux_translations_path() @@ -2446,10 +2739,13 @@ diff --exclude-from=exclude --exclude=se - continue - if self.ddict.has_key(i[0]) == 0: - self.ddict[i[0]] = i[1] -- + - def get_all(self): - return self.ddict -- ++class semanageRecords: ++ transaction = False ++ handle = None + - def out(self): - rec = "" - for c in self.comments: @@ -2471,7 +2767,11 @@ diff --exclude-from=exclude --exclude=se - def add(self, raw, trans): - if trans.find(" ") >= 0: - raise ValueError(_("Translations can not contain spaces '%s' ") % trans) -- ++ def __init__(self, store): ++ global handle ++ ++ self.sh = self.get_handle(store) + - if validate_level(raw) == None: - raise ValueError(_("Invalid Level '%s' ") % raw) - @@ -2483,7 +2783,9 @@ diff --exclude-from=exclude --exclude=se - - def modify(self, raw, trans): - if trans.find(" ") >= 0: -- ++ def get_handle(self, store): ++ global is_mls_enabled + - raise ValueError(_("Translations can not contain spaces '%s' ") % trans) - if self.ddict.has_key(raw): - self.ddict[raw] = trans @@ -2502,12 +2804,81 @@ diff --exclude-from=exclude --exclude=se - os.chmod(newfilename, os.stat(self.filename)[stat.ST_MODE]) - os.rename(newfilename, self.filename) - os.system("/sbin/service mcstrans reload > /dev/null") -- - class semanageRecords: - def __init__(self, store): - global handle -@@ -315,6 +233,77 @@ - self.transaction = False ++ if semanageRecords.handle: ++ return semanageRecords.handle + +-class semanageRecords: +- def __init__(self, store): +- global handle ++ handle = semanage_handle_create() ++ if not handle: ++ raise ValueError(_("Could not create semanage handle")) ++ ++ if store != "": ++ semanage_select_store(handle, store, SEMANAGE_CON_DIRECT); + +- if handle != None: +- self.sh = handle +- else: +- self.sh = get_handle(store) +- self.transaction = False ++ if not semanage_is_managed(handle): ++ semanage_handle_destroy(handle) ++ raise ValueError(_("SELinux policy is not managed or store cannot be accessed.")) ++ ++ rc = semanage_access_check(handle) ++ if rc < SEMANAGE_CAN_READ: ++ semanage_handle_destroy(handle) ++ raise ValueError(_("Cannot read policy store.")) ++ ++ rc = semanage_connect(handle) ++ if rc < 0: ++ semanage_handle_destroy(handle) ++ raise ValueError(_("Could not establish semanage connection")) ++ ++ is_mls_enabled = semanage_mls_enabled(handle) ++ if is_mls_enabled < 0: ++ semanage_handle_destroy(handle) ++ raise ValueError(_("Could not test MLS enabled status")) ++ ++ semanageRecords.handle = handle ++ return semanageRecords.handle + + def deleteall(self): + raise ValueError(_("Not yet implemented")) + + def start(self): +- if self.transaction: ++ if semanageRecords.transaction: + raise ValueError(_("Semanage transaction already in progress")) + self.begin() +- self.transaction = True +- ++ semanageRecords.transaction = True + def begin(self): +- if self.transaction: ++ if semanageRecords.transaction: + return + rc = semanage_begin_transaction(self.sh) + if rc < 0: + raise ValueError(_("Could not start semanage transaction")) ++ def customized(self): ++ raise ValueError(_("Not yet implemented")) ++ + def commit(self): +- if self.transaction: ++ if semanageRecords.transaction: + return + rc = semanage_commit(self.sh) + if rc < 0: + raise ValueError(_("Could not commit semanage transaction")) + + def finish(self): +- if not self.transaction: ++ if not semanageRecords.transaction: + raise ValueError(_("Semanage transaction not in progress")) +- self.transaction = False ++ semanageRecords.transaction = False self.commit() +class moduleRecords(semanageRecords): @@ -2584,7 +2955,7 @@ diff --exclude-from=exclude --exclude=se class dontauditClass(semanageRecords): def __init__(self, store): semanageRecords.__init__(self, store) -@@ -341,6 +330,7 @@ +@@ -341,6 +332,7 @@ name = semanage_module_get_name(mod) if name and name.startswith("permissive_"): l.append(name.split("permissive_")[1]) @@ -2592,7 +2963,186 @@ diff --exclude-from=exclude --exclude=se return l def list(self, heading = 1, locallist = 0): -@@ -1120,7 +1110,7 @@ +@@ -425,7 +417,9 @@ + if rc < 0: + raise ValueError(_("Could not check if login mapping for %s is defined") % name) + if exists: +- raise ValueError(_("Login mapping for %s is already defined") % name) ++ semanage_seuser_key_free(k) ++ return self.__modify(name, sename, serange) ++ + if name[0] == '%': + try: + grp.getgrnam(name[1:]) +@@ -557,6 +551,16 @@ + + mylog.log(1, "delete SELinux user mapping", name); + ++ def deleteall(self): ++ (rc, ulist) = semanage_seuser_list_local(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not list login mappings")) ++ ++ self.begin() ++ for u in ulist: ++ self.__delete(semanage_seuser_get_name(u)) ++ self.commit() ++ + def get_all(self, locallist = 0): + ddict = {} + if locallist: +@@ -571,6 +575,15 @@ + ddict[name] = (semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u)) + return ddict + ++ def customized(self): ++ l = [] ++ ddict = self.get_all(True) ++ keys = ddict.keys() ++ keys.sort() ++ for k in keys: ++ l.append("-a -s %s -r '%s' %s" % (ddict[k][0], ddict[k][1], k)) ++ return l ++ + def list(self,heading = 1, locallist = 0): + ddict = self.get_all(locallist) + keys = ddict.keys() +@@ -613,7 +626,8 @@ + if rc < 0: + raise ValueError(_("Could not check if SELinux user %s is defined") % name) + if exists: +- raise ValueError(_("SELinux user %s is already defined") % name) ++ semanage_user_key_free(k) ++ return self.__modify(name, roles, selevel, serange, prefix) + + (rc, u) = semanage_user_create(self.sh) + if rc < 0: +@@ -764,6 +778,16 @@ + + mylog.log(1,"delete SELinux user record", name) + ++ def deleteall(self): ++ (rc, ulist) = semanage_user_list_local(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not list login mappings")) ++ ++ self.begin() ++ for u in ulist: ++ self.__delete(semanage_user_get_name(u)) ++ self.commit() ++ + def get_all(self, locallist = 0): + ddict = {} + if locallist: +@@ -784,6 +808,15 @@ + + return ddict + ++ def customized(self): ++ l = [] ++ ddict = self.get_all(True) ++ keys = ddict.keys() ++ keys.sort() ++ for k in keys: ++ l.append("-a -r %s -R '%s' %s" % (ddict[k][2], ddict[k][3], k)) ++ return l ++ + def list(self, heading = 1, locallist = 0): + ddict = self.get_all(locallist) + keys = ddict.keys() +@@ -822,12 +855,16 @@ + low = int(ports[0]) + high = int(ports[1]) + ++ if high > 65536: ++ raise ValueError(_("Invalid Port")) ++ + (rc, k) = semanage_port_key_create(self.sh, low, high, proto_d) + if rc < 0: + raise ValueError(_("Could not create a key for %s/%s") % (proto, port)) + return ( k, proto_d, low, high ) + + def __add(self, port, proto, serange, type): ++ + if is_mls_enabled == 1: + if serange == "": + serange = "s0" +@@ -843,7 +880,8 @@ + if rc < 0: + raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port)) + if exists: +- raise ValueError(_("Port %s/%s already defined") % (proto, port)) ++ semanage_port_key_free(k) ++ return self.__modify(port, proto, serange, type) + + (rc, p) = semanage_port_create(self.sh) + if rc < 0: +@@ -890,6 +928,7 @@ + self.commit() + + def __modify(self, port, proto, serange, setype): ++ + if serange == "" and setype == "": + if is_mls_enabled == 1: + raise ValueError(_("Requires setype or serange")) +@@ -1024,6 +1063,18 @@ + ddict[(ctype,proto_str)].append("%d-%d" % (low, high)) + return ddict + ++ def customized(self): ++ l = [] ++ ddict = self.get_all(True) ++ keys = ddict.keys() ++ keys.sort() ++ for k in keys: ++ if k[0] == k[1]: ++ l.append("-a -t %s -p %s %s" % (ddict[k][0], k[2], k[0])) ++ else: ++ l.append("-a -t %s -p %s %s-%s" % (ddict[k][0], k[2], k[0], k[1])) ++ return l ++ + def list(self, heading = 1, locallist = 0): + if heading: + print "%-30s %-8s %s\n" % (_("SELinux Port Type"), _("Proto"), _("Port Number")) +@@ -1040,7 +1091,8 @@ + class nodeRecords(semanageRecords): + def __init__(self, store = ""): + semanageRecords.__init__(self,store) +- ++ self.protocol = ["ipv4", "ipv6"] ++ + def __add(self, addr, mask, proto, serange, ctype): + if addr == "": + raise ValueError(_("Node Address is required")) +@@ -1048,14 +1100,11 @@ + if mask == "": + raise ValueError(_("Node Netmask is required")) + +- if proto == "ipv4": +- proto = 0 +- elif proto == "ipv6": +- proto = 1 +- else: ++ try: ++ proto = self.protocol.index(proto) ++ except: + raise ValueError(_("Unknown or missing protocol")) + +- + if is_mls_enabled == 1: + if serange == "": + serange = "s0" +@@ -1073,7 +1122,8 @@ + + (rc, exists) = semanage_node_exists(self.sh, k) + if exists: +- raise ValueError(_("Addr %s already defined") % addr) ++ semanage_node_key_free(k) ++ return self.__modify(addr, mask, self.protocol[proto], serange, ctype) + + (rc, node) = semanage_node_create(self.sh) + if rc < 0: +@@ -1120,7 +1170,7 @@ def add(self, addr, mask, proto, serange, ctype): self.begin() @@ -2601,7 +3151,126 @@ diff --exclude-from=exclude --exclude=se self.commit() def __modify(self, addr, mask, proto, serange, setype): -@@ -1420,6 +1410,48 @@ +@@ -1129,13 +1179,10 @@ + + if mask == "": + raise ValueError(_("Node Netmask is required")) +- if proto == "ipv4": +- proto = 0 +- elif proto == "ipv6": +- proto = 1 +- else: +- raise ValueError(_("Unknown or missing protocol")) +- ++ try: ++ proto = self.protocol.index(proto) ++ except: ++ raise ValueError(_("Unknown or missing protocol")) + + if serange == "" and setype == "": + raise ValueError(_("Requires setype or serange")) +@@ -1180,11 +1227,9 @@ + if mask == "": + raise ValueError(_("Node Netmask is required")) + +- if proto == "ipv4": +- proto = 0 +- elif proto == "ipv6": +- proto = 1 +- else: ++ try: ++ proto = self.protocol.index(proto) ++ except: + raise ValueError(_("Unknown or missing protocol")) + + (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto) +@@ -1214,6 +1259,16 @@ + self.__delete(addr, mask, proto) + self.commit() + ++ def deleteall(self): ++ (rc, nlist) = semanage_node_list_local(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not deleteall node mappings")) ++ ++ self.begin() ++ for node in nlist: ++ self.__delete(semanage_node_get_addr(self.sh, node)[1], semanage_node_get_mask(self.sh, node)[1], self.protocol[semanage_node_get_proto(node)]) ++ self.commit() ++ + def get_all(self, locallist = 0): + ddict = {} + if locallist : +@@ -1227,15 +1282,20 @@ + con = semanage_node_get_con(node) + addr = semanage_node_get_addr(self.sh, node) + mask = semanage_node_get_mask(self.sh, node) +- proto = semanage_node_get_proto(node) +- if proto == 0: +- proto = "ipv4" +- elif proto == 1: +- proto = "ipv6" ++ proto = self.protocol[semanage_node_get_proto(node)] + ddict[(addr[1], mask[1], proto)] = (semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)) + + return ddict + ++ def customized(self): ++ l = [] ++ ddict = self.get_all(True) ++ keys = ddict.keys() ++ keys.sort() ++ for k in keys: ++ l.append("-a -M %s -p %s -t %s %s" % (k[1], k[2],ddict[k][2], k[0])) ++ return l ++ + def list(self, heading = 1, locallist = 0): + if heading: + print "%-18s %-18s %-5s %-5s\n" % ("IP Address", "Netmask", "Protocol", "Context") +@@ -1275,7 +1335,8 @@ + if rc < 0: + raise ValueError(_("Could not check if interface %s is defined") % interface) + if exists: +- raise ValueError(_("Interface %s already defined") % interface) ++ semanage_iface_key_free(k) ++ return self.__modify(interface, serange, ctype) + + (rc, iface) = semanage_iface_create(self.sh) + if rc < 0: +@@ -1389,6 +1450,16 @@ + self.__delete(interface) + self.commit() + ++ def deleteall(self): ++ (rc, ulist) = semanage_iface_list_local(self.sh) ++ if rc < 0: ++ raise ValueError(_("Could not delete all interface mappings")) ++ ++ self.begin() ++ for i in ulist: ++ self.__delete(semanage_iface_get_name(i)) ++ self.commit() ++ + def get_all(self, locallist = 0): + ddict = {} + if locallist: +@@ -1404,6 +1475,15 @@ + + return ddict + ++ def customized(self): ++ l = [] ++ ddict = self.get_all(True) ++ keys = ddict.keys() ++ keys.sort() ++ for k in keys: ++ l.append("-a -t %s %s" % (ddict[k][2], k)) ++ return l ++ + def list(self, heading = 1, locallist = 0): + if heading: + print "%-30s %s\n" % (_("SELinux Interface"), _("Context")) +@@ -1420,6 +1500,48 @@ class fcontextRecords(semanageRecords): def __init__(self, store = ""): semanageRecords.__init__(self, store) @@ -2650,7 +3319,17 @@ diff --exclude-from=exclude --exclude=se def createcon(self, target, seuser = "system_u"): (rc, con) = semanage_context_create(self.sh) -@@ -1586,9 +1618,16 @@ +@@ -1470,7 +1592,8 @@ + raise ValueError(_("Could not check if file context for %s is defined") % target) + + if exists: +- raise ValueError(_("File context for %s already defined") % target) ++ semanage_fcontext_key_free(k) ++ return self.__modify(target, type, ftype, serange, seuser) + + (rc, fcontext) = semanage_fcontext_create(self.sh) + if rc < 0: +@@ -1586,9 +1709,16 @@ raise ValueError(_("Could not delete the file context %s") % target) semanage_fcontext_key_free(k) @@ -2667,9 +3346,20 @@ diff --exclude-from=exclude --exclude=se (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype]) if rc < 0: raise ValueError(_("Could not create a key for %s") % target) -@@ -1644,11 +1683,11 @@ +@@ -1643,12 +1773,22 @@ + return ddict ++ def customized(self): ++ l = [] ++ fcon_dict = self.get_all(True) ++ keys = fcon_dict.keys() ++ keys.sort() ++ for k in keys: ++ if fcon_dict[k]: ++ l.append("-a -f '%s' -t %s '%s'" % (k[1], fcon_dict[k][2], k[0])) ++ return l ++ def list(self, heading = 1, locallist = 0 ): - if heading: - print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context")) @@ -2681,9 +3371,26 @@ diff --exclude-from=exclude --exclude=se for k in keys: if fcon_dict[k]: if is_mls_enabled: +@@ -1794,6 +1934,16 @@ + else: + return _("unknown") + ++ def customized(self): ++ l = [] ++ ddict = self.get_all(True) ++ keys = ddict.keys() ++ keys.sort() ++ for k in keys: ++ if ddict[k]: ++ l.append("-%s %s" % (ddict[k][2], k)) ++ return l ++ + def list(self, heading = True, locallist = False, use_file = False): + on_off = (_("off"), _("on")) + if use_file: diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.74/semodule/semodule.8 --- nsapolicycoreutils/semodule/semodule.8 2009-09-17 08:59:43.000000000 -0400 -+++ policycoreutils-2.0.74/semodule/semodule.8 2009-09-25 15:21:16.000000000 -0400 ++++ policycoreutils-2.0.74/semodule/semodule.8 2009-10-15 10:37:41.000000000 -0400 @@ -35,6 +35,12 @@ .B \-b,\-\-base=MODULE_PKG install/replace base module package @@ -2699,7 +3406,7 @@ diff --exclude-from=exclude --exclude=se .TP diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.74/semodule/semodule.c --- nsapolicycoreutils/semodule/semodule.c 2009-09-17 08:59:43.000000000 -0400 -+++ policycoreutils-2.0.74/semodule/semodule.c 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/semodule/semodule.c 2009-10-15 10:37:41.000000000 -0400 @@ -22,12 +22,12 @@ #include @@ -2819,7 +3526,7 @@ diff --exclude-from=exclude --exclude=se } diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.74/setfiles/Makefile --- nsapolicycoreutils/setfiles/Makefile 2009-07-07 15:32:32.000000000 -0400 -+++ policycoreutils-2.0.74/setfiles/Makefile 2009-09-25 15:21:58.000000000 -0400 ++++ policycoreutils-2.0.74/setfiles/Makefile 2009-10-15 10:37:41.000000000 -0400 @@ -16,7 +16,7 @@ all: setfiles restorecon @@ -2831,7 +3538,7 @@ diff --exclude-from=exclude --exclude=se ln -sf setfiles restorecon diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.74/setfiles/restore.c --- nsapolicycoreutils/setfiles/restore.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/setfiles/restore.c 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/setfiles/restore.c 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,519 @@ +#include "restore.h" + @@ -3352,9 +4059,35 @@ diff --exclude-from=exclude --exclude=se + + + +diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.74/setfiles/restorecon.8 +--- nsapolicycoreutils/setfiles/restorecon.8 2008-08-28 09:34:24.000000000 -0400 ++++ policycoreutils-2.0.74/setfiles/restorecon.8 2009-10-22 08:41:15.000000000 -0400 +@@ -4,10 +4,10 @@ + + .SH "SYNOPSIS" + .B restorecon +-.I [\-o outfilename ] [\-R] [\-n] [\-v] [\-e directory ] pathname... ++.I [\-o outfilename ] [\-R] [\-n] [\-p] [\-v] [\-e directory ] pathname... + .P + .B restorecon +-.I \-f infilename [\-o outfilename ] [\-e directory ] [\-R] [\-n] [\-v] [\-F] ++.I \-f infilename [\-o outfilename ] [\-e directory ] [\-R] [\-n] [\-p] [\-v] [\-F] + + .SH "DESCRIPTION" + This manual page describes the +@@ -40,6 +40,9 @@ + .TP + .B \-o outfilename + save list of files with incorrect context in outfilename. ++.TP ++.B \-p ++show progress by printing * every 1000 files. + .TP + .B \-v + show changes in file labels. diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.74/setfiles/restore.h --- nsapolicycoreutils/setfiles/restore.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.74/setfiles/restore.h 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/setfiles/restore.h 2009-10-15 10:37:41.000000000 -0400 @@ -0,0 +1,49 @@ +#ifndef RESTORE_H +#define RESTORE_H @@ -3405,10 +4138,22 @@ diff --exclude-from=exclude --exclude=se +int process_one(char *name, int recurse); + +#endif -Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.74/setfiles/restore.o differ +diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.74/setfiles/setfiles.8 +--- nsapolicycoreutils/setfiles/setfiles.8 2008-08-28 09:34:24.000000000 -0400 ++++ policycoreutils-2.0.74/setfiles/setfiles.8 2009-10-22 08:37:16.000000000 -0400 +@@ -31,6 +31,9 @@ + .TP + .B \-n + don't change any file labels. ++.TP ++.B \-p ++show progress by printing * every 1000 files. + .TP + .B \-q + suppress non-error output. diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.74/setfiles/setfiles.c --- nsapolicycoreutils/setfiles/setfiles.c 2009-09-17 08:59:43.000000000 -0400 -+++ policycoreutils-2.0.74/setfiles/setfiles.c 2009-09-20 21:26:36.000000000 -0400 ++++ policycoreutils-2.0.74/setfiles/setfiles.c 2009-10-22 08:42:29.000000000 -0400 @@ -1,26 +1,12 @@ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE @@ -3484,7 +4229,7 @@ diff --exclude-from=exclude --exclude=se #define SETFILES "setfiles" #define RESTORECON "restorecon" -@@ -73,246 +41,9 @@ +@@ -73,257 +41,20 @@ /* Behavior flags determined based on setfiles vs. restorecon */ static int expand_realpath; /* Expand paths via realpath. */ @@ -3731,6 +4476,19 @@ diff --exclude-from=exclude --exclude=se void usage(const char *const name) { if (iamrestorecon) { + fprintf(stderr, +- "usage: %s [-iFnrRv0] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n", ++ "usage: %s [-iFnprRv0] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n", + name); + } else { + fprintf(stderr, + "usage: %s [-dnpqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n" + "usage: %s -c policyfile spec_file\n" +- "usage: %s -s [-dnqvW] [-o filename ] spec_file\n", name, name, ++ "usage: %s -s [-dnpqvW] [-o filename ] spec_file\n", name, name, + name); + } + exit(1); @@ -334,194 +65,30 @@ void inc_err() { Index: policycoreutils.spec =================================================================== RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v retrieving revision 1.653 retrieving revision 1.654 diff -u -p -r1.653 -r1.654 --- policycoreutils.spec 19 Oct 2009 20:14:48 -0000 1.653 +++ policycoreutils.spec 2 Nov 2009 16:40:36 -0000 1.654 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.74 -Release: 12%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -296,6 +296,16 @@ fi exit 0 %changelog +* Fri Oct 30 2009 Dan Walsh 2.0.74-15 +- Fix typo in seobject.py + +* Fri Oct 30 2009 Dan Walsh 2.0.74-14 +- Allow semanage -i and semanage -o to generate customization files. +- semanage -o will generate a customization file that semanage -i can read and set a machines to the same selinux configuration + +* Tue Oct 20 2009 Dan Walsh 2.0.74-13 +- Fix restorecond man page + * Mon Oct 19 2009 Dan Walsh 2.0.74-12 - Add generation of the users context file to polgengui From mhlavink at fedoraproject.org Mon Nov 2 16:48:00 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 16:48:00 +0000 (UTC) Subject: rpms/dovecot/F-12 dovecot.spec,1.144,1.145 Message-ID: <20091102164800.2733C11C0086@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/dovecot/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7874 Modified Files: dovecot.spec Log Message: * Mon Nov 02 2009 Michal Hlavinka - 1:1.2.6-5 - spec cleanup Index: dovecot.spec =================================================================== RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -p -r1.144 -r1.145 --- dovecot.spec 21 Oct 2009 10:44:31 -0000 1.144 +++ dovecot.spec 2 Nov 2009 16:47:59 -0000 1.145 @@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server Name: dovecot Epoch: 1 Version: 1.2.6 -Release: 4%{?dist} +Release: 5%{?dist} #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+ License: MIT and LGPLv2 and GPLv2+ Group: System Environment/Daemons @@ -89,18 +89,18 @@ Dovecot is an IMAP server for Linux/UNIX primarily in mind. It also contains a small POP3 server. It supports mail in either of maildir or mbox formats. -The SQL drivers and authentication plugins are in their subpackages. +The SQL drivers and authentication plug-ins are in their subpackages. %if %{build_sieve} %package sieve Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: Sieve plugin for dovecot LDA +Summary: Sieve plug-in for dovecot LDA Group: System Environment/Daemons License: MIT and LGPLv2+ %description sieve -This package provides sieve plugin version %{sieve_version} for dovecot LDA. +This package provides sieve plug-in version %{sieve_version} for dovecot LDA. %endif %if %{build_managesieve} @@ -108,7 +108,7 @@ This package provides sieve plugin versi Requires: %{name} = %{epoch}:%{version}-%{release} Summary: Manage Sieve daemon for dovecot Group: System Environment/Daemons -License: LGPLv2.1 +License: LGPLv2 %description managesieve This package provides the Manage Sieve daemon version %{managesieve_version} for dovecot. @@ -117,51 +117,51 @@ This package provides the Manage Sieve d %if %{build_postgres} %package pgsql Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: Postgres SQL backend for dovecot +Summary: Postgres SQL back end for dovecot Group: System Environment/Daemons %description pgsql -This package provides the Postgres SQL backend for dovecot-auth etc. +This package provides the Postgres SQL back end for dovecot-auth etc. %endif %if %{build_mysql} %package mysql Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: MySQL backend for dovecot +Summary: MySQL back end for dovecot Group: System Environment/Daemons %description mysql -This package provides the MySQL backend for dovecot-auth etc. +This package provides the MySQL back end for dovecot-auth etc. %endif %if %{build_sqlite} %package sqlite Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: SQLite backend for dovecot +Summary: SQLite back end for dovecot Group: System Environment/Daemons %description sqlite -This package provides the SQLite backend for dovecot-auth etc. +This package provides the SQLite back end for dovecot-auth etc. %endif %if %{build_ldap} %package ldap Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: LDAP auth plugin for dovecot +Summary: LDAP auth plug-in for dovecot Group: System Environment/Daemons %description ldap -This package provides the LDAP auth plugin for dovecot-auth etc. +This package provides the LDAP auth plug-in for dovecot-auth etc. %endif %if %{build_gssapi} %package gssapi Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: GSSAPI auth mechanism plugin for dovecot +Summary: GSSAPI auth mechanism plug-in for dovecot Group: System Environment/Daemons %description gssapi -This package provides the GSSAPI auth mechanism plugin for dovecot-auth etc. +This package provides the GSSAPI auth mechanism plug-in for dovecot-auth etc. %endif %package devel Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: Development files dor dovecot +Summary: Development files for dovecot Group: Development/Libraries %description devel This package provides the development files for dovecot. @@ -294,9 +294,20 @@ do install -p -m644 $f $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration done +# fix encoding +pushd $RPM_BUILD_ROOT +for fe in ./%{docdir}/auth-protocol.txt +do + iconv -f iso-8859-1 -t utf-8 <$fe >$fe.new + touch -r $fe $fe.new + mv -f $fe.new $fe +done +popd + mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version} mkdir -p $RPM_BUILD_ROOT/var/lib/dovecot + %if %{build_sieve} # dovecot-sieve pushd %{sieve_name}-%{sieve_version} @@ -441,6 +452,9 @@ fi %changelog +* Mon Nov 02 2009 Michal Hlavinka - 1:1.2.6-5 +- spec cleanup + * Wed Oct 21 2009 Michal Hlavinka - 1:1.2.6-4 - imap-login: If imap_capability is set, show it in the banner instead of the default (#524485) From mhlavink at fedoraproject.org Mon Nov 2 16:48:55 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 16:48:55 +0000 (UTC) Subject: rpms/pciutils/F-12 pciutils.spec,1.81,1.82 Message-ID: <20091102164855.637C211C0086@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/pciutils/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8056 Modified Files: pciutils.spec Log Message: remove trailing spaces from changelog Index: pciutils.spec =================================================================== RCS file: /cvs/extras/rpms/pciutils/F-12/pciutils.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -p -r1.81 -r1.82 --- pciutils.spec 30 Oct 2009 17:37:35 -0000 1.81 +++ pciutils.spec 2 Nov 2009 16:48:55 -0000 1.82 @@ -145,8 +145,8 @@ rm -rf $RPM_BUILD_ROOT * Mon Oct 26 2009 Michal Hlavinka - 3.1.4-5 - fix build to enable -F option (#531020) -* Fri Oct 23 2009 Michal Hlavinka - 3.1.4-4 -- use direct hardware access method for 64bit architectures +* Mon Oct 26 2009 Michal Hlavinka - 3.1.4-4 +- enable direct hardware access method for 64bit architectures * Mon Oct 12 2009 Michal Hlavinka - 3.1.4-3 - don't ship static library in -devel sub-package From sayamind at fedoraproject.org Mon Nov 2 16:49:17 2009 From: sayamind at fedoraproject.org (Sayamindu Dasgupta) Date: Mon, 2 Nov 2009 16:49:17 +0000 (UTC) Subject: rpms/olpc-utils/F-11 .cvsignore, 1.4, 1.5 olpc-utils.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <20091102164917.5999311C0086@cvs1.fedora.phx.redhat.com> Author: sayamind Update of /cvs/pkgs/rpms/olpc-utils/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8227 Modified Files: .cvsignore olpc-utils.spec sources Log Message: New upstream version 1.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 6 Jul 2009 13:59:38 -0000 1.4 +++ .cvsignore 2 Nov 2009 16:49:16 -0000 1.5 @@ -1 +1 @@ -olpc-utils-1.0.3.tar.bz2 +olpc-utils-1.0.4.tar.bz2 Index: olpc-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/olpc-utils.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- olpc-utils.spec 22 Oct 2009 18:56:51 -0000 1.11 +++ olpc-utils.spec 2 Nov 2009 16:49:16 -0000 1.12 @@ -1,6 +1,6 @@ Name: olpc-utils -Version: 1.0.3 -Release: 3%{?dist} +Version: 1.0.4 +Release: 1%{?dist} Summary: OLPC utilities URL: http://dev.laptop.org/git?p=projects/olpc-utils;a=summary Group: System Environment/Base @@ -8,8 +8,8 @@ License: GPLv2+ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: olpc-utils-dmidetect.patch -Patch2: olpc-utils-xorg_modefix.patch +#Patch1: olpc-utils-dmidetect.patch +#Patch2: olpc-utils-xorg_modefix.patch # for olpc-dm BuildRequires: ConsoleKit-devel @@ -33,8 +33,8 @@ becoming root, and cleaning the datastor %prep %setup -q -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 +#%patch2 -p1 %build make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}" @@ -86,6 +86,10 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck %changelog +* Mon Nov 02 2009 Sayamindu Dasgupta 1.0.4-1 +- New upstream bugfix release +- Drop all patches (upstreamed) + * Fri Oct 23 2009 Sayamindu Dasgupta 1.0.3-3 - Make our X modeline match that of kernel and OFW (dlo #9538) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 6 Jul 2009 13:59:38 -0000 1.5 +++ sources 2 Nov 2009 16:49:16 -0000 1.6 @@ -1 +1 @@ -e3c9213eaa3ba920b8d5c3b6dcbdc381 olpc-utils-1.0.3.tar.bz2 +b28b31d198500218ed5279caf554c343 olpc-utils-1.0.4.tar.bz2 From mhlavink at fedoraproject.org Mon Nov 2 16:50:35 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 16:50:35 +0000 (UTC) Subject: rpms/nmap/devel nmap.spec,1.58,1.59 Message-ID: <20091102165035.4ACBB11C0338@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/nmap/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8751 Modified Files: nmap.spec Log Message: * Mon Nov 02 2009 Michal Hlavinka - 2:5.00-4 - spec cleanup Index: nmap.spec =================================================================== RCS file: /cvs/extras/rpms/nmap/devel/nmap.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- nmap.spec 21 Aug 2009 14:42:37 -0000 1.58 +++ nmap.spec 2 Nov 2009 16:50:34 -0000 1.59 @@ -1,7 +1,9 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Network exploration tool and security scanner Name: nmap Version: 5.00 -Release: 3%{?dist} +Release: 4%{?dist} # libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999) License: GPLv2 Group: Applications/System @@ -23,10 +25,9 @@ URL: http://nmap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Epoch: 2 BuildRequires: openssl-devel, gtk2-devel, lua-devel, libpcap-devel, pcre-devel -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, dos2unix %define pixmap_srcdir zenmap/share/pixmaps -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description Nmap is a utility for network exploration or security auditing. It supports @@ -37,13 +38,13 @@ and port specification, decoy scanning, predictability characteristics, reverse-identd scanning, and more. %package frontend -Summary: the GTK+ frontend for nmap +Summary: The GTK+ front end for nmap Group: Applications/System Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 python-sqlite2 usermode -BuildRequires: python >= 2.5 pygtk2-devel libpng-devel +BuildRequires: python >= 2.5 python-devel pygtk2-devel libpng-devel %description frontend -This package includes zenmap, a GTK+ frontend for nmap. The nmap package must -be installed before installing nmap-frontend. +This package includes zenmap, a GTK+ front end for nmap. The nmap package must +be installed before installing nmap front end. %prep %setup -q @@ -53,6 +54,13 @@ be installed before installing nmap-fron rm -rf liblua libpcap libpcre +#fix locale dir +mv zenmap/share/zenmap/locale zenmap/share +sed -i -e "s|^locale_dir =.*$|locale_dir = os.path.join('share','locale')|" \ + -e 's|join(self.install_data, data_dir)|join(self.install_data, "share")|' zenmap/setup.py +sed -i 's|^LOCALE_DIR = .*|LOCALE_DIR = join(prefix, "share", "locale")|' zenmap/zenmapCore/Paths.py + + %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" @@ -68,7 +76,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/uninstal #use consolehelper rm -f $RPM_BUILD_ROOT%{_datadir}/applications/zenmap*.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/zenmap/su-to-zenmap.sh -ln -s /usr/bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/zenmap-root +ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/zenmap-root mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/zenmap-root @@ -88,7 +96,19 @@ desktop-file-install --vendor nmap \ #for .desktop and app icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -ln -s %{_datadir}/zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +ln -s ../../../../zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps + +# fix end-of-line +pushd $RPM_BUILD_ROOT +for fe in ./%{python_sitelib}/zenmapCore/Paths.py +do + dos2unix <$fe >$fe.new + touch -r $fe $fe.new + mv -f $fe.new $fe +done +popd + +%find_lang zenmap %clean rm -rf $RPM_BUILD_ROOT @@ -107,10 +127,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/nmap %{_datadir}/ncat -%files frontend +%files frontend -f zenmap.lang %defattr(-,root,root) -%config %{_sysconfdir}/pam.d/zenmap-root -%config %{_sysconfdir}/security/console.apps/zenmap-root +%config(noreplace) %{_sysconfdir}/pam.d/zenmap-root +%config(noreplace) %{_sysconfdir}/security/console.apps/zenmap-root %{_bindir}/zenmap-root %{_bindir}/zenmap %{_bindir}/nmapfe @@ -124,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xnmap.1.gz %changelog +* Mon Nov 02 2009 Michal Hlavinka - 2:5.00-4 +- spec cleanup + * Fri Aug 21 2009 Tomas Mraz - 2:5.00-3 - rebuilt with new openssl From mclasen at fedoraproject.org Mon Nov 2 16:52:04 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 16:52:04 +0000 (UTC) Subject: rpms/DeviceKit/F-12 dead.package, NONE, 1.1 DeviceKit.spec, 1.12, NONE Makefile, 1.1, NONE branch, 1.1, NONE devicekit-dbus-permissions.patch, 1.2, NONE import.log, 1.1, NONE sources, 1.4, NONE Message-ID: <20091102165204.451EA11C02BC@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/DeviceKit/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9164 Added Files: dead.package Removed Files: DeviceKit.spec Makefile branch devicekit-dbus-permissions.patch import.log sources Log Message: DeviceKit is an obsolete package --- NEW FILE dead.package --- Obsolete package --- DeviceKit.spec DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- devicekit-dbus-permissions.patch DELETED --- --- import.log DELETED --- --- sources DELETED --- From mclasen at fedoraproject.org Mon Nov 2 16:53:16 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 16:53:16 +0000 (UTC) Subject: rpms/DeviceKit/devel dead.package, NONE, 1.1 DeviceKit.spec, 1.12, NONE Makefile, 1.1, NONE devicekit-dbus-permissions.patch, 1.2, NONE import.log, 1.1, NONE sources, 1.4, NONE Message-ID: <20091102165316.8DCEC11C0086@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/DeviceKit/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9490 Added Files: dead.package Removed Files: DeviceKit.spec Makefile devicekit-dbus-permissions.patch import.log sources Log Message: DeviceKit is an obsolete package --- NEW FILE dead.package --- Obsolete package --- DeviceKit.spec DELETED --- --- Makefile DELETED --- --- devicekit-dbus-permissions.patch DELETED --- --- import.log DELETED --- --- sources DELETED --- From mhlavink at fedoraproject.org Mon Nov 2 16:54:13 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 16:54:13 +0000 (UTC) Subject: rpms/smartmontools/devel smartd.initd, 1.10, 1.11 smartmontools.spec, 1.64, 1.65 Message-ID: <20091102165413.5828111C0086@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/smartmontools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9812 Modified Files: smartd.initd smartmontools.spec Log Message: spec cleanup Index: smartd.initd =================================================================== RCS file: /cvs/extras/rpms/smartmontools/devel/smartd.initd,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- smartd.initd 9 Oct 2009 18:51:01 -0000 1.10 +++ smartd.initd 2 Nov 2009 16:54:12 -0000 1.11 @@ -14,6 +14,8 @@ # Required-Start: $local_fs $network # Required-Stop: $local_fs $network # Should-Start: +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 # Short-Description: Self Monitoring and Reporting Technology (SMART) Daemon # Description: The smartd daemon monitors SMART status of the local hard drives and # provides advanced warnings of of disk degradation or failures. Index: smartmontools.spec =================================================================== RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -p -r1.64 -r1.65 --- smartmontools.spec 12 Oct 2009 15:07:07 -0000 1.64 +++ smartmontools.spec 2 Nov 2009 16:54:13 -0000 1.65 @@ -1,7 +1,7 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools Version: 5.38 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -10,15 +10,15 @@ Source0: http://prdownloads.sourceforge. Source1: smartd.initd Source2: smartmontools.sysconf Patch1: smartmontools-5.38-cloexec.patch -Patch2: smartmontools-5.37-addrinfo.patch -Patch3: smartmontools-5.38-perc.patch -Patch4: smartmontools-5.38-selinux.patch -Patch5: smartmontools-5.38-defaultconf.patch -Patch6: smartmontools-5.38-lowcap.patch +Patch2: smartmontools-5.37-addrinfo.patch +Patch3: smartmontools-5.38-perc.patch +Patch4: smartmontools-5.38-selinux.patch +Patch5: smartmontools-5.38-defaultconf.patch +Patch6: smartmontools-5.38-lowcap.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: fileutils mailx chkconfig initscripts -BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext -BuildRequires: libselinux-devel libcap-ng-devel +BuildRequires: readline-devel ncurses-devel /usr/bin/aclocal util-linux groff gettext +BuildRequires: libselinux-devel libcap-ng-devel %description The smartmontools package contains two utility programs (smartctl @@ -37,6 +37,14 @@ failure. %patch5 -p1 -b .defaultconf %patch6 -p1 -b .lowcap +# fix encoding +for fe in AUTHORS CHANGELOG +do + iconv -f iso-8859-1 -t utf-8 <$fe >$fe.new + touch -r $fe $fe.new + mv -f $fe.new $fe +done + %build ln -s CHANGELOG ChangeLog autoreconf -i @@ -46,12 +54,14 @@ make CXXFLAGS="$RPM_OPT_FLAGS -fPIE" LDF %else make CXXFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now" %endif + %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install #rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd.conf rm -f examplescripts/Makefile* +chmod a-x -R examplescripts/* install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools @@ -73,13 +83,16 @@ fi %doc TODO WARNINGS examplescripts smartd.conf %{_sbindir}/smartd %{_sbindir}/smartctl -%{_initrddir}/smartd +%{_initddir}/smartd %{_mandir}/man?/smart*.* %config(noreplace) %{_sysconfdir}/smartd.conf %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools %changelog -* Mon Oct 12 2009 Michal Hlavinka - 1:5.38-21 +* Mon Nov 02 2009 Michal Hlavinka - 1:5.38-22 +- spec cleanup + +* Mon Oct 12 2009 Michal Hlavinka - 1:5.38-21 - warn about disabled mail only if capabilities are enabled * Fri Oct 09 2009 Michal Hlavinka - 1:5.38-20 From mhlavink at fedoraproject.org Mon Nov 2 16:55:09 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 16:55:09 +0000 (UTC) Subject: rpms/setuptool/devel setuptool.spec,1.40,1.41 Message-ID: <20091102165509.A16F811C0086@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/setuptool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10097 Modified Files: setuptool.spec Log Message: * Mon Nov 02 2009 Michal Hlavinka 1.19.9-2 - spec cleanup Index: setuptool.spec =================================================================== RCS file: /cvs/extras/rpms/setuptool/devel/setuptool.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- setuptool.spec 20 Oct 2009 18:04:17 -0000 1.40 +++ setuptool.spec 2 Nov 2009 16:55:08 -0000 1.41 @@ -1,6 +1,6 @@ Name: setuptool Version: 1.19.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A text mode system configuration tool License: GPLv2+ Group: Applications/System @@ -34,15 +34,18 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc README COPYING %{_bindir}/setup -%config %{_sysconfdir}/pam.d/* -%config(noreplace) %{_sysconfdir}/security/console.apps/* +%config(noreplace) %{_sysconfdir}/pam.d/setup +%config(noreplace) %{_sysconfdir}/security/console.apps/setup %{_sbindir}/setup %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/setuptool.d %dir %{_sysconfdir}/setuptool.d -%config %{_sysconfdir}/setuptool.d/* +%config(noreplace) %{_sysconfdir}/setuptool.d/* %changelog +* Mon Nov 02 2009 Michal Hlavinka 1.19.9-2 +- spec cleanup + * Tue Oct 21 2009 Michal Hlavinka 1.19.9-1 - update path of firewall configuration tool (#529794) - update translations From mhlavink at fedoraproject.org Mon Nov 2 16:57:41 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 16:57:41 +0000 (UTC) Subject: rpms/pciutils/F-12 pciutils.spec,1.82,1.83 Message-ID: <20091102165741.9C80611C0086@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/pciutils/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10773 Modified Files: pciutils.spec Log Message: * Mon Nov 02 2009 Michal Hlavinka - 3.1.4-6 - spec cleanup Index: pciutils.spec =================================================================== RCS file: /cvs/extras/rpms/pciutils/F-12/pciutils.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -p -r1.82 -r1.83 --- pciutils.spec 2 Nov 2009 16:48:55 -0000 1.82 +++ pciutils.spec 2 Nov 2009 16:57:41 -0000 1.83 @@ -1,6 +1,6 @@ Name: pciutils Version: 3.1.4 -Release: 5%{?dist} +Release: 6%{?dist} Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz #truncate too long names (#205948) @@ -142,6 +142,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 02 2009 Michal Hlavinka - 3.1.4-6 +- spec cleanup + * Mon Oct 26 2009 Michal Hlavinka - 3.1.4-5 - fix build to enable -F option (#531020) From mhlavink at fedoraproject.org Mon Nov 2 16:58:23 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 16:58:23 +0000 (UTC) Subject: rpms/pciutils/devel pciutils.spec,1.80,1.81 Message-ID: <20091102165823.050D011C0086@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/pciutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11000 Modified Files: pciutils.spec Log Message: * Mon Nov 02 2009 Michal Hlavinka - 3.1.4-6 - spec cleanup Index: pciutils.spec =================================================================== RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -p -r1.80 -r1.81 --- pciutils.spec 26 Oct 2009 16:30:10 -0000 1.80 +++ pciutils.spec 2 Nov 2009 16:58:21 -0000 1.81 @@ -1,25 +1,25 @@ Name: pciutils Version: 3.1.4 -Release: 5%{?dist} +Release: 6%{?dist} Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz #truncate too long names (#205948) -Patch1: pciutils-2.2.4-buf.patch +Patch1: pciutils-2.2.4-buf.patch #don't segfault on systems without PCI bus (#84146) Patch2: pciutils-2.1.10-scan.patch #use pread/pwrite, ifdef check is obsolete nowadays -Patch3: pciutils-havepread.patch +Patch3: pciutils-havepread.patch #change pci.ids directory to hwdata -Patch6: pciutils-2.2.1-idpath.patch +Patch6: pciutils-2.2.1-idpath.patch #multilib support -Patch8: pciutils-3.0.2-multilib.patch +Patch8: pciutils-3.0.2-multilib.patch #add support for directory with another pci.ids -Patch9: pciutils-dir-d.patch +Patch9: pciutils-dir-d.patch #platform support 3x Patch10: pciutils-2.2.10-sparc-support.patch @@ -28,8 +28,8 @@ Patch12: pciutils-3.1.2-arm.patch License: GPLv2+ URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveOS: Linux +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExclusiveOS: Linux Requires: hwdata BuildRequires: sed Summary: PCI bus related utilities @@ -106,7 +106,7 @@ install -p lib/libpci.so.*.*.* $RPM_BUI ln -s $(basename $RPM_BUILD_ROOT%{_libdir}/*.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpci.so mv lib/libpci.a.toinstall lib/libpci.a -install -p lib/libpci.a $RPM_BUILD_ROOT%{_libdir} +install -p -m 644 lib/libpci.a $RPM_BUILD_ROOT%{_libdir} /sbin/ldconfig -N $RPM_BUILD_ROOT%{_libdir} install -p lib/pci.h $RPM_BUILD_ROOT%{_includedir}/pci install -p lib/header.h $RPM_BUILD_ROOT%{_includedir}/pci @@ -120,14 +120,16 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT %files %defattr(0644, root, root, 0755) +%doc README ChangeLog pciutils.lsm COPYING %{_mandir}/man8/* %attr(0755, root, root) /sbin/* -%doc README ChangeLog pciutils.lsm COPYING %files libs +%defattr(-,root,root,-) %{_libdir}/libpci.so.* %files devel-static +%defattr(-,root,root,-) %{_libdir}/libpci.a %files devel @@ -140,6 +142,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 02 2009 Michal Hlavinka - 3.1.4-6 +- spec cleanup + * Mon Oct 26 2009 Michal Hlavinka - 3.1.4-5 - fix build to enable -F option (#531020) @@ -496,7 +501,7 @@ print out 64-bit addresses. * Thu May 20 1999 Bill Nottingham - update to 2.0 -* Mon Apr 19 1999 Jakub Jelinek +* Mon Apr 19 1999 Jakub Jelinek - update to 1.99.5 - fix sparc64 operation From pkgdb at fedoraproject.org Mon Nov 2 17:02:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:02:24 +0000 Subject: [pkgdb] c-ares: jhrozek has requested watchbugzilla Message-ID: <20091102170224.616A110F802@bastion2.fedora.phx.redhat.com> jhrozek has requested the watchbugzilla acl on c-ares (Fedora devel) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:02:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:02:24 +0000 Subject: [pkgdb] c-ares: jhrozek has requested watchcommits Message-ID: <20091102170225.32FED10F872@bastion2.fedora.phx.redhat.com> jhrozek has requested the watchcommits acl on c-ares (Fedora devel) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:02:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:02:33 +0000 Subject: [pkgdb] c-ares: jhrozek has requested commit Message-ID: <20091102170233.1B57C10F7FF@bastion2.fedora.phx.redhat.com> jhrozek has requested the commit acl on c-ares (Fedora devel) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:07 +0000 Subject: [pkgdb] c-ares: jhrozek has requested watchbugzilla Message-ID: <20091102170307.9D16B10F7FF@bastion2.fedora.phx.redhat.com> jhrozek has requested the watchbugzilla acl on c-ares (Fedora 12) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:07 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:07 +0000 Subject: [pkgdb] c-ares: jhrozek has requested watchcommits Message-ID: <20091102170307.D1F5510F86F@bastion2.fedora.phx.redhat.com> jhrozek has requested the watchcommits acl on c-ares (Fedora 12) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:09 +0000 Subject: [pkgdb] c-ares: jhrozek has requested commit Message-ID: <20091102170309.7F5D510F87D@bastion2.fedora.phx.redhat.com> jhrozek has requested the commit acl on c-ares (Fedora 12) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:15 +0000 Subject: [pkgdb] c-ares: jhrozek has requested watchcommits Message-ID: <20091102170315.6DE4710F7FF@bastion2.fedora.phx.redhat.com> jhrozek has requested the watchcommits acl on c-ares (Fedora 11) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:16 +0000 Subject: [pkgdb] c-ares: jhrozek has requested commit Message-ID: <20091102170316.6D74710F86F@bastion2.fedora.phx.redhat.com> jhrozek has requested the commit acl on c-ares (Fedora 11) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:16 +0000 Subject: [pkgdb] c-ares: jhrozek has requested watchbugzilla Message-ID: <20091102170316.72F4610F872@bastion2.fedora.phx.redhat.com> jhrozek has requested the watchbugzilla acl on c-ares (Fedora 11) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:32 +0000 Subject: [pkgdb] c-ares: jhrozek has requested watchbugzilla Message-ID: <20091102170332.1FCCC10F874@bastion2.fedora.phx.redhat.com> jhrozek has requested the watchbugzilla acl on c-ares (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:34 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:34 +0000 Subject: [pkgdb] c-ares: jhrozek has requested watchcommits Message-ID: <20091102170334.2AEF010F880@bastion2.fedora.phx.redhat.com> jhrozek has requested the watchcommits acl on c-ares (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:41 +0000 Subject: [pkgdb] c-ares: jhrozek has requested commit Message-ID: <20091102170341.39C1F10F87D@bastion2.fedora.phx.redhat.com> jhrozek has requested the commit acl on c-ares (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:44 +0000 Subject: [pkgdb] c-ares: jhrozek has given up commit Message-ID: <20091102170344.41AF110F899@bastion2.fedora.phx.redhat.com> jhrozek has given up the commit acl on c-ares (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:46 +0000 Subject: [pkgdb] c-ares: jhrozek has given up watchbugzilla Message-ID: <20091102170346.7B51010F8A0@bastion2.fedora.phx.redhat.com> jhrozek has given up the watchbugzilla acl on c-ares (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:03:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:03:47 +0000 Subject: [pkgdb] c-ares: jhrozek has given up watchcommits Message-ID: <20091102170347.E320F10F86F@bastion2.fedora.phx.redhat.com> jhrozek has given up the watchcommits acl on c-ares (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/c-ares From mhlavink at fedoraproject.org Mon Nov 2 17:03:59 2009 From: mhlavink at fedoraproject.org (Michal Hlavinka) Date: Mon, 2 Nov 2009 17:03:59 +0000 (UTC) Subject: rpms/dovecot/devel dovecot-1.2.6-greetings.patch, NONE, 1.1 dovecot.spec, 1.144, 1.145 Message-ID: <20091102170359.51DAF11C0086@cvs1.fedora.phx.redhat.com> Author: mhlavink Update of /cvs/extras/rpms/dovecot/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12497 Modified Files: dovecot.spec Added Files: dovecot-1.2.6-greetings.patch Log Message: spec cleanup dovecot-1.2.6-greetings.patch: imap-login/client.c | 7 ++++--- login-common/common.h | 2 +- login-common/main.c | 7 +++++-- login-common/ssl-proxy-openssl.c | 4 ++++ master/login-process.c | 2 ++ 5 files changed, 16 insertions(+), 6 deletions(-) --- NEW FILE dovecot-1.2.6-greetings.patch --- diff -up dovecot-1.2.6/src/imap-login/client.c.greetings dovecot-1.2.6/src/imap-login/client.c --- dovecot-1.2.6/src/imap-login/client.c.greetings 2009-10-05 20:10:44.000000000 +0200 +++ dovecot-1.2.6/src/imap-login/client.c 2009-10-21 12:20:03.995249615 +0200 @@ -93,11 +93,12 @@ bool client_skip_line(struct imap_client static const char *get_capability(struct imap_client *client, bool full) { - const char *auths; + const char *auths, *cap_str; + cap_str = full || capability_string_overridden ? capability_string : + CAPABILITY_BANNER_STRING; auths = client_authenticate_get_capabilities(client->common.secured); - return t_strconcat(full ? capability_string : CAPABILITY_BANNER_STRING, - (ssl_initialized && !client->common.tls) ? + return t_strconcat(cap_str, (ssl_initialized && !client->common.tls) ? " STARTTLS" : "", disable_plaintext_auth && !client->common.secured ? " LOGINDISABLED" : "", auths, NULL); diff -up dovecot-1.2.6/src/login-common/common.h.greetings dovecot-1.2.6/src/login-common/common.h --- dovecot-1.2.6/src/login-common/common.h.greetings 2009-01-15 21:27:26.000000000 +0100 +++ dovecot-1.2.6/src/login-common/common.h 2009-10-21 12:20:03.996248613 +0200 @@ -23,7 +23,7 @@ extern const char *trusted_networks; extern unsigned int max_connections; extern unsigned int login_process_uid; extern struct auth_client *auth_client; -extern bool closing_down; +extern bool closing_down, capability_string_overridden; void main_ref(void); void main_unref(void); diff -up dovecot-1.2.6/src/login-common/main.c.greetings dovecot-1.2.6/src/login-common/main.c --- dovecot-1.2.6/src/login-common/main.c.greetings 2009-08-12 20:03:16.000000000 +0200 +++ dovecot-1.2.6/src/login-common/main.c 2009-10-21 12:20:03.996248613 +0200 @@ -28,7 +28,7 @@ const char *trusted_networks; unsigned int max_connections; unsigned int login_process_uid; struct auth_client *auth_client; -bool closing_down; +bool closing_down, capability_string_overridden; static const char *process_name; static struct ioloop *ioloop; @@ -354,8 +354,11 @@ static void main_init(void) /* capability default is set in imap/pop3-login */ value = getenv("CAPABILITY_STRING"); - if (value != NULL && *value != '\0') + if (value != NULL && *value != '\0') { capability_string = value; + if (getenv("CAPABILITY_STRING_OVERRIDDEN") != NULL) + capability_string_overridden = TRUE; + } closing_down = FALSE; main_refcount = 0; diff -up dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c.greetings dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c --- dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c.greetings 2009-09-29 16:14:15.000000000 +0200 +++ dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c 2009-10-21 12:20:04.000248772 +0200 @@ -715,6 +715,7 @@ static DH *ssl_tmp_dh_callback(SSL *ssl return ssl_params.dh_1024; } +#ifdef HAVE_SSL_CTX_SET_INFO_CALLBACK static void ssl_info_callback(const SSL *ssl, int where, int ret) { struct ssl_proxy *proxy; @@ -732,6 +733,7 @@ static void ssl_info_callback(const SSL net_ip2addr(&proxy->ip)); } } +#endif static int ssl_verify_client_cert(int preverify_ok, X509_STORE_CTX *ctx) { @@ -814,8 +816,10 @@ static void ssl_proxy_ctx_init(SSL_CTX * cafile, ssl_last_error()); } } +#ifdef HAVE_SSL_CTX_SET_INFO_CALLBACK if (verbose_ssl) SSL_CTX_set_info_callback(ssl_ctx, ssl_info_callback); +#endif if (SSL_CTX_need_tmp_RSA(ssl_ctx)) SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key); SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback); diff -up dovecot-1.2.6/src/master/login-process.c.greetings dovecot-1.2.6/src/master/login-process.c --- dovecot-1.2.6/src/master/login-process.c.greetings 2009-10-21 12:20:03.965978906 +0200 +++ dovecot-1.2.6/src/master/login-process.c 2009-10-21 12:23:04.696873716 +0200 @@ -635,6 +635,8 @@ static void login_process_init_env(struc *set->imap_capability != '\0' ? set->imap_capability : set->imap_generated_capability, NULL)); + if (*set->imap_capability != '\0') + env_put("CAPABILITY_STRING_OVERRIDDEN=1"); } else if (group->mail_process_type == PROCESS_TYPE_MANAGESIEVE) { env_put(t_strconcat("CAPABILITY_STRING=", set->managesieve_generated_capability, NULL)); Index: dovecot.spec =================================================================== RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -p -r1.144 -r1.145 --- dovecot.spec 19 Oct 2009 07:32:42 -0000 1.144 +++ dovecot.spec 2 Nov 2009 17:03:59 -0000 1.145 @@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server Name: dovecot Epoch: 1 Version: 1.2.6 -Release: 3%{?dist} +Release: 5%{?dist} #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+ License: MIT and LGPLv2 and GPLv2+ Group: System Environment/Daemons @@ -40,6 +40,9 @@ Patch1: dovecot-1.1-default-settings.pat Patch2: dovecot-1.0.beta2-mkcert-permissions.patch Patch3: dovecot-1.0.rc7-mkcert-paths.patch +# taken from upstream, for dovecot <= 1.2.6 use imap_capability in greeting message, rhbz#524485 +Patch4: dovecot-1.2.6-greetings.patch + Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, pam-devel, zlib-devel, libcap-devel BuildRequires: libtool autoconf automake @@ -86,18 +89,18 @@ Dovecot is an IMAP server for Linux/UNIX primarily in mind. It also contains a small POP3 server. It supports mail in either of maildir or mbox formats. -The SQL drivers and authentication plugins are in their subpackages. +The SQL drivers and authentication plug-ins are in their subpackages. %if %{build_sieve} %package sieve Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: Sieve plugin for dovecot LDA +Summary: Sieve plug-in for dovecot LDA Group: System Environment/Daemons License: MIT and LGPLv2+ %description sieve -This package provides sieve plugin version %{sieve_version} for dovecot LDA. +This package provides sieve plug-in version %{sieve_version} for dovecot LDA. %endif %if %{build_managesieve} @@ -105,7 +108,7 @@ This package provides sieve plugin versi Requires: %{name} = %{epoch}:%{version}-%{release} Summary: Manage Sieve daemon for dovecot Group: System Environment/Daemons -License: LGPLv2.1 +License: LGPLv2 %description managesieve This package provides the Manage Sieve daemon version %{managesieve_version} for dovecot. @@ -114,51 +117,51 @@ This package provides the Manage Sieve d %if %{build_postgres} %package pgsql Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: Postgres SQL backend for dovecot +Summary: Postgres SQL back end for dovecot Group: System Environment/Daemons %description pgsql -This package provides the Postgres SQL backend for dovecot-auth etc. +This package provides the Postgres SQL back end for dovecot-auth etc. %endif %if %{build_mysql} %package mysql Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: MySQL backend for dovecot +Summary: MySQL back end for dovecot Group: System Environment/Daemons %description mysql -This package provides the MySQL backend for dovecot-auth etc. +This package provides the MySQL back end for dovecot-auth etc. %endif %if %{build_sqlite} %package sqlite Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: SQLite backend for dovecot +Summary: SQLite back end for dovecot Group: System Environment/Daemons %description sqlite -This package provides the SQLite backend for dovecot-auth etc. +This package provides the SQLite back end for dovecot-auth etc. %endif %if %{build_ldap} %package ldap Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: LDAP auth plugin for dovecot +Summary: LDAP auth plug-in for dovecot Group: System Environment/Daemons %description ldap -This package provides the LDAP auth plugin for dovecot-auth etc. +This package provides the LDAP auth plug-in for dovecot-auth etc. %endif %if %{build_gssapi} %package gssapi Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: GSSAPI auth mechanism plugin for dovecot +Summary: GSSAPI auth mechanism plug-in for dovecot Group: System Environment/Daemons %description gssapi -This package provides the GSSAPI auth mechanism plugin for dovecot-auth etc. +This package provides the GSSAPI auth mechanism plug-in for dovecot-auth etc. %endif %package devel Requires: %{name} = %{epoch}:%{version}-%{release} -Summary: Development files dor dovecot +Summary: Development files for dovecot Group: Development/Libraries %description devel This package provides the development files for dovecot. @@ -170,6 +173,7 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s %patch1 -p1 -b .default-settings %patch2 -p1 -b .mkcert-permissions %patch3 -p1 -b .mkcert-paths +%patch4 -p1 -b .greetings %if %{build_sieve} %setup -q -D -T -a 8 @@ -290,9 +294,20 @@ do install -p -m644 $f $RPM_BUILD_ROOT%{docdir}/UW-to-Dovecot-Migration done +# fix encoding +pushd $RPM_BUILD_ROOT +for fe in ./%{docdir}/auth-protocol.txt +do + iconv -f iso-8859-1 -t utf-8 <$fe >$fe.new + touch -r $fe $fe.new + mv -f $fe.new $fe +done +popd + mv $RPM_BUILD_ROOT%{docdir} $RPM_BUILD_ROOT%{docdir}-%{version} mkdir -p $RPM_BUILD_ROOT/var/lib/dovecot + %if %{build_sieve} # dovecot-sieve pushd %{sieve_name}-%{sieve_version} @@ -437,6 +452,13 @@ fi %changelog +* Mon Nov 02 2009 Michal Hlavinka - 1:1.2.6-5 +- spec cleanup + +* Wed Oct 21 2009 Michal Hlavinka - 1:1.2.6-4 +- imap-login: If imap_capability is set, show it in the banner + instead of the default (#524485) + * Mon Oct 19 2009 Michal Hlavinka - 1:1.2.6-3 - sieve updated to 0.1.13 which brings these changes: - Body extension: implemented proper handling of the :raw transform From tbzatek at fedoraproject.org Mon Nov 2 17:07:41 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Nov 2009 17:07:41 +0000 (UTC) Subject: rpms/gvfs/F-12 gvfs.spec,1.164,1.165 Message-ID: <20091102170741.7D2E511C0086@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13572 Modified Files: gvfs.spec Log Message: * Mon Nov 2 2009 Tomas Bzatek - 1.4.1-2 - Reload .mount files when single package is installed Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/F-12/gvfs.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -p -r1.164 -r1.165 --- gvfs.spec 20 Oct 2009 09:42:32 -0000 1.164 +++ gvfs.spec 2 Nov 2009 17:07:41 -0000 1.165 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -175,6 +175,18 @@ update-desktop-database &> /dev/null ||: # Update desktop files mime mappings: update-desktop-database &> /dev/null ||: +# Reload .mount files when single subpackage is installed: +%post smb +killall -USR1 gvfsd >&/dev/null || : +%post archive +killall -USR1 gvfsd >&/dev/null || : +%post obexftp +killall -USR1 gvfsd >&/dev/null || : +%post gphoto2 +killall -USR1 gvfsd >&/dev/null || : +%post afc +killall -USR1 gvfsd >&/dev/null || : + %files -f gvfs.lang %defattr(-, root, root, -) %doc AUTHORS COPYING NEWS README @@ -291,6 +303,9 @@ update-desktop-database &> /dev/null ||: %{_datadir}/gvfs/remote-volume-monitors/afc.monitor %changelog +* Mon Nov 2 2009 Tomas Bzatek - 1.4.1-2 +- Reload .mount files when single package is installed + * Tue Oct 20 2009 Tomas Bzatek - 1.4.1-1 - Update to 1.4.1 From pkgdb at fedoraproject.org Mon Nov 2 17:09:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:09:49 +0000 Subject: [pkgdb] DeviceKit ownership updated Message-ID: <20091102170949.0B8D710F841@bastion2.fedora.phx.redhat.com> Package DeviceKit in Fedora devel was orphaned by davidz To make changes to this package see: /pkgdb/packages/name/DeviceKit From pkgdb at fedoraproject.org Mon Nov 2 17:09:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:09:49 +0000 Subject: [pkgdb] DeviceKit (un)retirement Message-ID: <20091102170949.28C8110F872@bastion2.fedora.phx.redhat.com> Package DeviceKit in Fedora devel has been retired by davidz To make changes to this package see: /pkgdb/packages/name/DeviceKit From pkgdb at fedoraproject.org Mon Nov 2 17:09:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:09:53 +0000 Subject: [pkgdb] DeviceKit ownership updated Message-ID: <20091102170953.4555F10F841@bastion2.fedora.phx.redhat.com> Package DeviceKit in Fedora 10 was orphaned by davidz To make changes to this package see: /pkgdb/packages/name/DeviceKit From pkgdb at fedoraproject.org Mon Nov 2 17:09:53 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:09:53 +0000 Subject: [pkgdb] DeviceKit (un)retirement Message-ID: <20091102170953.5116E10F879@bastion2.fedora.phx.redhat.com> Package DeviceKit in Fedora 10 has been retired by davidz To make changes to this package see: /pkgdb/packages/name/DeviceKit From pkgdb at fedoraproject.org Mon Nov 2 17:09:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:09:57 +0000 Subject: [pkgdb] DeviceKit ownership updated Message-ID: <20091102170957.1ECF510F86F@bastion2.fedora.phx.redhat.com> Package DeviceKit in Fedora 11 was orphaned by davidz To make changes to this package see: /pkgdb/packages/name/DeviceKit From pkgdb at fedoraproject.org Mon Nov 2 17:09:57 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:09:57 +0000 Subject: [pkgdb] DeviceKit (un)retirement Message-ID: <20091102170957.2F43210F874@bastion2.fedora.phx.redhat.com> Package DeviceKit in Fedora 11 has been retired by davidz To make changes to this package see: /pkgdb/packages/name/DeviceKit From pkgdb at fedoraproject.org Mon Nov 2 17:10:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:10:00 +0000 Subject: [pkgdb] DeviceKit ownership updated Message-ID: <20091102171000.8CCF810F841@bastion2.fedora.phx.redhat.com> Package DeviceKit in Fedora 12 was orphaned by davidz To make changes to this package see: /pkgdb/packages/name/DeviceKit From pkgdb at fedoraproject.org Mon Nov 2 17:10:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:10:00 +0000 Subject: [pkgdb] DeviceKit (un)retirement Message-ID: <20091102171000.C754710F86F@bastion2.fedora.phx.redhat.com> Package DeviceKit in Fedora 12 has been retired by davidz To make changes to this package see: /pkgdb/packages/name/DeviceKit From pkgdb at fedoraproject.org Mon Nov 2 17:13:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:13:16 +0000 Subject: [pkgdb] c-ares had acl change status Message-ID: <20091102171316.5E03F10F844@bastion2.fedora.phx.redhat.com> spot has set the watchbugzilla acl on c-ares (Fedora devel) to Approved for jhrozek To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:13:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:13:17 +0000 Subject: [pkgdb] c-ares had acl change status Message-ID: <20091102171317.E380010F872@bastion2.fedora.phx.redhat.com> spot has set the watchcommits acl on c-ares (Fedora devel) to Approved for jhrozek To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:13:19 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:13:19 +0000 Subject: [pkgdb] c-ares had acl change status Message-ID: <20091102171319.A3EE410F87D@bastion2.fedora.phx.redhat.com> spot has set the commit acl on c-ares (Fedora devel) to Approved for jhrozek To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:13:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:13:27 +0000 Subject: [pkgdb] c-ares had acl change status Message-ID: <20091102171327.1978B10F844@bastion2.fedora.phx.redhat.com> spot has set the watchbugzilla acl on c-ares (Fedora 11) to Approved for jhrozek To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:13:27 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:13:27 +0000 Subject: [pkgdb] c-ares had acl change status Message-ID: <20091102171327.9A6F110F874@bastion2.fedora.phx.redhat.com> spot has set the watchcommits acl on c-ares (Fedora 11) to Approved for jhrozek To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:13:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:13:28 +0000 Subject: [pkgdb] c-ares had acl change status Message-ID: <20091102171328.C442C10F882@bastion2.fedora.phx.redhat.com> spot has set the commit acl on c-ares (Fedora 11) to Approved for jhrozek To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:13:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:13:31 +0000 Subject: [pkgdb] c-ares had acl change status Message-ID: <20091102171332.019EA10F88B@bastion2.fedora.phx.redhat.com> spot has set the watchcommits acl on c-ares (Fedora 12) to Approved for jhrozek To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:13:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:13:31 +0000 Subject: [pkgdb] c-ares had acl change status Message-ID: <20091102171331.64DDE10F844@bastion2.fedora.phx.redhat.com> spot has set the watchbugzilla acl on c-ares (Fedora 12) to Approved for jhrozek To make changes to this package see: /pkgdb/packages/name/c-ares From pkgdb at fedoraproject.org Mon Nov 2 17:13:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 17:13:32 +0000 Subject: [pkgdb] c-ares had acl change status Message-ID: <20091102171332.D567510F890@bastion2.fedora.phx.redhat.com> spot has set the commit acl on c-ares (Fedora 12) to Approved for jhrozek To make changes to this package see: /pkgdb/packages/name/c-ares From rdieter at fedoraproject.org Mon Nov 2 17:22:29 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Nov 2009 17:22:29 +0000 (UTC) Subject: rpms/libiodbc/F-10 .cvsignore, 1.2, 1.3 libiodbc.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <20091102172230.3242A11C02BC@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/libiodbc/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18805 Modified Files: .cvsignore libiodbc.spec sources Log Message: * Tue Oct 20 2009 Rex Dieter 3.52.7-1 - libiodbc-3.52.7 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/libiodbc/F-10/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 11 Jun 2009 16:57:55 -0000 1.2 +++ .cvsignore 2 Nov 2009 17:22:27 -0000 1.3 @@ -1 +1 @@ -libiodbc-3.52.6.tar.gz +libiodbc-3.52.7.tar.gz Index: libiodbc.spec =================================================================== RCS file: /cvs/pkgs/rpms/libiodbc/F-10/libiodbc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- libiodbc.spec 11 Jun 2009 16:57:55 -0000 1.1 +++ libiodbc.spec 2 Nov 2009 17:22:28 -0000 1.2 @@ -4,8 +4,8 @@ Summary: iODBC Driver Manager Name: libiodbc -Version: 3.52.6 -Release: 4%{?dist} +Version: 3.52.7 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2 or BSD URL: http://www.iodbc.org/ @@ -116,6 +116,12 @@ rm -rf %{buildroot} %endif %changelog +* Tue Oct 20 2009 Rex Dieter 3.52.7-1 +- libiodbc-3.52.7 + +* Fri Jul 24 2009 Fedora Release Engineering - 3.52.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sat Jun 06 2009 Rex Dieter 3.52.6-4 - -devel: install headers to /usr/include/libiodbc/ to better avoid conflicts and need for bogus unixODBC-devel dep Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/libiodbc/F-10/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 11 Jun 2009 16:57:55 -0000 1.2 +++ sources 2 Nov 2009 17:22:28 -0000 1.3 @@ -1 +1 @@ -761ad547467bd63ac0b2b4f3ee4b5afb libiodbc-3.52.6.tar.gz +ddbd274cb31d65be6a78da58fc09079a libiodbc-3.52.7.tar.gz From tbzatek at fedoraproject.org Mon Nov 2 17:30:08 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Mon, 2 Nov 2009 17:30:08 +0000 (UTC) Subject: rpms/gvfs/devel gvfs.spec,1.160,1.161 Message-ID: <20091102173008.13BB411C0338@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20914 Modified Files: gvfs.spec Log Message: * Mon Nov 2 2009 Tomas Bzatek - 1.4.0-8 - Reload .mount files when single package is installed Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -p -r1.160 -r1.161 --- gvfs.spec 16 Oct 2009 12:26:34 -0000 1.160 +++ gvfs.spec 2 Nov 2009 17:30:07 -0000 1.161 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.4.0 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -202,6 +202,18 @@ update-desktop-database &> /dev/null ||: # Update desktop files mime mappings: update-desktop-database &> /dev/null ||: +# Reload .mount files when single subpackage is installed: +%post smb +killall -USR1 gvfsd >&/dev/null || : +%post archive +killall -USR1 gvfsd >&/dev/null || : +%post obexftp +killall -USR1 gvfsd >&/dev/null || : +%post gphoto2 +killall -USR1 gvfsd >&/dev/null || : +%post afc +killall -USR1 gvfsd >&/dev/null || : + %files -f gvfs.lang %defattr(-, root, root, -) %doc AUTHORS COPYING NEWS README @@ -318,6 +330,9 @@ update-desktop-database &> /dev/null ||: %{_datadir}/gvfs/remote-volume-monitors/afc.monitor %changelog +* Mon Nov 2 2009 Tomas Bzatek - 1.4.0-8 +- Reload .mount files when single package is installed + * Fri Oct 16 2009 Tomas Bzatek - 1.4.0-7 - HTTP: Support g_file_input_stream_query_info() - HTTP: Use libsoup header parsing function From rineau at fedoraproject.org Mon Nov 2 17:41:06 2009 From: rineau at fedoraproject.org (Laurent Rineau) Date: Mon, 2 Nov 2009 17:41:06 +0000 (UTC) Subject: rpms/CGAL/devel CGAL.spec,1.28,1.29 Message-ID: <20091102174106.85F8411C049D@cvs1.fedora.phx.redhat.com> Author: rineau Update of /cvs/pkgs/rpms/CGAL/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23655/devel Modified Files: CGAL.spec Log Message: * Mon Nov 2 2009 - 3.5-2 - Use system's FindBoost macro instead of a copy from CGAL (bug #532431). Index: CGAL.spec =================================================================== RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- CGAL.spec 18 Oct 2009 16:35:07 -0000 1.28 +++ CGAL.spec 2 Nov 2009 17:41:05 -0000 1.29 @@ -3,7 +3,7 @@ Name: CGAL Version: 3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Computational Geometry Algorithms Library Group: System Environment/Libraries @@ -64,6 +64,9 @@ chmod a-x demo/Circular_kernel_2/Circula # Install README.Fedora here, to include it in %doc install -p -m 644 %{SOURCE10} ./README.Fedora +# remove the shipped copy of FindBoost.cmake (see bug #532431) +rm cmake/modules/FindBoost.cmake + %build mkdir build pushd build @@ -122,6 +125,9 @@ rm -rf %{buildroot} %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation %changelog +* Mon Nov 2 2009 - 3.5-2 +- Use system's FindBoost macro instead of a copy from CGAL (bug #532431). + * Sun Oct 18 2009 - 3.5-1 - New upstream release: finale version of CGAL-3.5. From rineau at fedoraproject.org Mon Nov 2 17:41:05 2009 From: rineau at fedoraproject.org (Laurent Rineau) Date: Mon, 2 Nov 2009 17:41:05 +0000 (UTC) Subject: rpms/CGAL/F-12 CGAL.spec,1.28,1.29 Message-ID: <20091102174106.8163111C0418@cvs1.fedora.phx.redhat.com> Author: rineau Update of /cvs/pkgs/rpms/CGAL/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23655/F-12 Modified Files: CGAL.spec Log Message: * Mon Nov 2 2009 - 3.5-2 - Use system's FindBoost macro instead of a copy from CGAL (bug #532431). Index: CGAL.spec =================================================================== RCS file: /cvs/pkgs/rpms/CGAL/F-12/CGAL.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- CGAL.spec 18 Oct 2009 16:35:06 -0000 1.28 +++ CGAL.spec 2 Nov 2009 17:41:04 -0000 1.29 @@ -3,7 +3,7 @@ Name: CGAL Version: 3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Computational Geometry Algorithms Library Group: System Environment/Libraries @@ -64,6 +64,9 @@ chmod a-x demo/Circular_kernel_2/Circula # Install README.Fedora here, to include it in %doc install -p -m 644 %{SOURCE10} ./README.Fedora +# remove the shipped copy of FindBoost.cmake (see bug #532431) +rm cmake/modules/FindBoost.cmake + %build mkdir build pushd build @@ -122,6 +125,9 @@ rm -rf %{buildroot} %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation %changelog +* Mon Nov 2 2009 - 3.5-2 +- Use system's FindBoost macro instead of a copy from CGAL (bug #532431). + * Sun Oct 18 2009 - 3.5-1 - New upstream release: finale version of CGAL-3.5. From hadess at fedoraproject.org Mon Nov 2 17:41:34 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Nov 2009 17:41:34 +0000 (UTC) Subject: rpms/bluez/F-11 bluez-4.42-make-udev-helper-build.patch, NONE, 1.1 bluez.spec, 1.72, 1.73 Message-ID: <20091102174134.E62C011C0418@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23911 Modified Files: bluez.spec Added Files: bluez-4.42-make-udev-helper-build.patch Log Message: Update hid2hci patch bluez-4.42-make-udev-helper-build.patch: hid2hci.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) --- NEW FILE bluez-4.42-make-udev-helper-build.patch --- --- bluez-4.42/tools/hid2hci.c.old 2009-11-02 17:13:56.000000000 +0000 +++ bluez-4.42/tools/hid2hci.c 2009-11-02 17:24:39.000000000 +0000 @@ -25,6 +25,7 @@ #include #include #include +#define _GNU_SOURCE 1 #include #include #include @@ -32,7 +33,63 @@ #include #include "libudev.h" -#include "libudev-private.h" + +/* + * Concatenates strings. In any case, terminates in _all_ cases with '\0' + * and moves the @dest pointer forward to the added '\0'. Returns the + * remaining size, and 0 if the string was truncated. + */ +size_t util_strpcpy(char **dest, size_t size, const char *src) +{ + size_t len; + + len = strlen(src); + if (len >= size) { + if (size > 1) + *dest = mempcpy(*dest, src, size-1); + size = 0; + *dest[0] = '\0'; + } else { + if (len > 0) { + *dest = mempcpy(*dest, src, len); + size -= len; + } + *dest[0] = '\0'; + } + return size; +} + +/* concatenates list of strings, moves dest forward */ +size_t util_strpcpyl(char **dest, size_t size, const char *src, ...) +{ + va_list va; + + va_start(va, src); + do { + size = util_strpcpy(dest, size, src); + src = va_arg(va, char *); + } while (src != NULL); + va_end(va); + + return size; +} + +/* concatenates list of strings */ +size_t util_strscpyl(char *dest, size_t size, const char *src, ...) +{ + va_list va; + char *s; + + va_start(va, src); + s = dest; + do { + size = util_strpcpy(&s, size, src); + src = va_arg(va, char *); + } while (src != NULL); + va_end(va); + + return size; +} enum mode { HCI = 0, Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -p -r1.72 -r1.73 --- bluez.spec 2 Nov 2009 15:08:05 -0000 1.72 +++ bluez.spec 2 Nov 2009 17:41:34 -0000 1.73 @@ -25,6 +25,7 @@ Patch8: 0001-Allow-lp-CUPS-to-talk-to-bl Patch9: 0002-Mark-Bluetooth-printers-as-being-local.patch # Updated from udev-extras master Patch10: bluez-4.42-update-hid2hci-rules.patch +Patch11: bluez-4.42-make-udev-helper-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -120,11 +121,17 @@ use in Bluetooth applications. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build -%configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund +%configure --enable-cups --disable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund make +# Build by hand... +pushd tools +gcc -o hid2hci -DUTIL_PATH_SIZE=4096 `pkg-config --libs --cflags libudev libusb` hid2hci.c +popd + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -145,7 +152,10 @@ fi install -D -m0644 scripts/bluetooth-serial.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial -mv ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/bluetooth-hid2hci.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/ + +# Install hid2hci +install -D -m0644 scripts/bluetooth-hid2hci.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/70-hid2hci.rules +install -D -m0755 tools/hid2hci ${RPM_BUILD_ROOT}/lib/udev/hid2hci install -D -m0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules @@ -183,7 +193,8 @@ fi %{_libdir}/bluetooth/ /lib/udev/bluetooth_serial %{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules -%{_sysconfdir}/udev/rules.d/bluetooth-hid2hci.rules +/lib/udev/rules.d/*.rules +/lib/udev/hid2hci /etc/rc.d/init.d/* %{_localstatedir}/lib/bluetooth %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules From hadess at fedoraproject.org Mon Nov 2 17:49:45 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Nov 2009 17:49:45 +0000 (UTC) Subject: rpms/bluez/F-11 bluez.spec,1.73,1.74 Message-ID: <20091102174945.834F011C0086@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26811 Modified Files: bluez.spec Log Message: Add missing BR Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -p -r1.73 -r1.74 --- bluez.spec 2 Nov 2009 17:41:34 -0000 1.73 +++ bluez.spec 2 Nov 2009 17:49:45 -0000 1.74 @@ -35,6 +35,7 @@ BuildRequires: dbus-devel >= 0.90 BuildRequires: libusb-devel, glib2-devel, alsa-lib-devel BuildRequires: gstreamer-plugins-base-devel, gstreamer-devel BuildRequires: libsndfile-devel +BuildRequires: libudev-devel Obsoletes: bluez-pan < 4.0, bluez-sdp < 4.0 Requires: initscripts, bluez-libs = %{version} From cebbert at fedoraproject.org Mon Nov 2 17:54:52 2009 From: cebbert at fedoraproject.org (Chuck Ebbert) Date: Mon, 2 Nov 2009 17:54:52 +0000 (UTC) Subject: rpms/kernel/F-12 config-generic, 1.329, 1.330 config-x86-generic, 1.88, 1.89 config-x86_64-generic, 1.93, 1.94 kernel.spec, 1.1893, 1.1894 Message-ID: <20091102175452.49E9411C0086@cvs1.fedora.phx.redhat.com> Author: cebbert Update of /cvs/pkgs/rpms/kernel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28298 Modified Files: config-generic config-x86-generic config-x86_64-generic kernel.spec Log Message: Enable acerhdf driver for fan speed control on Acer Aspire One notebook (#532463) Index: config-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/config-generic,v retrieving revision 1.329 retrieving revision 1.330 diff -u -p -r1.329 -r1.330 --- config-generic 23 Oct 2009 21:29:18 -0000 1.329 +++ config-generic 2 Nov 2009 17:54:51 -0000 1.330 @@ -3516,7 +3516,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_KEXEC=y -CONFIG_HWMON=m +CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y Index: config-x86-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/config-x86-generic,v retrieving revision 1.88 retrieving revision 1.89 diff -u -p -r1.88 -r1.89 --- config-x86-generic 20 Aug 2009 16:03:17 -0000 1.88 +++ config-x86-generic 2 Nov 2009 17:54:51 -0000 1.89 @@ -480,3 +480,5 @@ CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_AMD=y # CONFIG_X86_ANCIENT_MCE is not set # CONFIG_X86_MCE_INJECT is not set + +CONFIG_ACERHDF=m Index: config-x86_64-generic =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/config-x86_64-generic,v retrieving revision 1.93 retrieving revision 1.94 diff -u -p -r1.93 -r1.94 --- config-x86_64-generic 23 Oct 2009 22:58:21 -0000 1.93 +++ config-x86_64-generic 2 Nov 2009 17:54:51 -0000 1.94 @@ -382,3 +382,5 @@ CONFIG_EVENT_PROFILE=y # CONFIG_X86_MCE_INJECT is not set CONFIG_FUNCTION_GRAPH_TRACER=y + +CONFIG_ACERHDF=m Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v retrieving revision 1.1893 retrieving revision 1.1894 diff -u -p -r1.1893 -r1.1894 --- kernel.spec 2 Nov 2009 10:08:28 -0000 1.1893 +++ kernel.spec 2 Nov 2009 17:54:51 -0000 1.1894 @@ -2104,6 +2104,9 @@ fi # and build. %changelog +* Mon Nov 02 2009 Chuck Ebbert 2.6.31.5-108 +- Enable acerhdf driver for fan speed control on Acer Aspire One notebook (#532463) + * Mon Nov 02 2009 Dave Airlie 2.6.31.5-107 - r600: back that out, thanks to yaneti for testing. From dwalsh at fedoraproject.org Mon Nov 2 18:00:01 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 18:00:01 +0000 (UTC) Subject: rpms/libsepol/devel .cvsignore, 1.146, 1.147 libsepol.spec, 1.195, 1.196 sources, 1.147, 1.148 Message-ID: <20091102180001.11A7311C0086@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsepol/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29694 Modified Files: .cvsignore libsepol.spec sources Log Message: * Mon Nov 2 2009 Dan Walsh 2.0.40-1 - Upgrade to latest from NSA * Add pkgconfig file from Eamon Walsh. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.146 retrieving revision 1.147 diff -u -p -r1.146 -r1.147 --- .cvsignore 29 Oct 2009 19:27:40 -0000 1.146 +++ .cvsignore 2 Nov 2009 18:00:00 -0000 1.147 @@ -146,3 +146,4 @@ libsepol-2.0.36.tgz libsepol-2.0.37.tgz libsepol-2.0.38.tgz libsepol-2.0.39.tgz +libsepol-2.0.40.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -p -r1.195 -r1.196 --- libsepol.spec 29 Oct 2009 19:27:40 -0000 1.195 +++ libsepol.spec 2 Nov 2009 18:00:00 -0000 1.196 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 2.0.39 +Version: 2.0.40 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -96,7 +96,11 @@ exit 0 /%{_lib}/libsepol.so.1 %changelog -* Tue Sep 8 2009 Dan Walsh 2.0.39-1 +* Mon Nov 2 2009 Dan Walsh 2.0.40-1 +- Upgrade to latest from NSA + * Add pkgconfig file from Eamon Walsh. + +* Tue Oct 14 2009 Dan Walsh 2.0.39-1 - Upgrade to latest from NSA * Add support for building Xen policies from Paul Nuzzi. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsepol/devel/sources,v retrieving revision 1.147 retrieving revision 1.148 diff -u -p -r1.147 -r1.148 --- sources 29 Oct 2009 19:27:40 -0000 1.147 +++ sources 2 Nov 2009 18:00:00 -0000 1.148 @@ -1 +1 @@ -bd4c51d44b276d4dcf9c65c365c808d6 libsepol-2.0.39.tgz +308ba12de5cda7e4dce903889f71caea libsepol-2.0.40.tgz From dwalsh at fedoraproject.org Mon Nov 2 18:01:06 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 18:01:06 +0000 (UTC) Subject: rpms/libselinux/devel .cvsignore, 1.189, 1.190 libselinux.spec, 1.379, 1.380 sources, 1.192, 1.193 Message-ID: <20091102180106.838A511C02BC@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30023 Modified Files: .cvsignore libselinux.spec sources Log Message: * Mon Nov 2 2009 Dan Walsh - 2.0.89-1 - Update to upstream * Add pkgconfig file from Eamon Walsh. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.189 retrieving revision 1.190 diff -u -p -r1.189 -r1.190 --- .cvsignore 29 Oct 2009 19:36:31 -0000 1.189 +++ .cvsignore 2 Nov 2009 18:01:05 -0000 1.190 @@ -172,3 +172,4 @@ libselinux-2.0.85.tgz libselinux-2.0.86.tgz libselinux-2.0.87.tgz libselinux-2.0.88.tgz +libselinux-2.0.89.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.379 retrieving revision 1.380 diff -u -p -r1.379 -r1.380 --- libselinux.spec 29 Oct 2009 19:36:32 -0000 1.379 +++ libselinux.spec 2 Nov 2009 18:01:05 -0000 1.380 @@ -4,7 +4,7 @@ Summary: SELinux library and simple utilities Name: libselinux -Version: 2.0.88 +Version: 2.0.89 Release: 1%{?dist} License: Public Domain Group: System Environment/Libraries @@ -165,6 +165,10 @@ exit 0 %{ruby_sitearch}/selinux.so %changelog +* Mon Nov 2 2009 Dan Walsh - 2.0.89-1 +- Update to upstream + * Add pkgconfig file from Eamon Walsh. + * Thu Oct 29 2009 Dan Walsh - 2.0.88-1 - Update to upstream * Rename and export selinux_reset_config() Index: sources =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/sources,v retrieving revision 1.192 retrieving revision 1.193 diff -u -p -r1.192 -r1.193 --- sources 29 Oct 2009 19:36:32 -0000 1.192 +++ sources 2 Nov 2009 18:01:05 -0000 1.193 @@ -1 +1 @@ -2b333d5387a310895021da788b07e956 libselinux-2.0.88.tgz +e61066e879d3fd0a61f6e09e3653b486 libselinux-2.0.89.tgz From dwalsh at fedoraproject.org Mon Nov 2 18:01:54 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 18:01:54 +0000 (UTC) Subject: rpms/libsemanage/devel .cvsignore, 1.106, 1.107 libsemanage.spec, 1.187, 1.188 sources, 1.109, 1.110 Message-ID: <20091102180154.A451911C02BC@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsemanage/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30295 Modified Files: .cvsignore libsemanage.spec sources Log Message: * Mon Nov 2 2009 Dan Walsh - 2.0.41-1 - Update to upstream * Add pkgconfig file from Eamon Walsh. * Add semanage_set_check_contexts() function to disable calling setfiles Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.106 retrieving revision 1.107 diff -u -p -r1.106 -r1.107 --- .cvsignore 28 Sep 2009 20:36:12 -0000 1.106 +++ .cvsignore 2 Nov 2009 18:01:53 -0000 1.107 @@ -112,3 +112,5 @@ libsemanage-2.0.36.tgz libsemanage-2.0.37.tgz libsemanage-2.0.38.tgz libsemanage-2.0.39.tgz +libsemanage-2.0.40.tgz +libsemanage-2.0.41.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.187 retrieving revision 1.188 diff -u -p -r1.187 -r1.188 --- libsemanage.spec 28 Sep 2009 20:36:12 -0000 1.187 +++ libsemanage.spec 2 Nov 2009 18:01:53 -0000 1.188 @@ -2,7 +2,7 @@ %define libselinuxver 2.0.0-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 2.0.39 +Version: 2.0.41 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -91,6 +91,12 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/python*/site-packages/* %changelog +* Mon Nov 2 2009 Dan Walsh - 2.0.41-1 +- Update to upstream + * Add pkgconfig file from Eamon Walsh. + * Add semanage_set_check_contexts() function to disable calling + setfiles + * Mon Sep 28 2009 Dan Walsh - 2.0.39-1 - Update to upstream * make swigify Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v retrieving revision 1.109 retrieving revision 1.110 diff -u -p -r1.109 -r1.110 --- sources 28 Sep 2009 20:36:12 -0000 1.109 +++ sources 2 Nov 2009 18:01:53 -0000 1.110 @@ -1 +1 @@ -706e61f0081bb8522589481db873b0d1 libsemanage-2.0.39.tgz +df62e25783b44d2edada3fbd5b06d960 libsemanage-2.0.41.tgz From dwalsh at fedoraproject.org Mon Nov 2 18:11:37 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 18:11:37 +0000 (UTC) Subject: rpms/libsepol/devel libsepol.spec,1.196,1.197 Message-ID: <20091102181137.26A8111C0418@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsepol/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv625 Modified Files: libsepol.spec Log Message: * Mon Nov 2 2009 Dan Walsh 2.0.40-1 - Upgrade to latest from NSA * Add pkgconfig file from Eamon Walsh. Index: libsepol.spec =================================================================== RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.196 retrieving revision 1.197 diff -u -p -r1.196 -r1.197 --- libsepol.spec 2 Nov 2009 18:00:00 -0000 1.196 +++ libsepol.spec 2 Nov 2009 18:11:36 -0000 1.197 @@ -85,6 +85,7 @@ exit 0 %files devel %defattr(-,root,root) %{_libdir}/libsepol.so +%{_libdir}/pkgconfig/libsepol.pc %{_includedir}/sepol/*.h %{_mandir}/man3/*.3.gz %dir %{_includedir}/sepol From dwalsh at fedoraproject.org Mon Nov 2 18:11:52 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 18:11:52 +0000 (UTC) Subject: rpms/libselinux/devel libselinux.spec,1.380,1.381 Message-ID: <20091102181152.6342E11C0418@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libselinux/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv671 Modified Files: libselinux.spec Log Message: * Mon Nov 2 2009 Dan Walsh - 2.0.89-1 - Update to upstream * Add pkgconfig file from Eamon Walsh. Index: libselinux.spec =================================================================== RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.380 retrieving revision 1.381 diff -u -p -r1.380 -r1.381 --- libselinux.spec 2 Nov 2009 18:01:05 -0000 1.380 +++ libselinux.spec 2 Nov 2009 18:11:50 -0000 1.381 @@ -147,6 +147,7 @@ exit 0 %files devel %defattr(-,root,root,-) %{_libdir}/libselinux.so +%{_libdir}/pkgconfig/libselinux.pc %dir %{_includedir}/selinux %{_includedir}/selinux/* %{_mandir}/man3/* From dwalsh at fedoraproject.org Mon Nov 2 18:11:54 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 18:11:54 +0000 (UTC) Subject: rpms/libsemanage/devel libsemanage.spec,1.188,1.189 Message-ID: <20091102181154.5B0B411C0418@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/libsemanage/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv718 Modified Files: libsemanage.spec Log Message: * Mon Nov 2 2009 Dan Walsh - 2.0.41-1 - Update to upstream * Add pkgconfig file from Eamon Walsh. * Add semanage_set_check_contexts() function to disable calling setfiles Index: libsemanage.spec =================================================================== RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.188 retrieving revision 1.189 diff -u -p -r1.188 -r1.189 --- libsemanage.spec 2 Nov 2009 18:01:53 -0000 1.188 +++ libsemanage.spec 2 Nov 2009 18:11:54 -0000 1.189 @@ -83,6 +83,7 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root) %{_libdir}/libsemanage.a %{_libdir}/libsemanage.so +%{_libdir}/pkgconfig/libsemanage.pc %dir %{_includedir}/semanage %{_includedir}/semanage/*.h %{_mandir}/man3/* From leigh123linux at fedoraproject.org Mon Nov 2 18:20:37 2009 From: leigh123linux at fedoraproject.org (Leigh Scott) Date: Mon, 2 Nov 2009 18:20:37 +0000 (UTC) Subject: comps comps-f10.xml.in, 1.298, 1.299 comps-f11.xml.in, 1.332, 1.333 comps-f12.xml.in, 1.191, 1.192 comps-f13.xml.in, 1.78, 1.79 Message-ID: <20091102182037.C871911C0338@cvs1.fedora.phx.redhat.com> Author: leigh123linux Update of /cvs/pkgs/comps In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3078 Modified Files: comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in Log Message: add torium & gmixer Index: comps-f10.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v retrieving revision 1.298 retrieving revision 1.299 diff -u -p -r1.298 -r1.299 --- comps-f10.xml.in 2 Nov 2009 15:04:48 -0000 1.298 +++ comps-f10.xml.in 2 Nov 2009 18:20:36 -0000 1.299 @@ -2270,6 +2270,7 @@ sylpheed tangogps thunderbird + torium twinkle urlgfe valknut @@ -4233,6 +4234,7 @@ gcdmaster gcombust gcstar + gmixer gnomad2 gnomebaker gnomeradio Index: comps-f11.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v retrieving revision 1.332 retrieving revision 1.333 diff -u -p -r1.332 -r1.333 --- comps-f11.xml.in 2 Nov 2009 15:04:48 -0000 1.332 +++ comps-f11.xml.in 2 Nov 2009 18:20:36 -0000 1.333 @@ -2643,6 +2643,7 @@ sylpheed tangogps thunderbird + torium twinkle urlgfe valknut @@ -4918,6 +4919,7 @@ gcdmaster gcombust gcstar + gmixer gnomad2 gnomebaker gnomeradio Index: comps-f12.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v retrieving revision 1.191 retrieving revision 1.192 diff -u -p -r1.191 -r1.192 --- comps-f12.xml.in 2 Nov 2009 15:04:48 -0000 1.191 +++ comps-f12.xml.in 2 Nov 2009 18:20:36 -0000 1.192 @@ -2836,6 +2836,7 @@ sylpheed tangogps thunderbird + torium twinkle urlgfe valknut @@ -5197,6 +5198,7 @@ gcdmaster gcombust gcstar + gmixer gnomad2 gnomebaker gnomeradio Index: comps-f13.xml.in =================================================================== RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v retrieving revision 1.78 retrieving revision 1.79 diff -u -p -r1.78 -r1.79 --- comps-f13.xml.in 2 Nov 2009 15:04:48 -0000 1.78 +++ comps-f13.xml.in 2 Nov 2009 18:20:36 -0000 1.79 @@ -2834,6 +2834,7 @@ sylpheed tangogps thunderbird + torium twinkle urlgfe valknut @@ -5166,6 +5167,7 @@ gcdmaster gcombust gcstar + gmixer gnomad2 gnomebaker gnomeradio From hadess at fedoraproject.org Mon Nov 2 18:25:50 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Mon, 2 Nov 2009 18:25:50 +0000 (UTC) Subject: rpms/bluez/F-11 bluez.spec,1.74,1.75 Message-ID: <20091102182550.9332911C0086@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5153 Modified Files: bluez.spec Log Message: Fix building with older libudev Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- bluez.spec 2 Nov 2009 17:49:45 -0000 1.74 +++ bluez.spec 2 Nov 2009 18:25:48 -0000 1.75 @@ -130,7 +130,7 @@ make # Build by hand... pushd tools -gcc -o hid2hci -DUTIL_PATH_SIZE=4096 `pkg-config --libs --cflags libudev libusb` hid2hci.c +gcc -o hid2hci -DUTIL_PATH_SIZE=4096 -DLIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE=1 `pkg-config --libs --cflags libudev libusb` hid2hci.c popd %install From jcollie at fedoraproject.org Mon Nov 2 18:26:52 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Mon, 2 Nov 2009 18:26:52 +0000 (UTC) Subject: rpms/asterisk-sounds-core/devel asterisk-sounds-core.spec,1.5,1.6 Message-ID: <20091102182652.110F211C0086@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk-sounds-core/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5502 Modified Files: asterisk-sounds-core.spec Log Message: * Mon Nov 2 2009 Jeffrey C. Ollie - 1.4.16-2 - Remove fr/1.g729 as it's triggering an error in magic_file(3) (BZ#532489) Index: asterisk-sounds-core.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/devel/asterisk-sounds-core.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- asterisk-sounds-core.spec 6 Oct 2009 13:56:26 -0000 1.5 +++ asterisk-sounds-core.spec 2 Nov 2009 18:26:51 -0000 1.6 @@ -2,7 +2,7 @@ Name: asterisk-sounds-core Version: 1.4.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core sounds for Asterisk Group: Applications/Internet @@ -10,35 +10,35 @@ Group: Applications/Internet License: CC-BY-SA URL: http://www.asterisk.org/ -Source0: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{version}.tar.gz -Source1: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-%{version}.tar.gz -Source2: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-%{version}.tar.gz -Source3: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-%{version}.tar.gz -Source4: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-%{version}.tar.gz -Source5: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-%{version}.tar.gz -Source6: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{version}.tar.gz -Source7: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-%{version}.tar.gz -Source8: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-%{version}.tar.gz - -Source10: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-%{version}.tar.gz -Source11: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-%{version}.tar.gz -Source12: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-%{version}.tar.gz -Source13: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-%{version}.tar.gz -Source14: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-%{version}.tar.gz -Source15: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-%{version}.tar.gz -Source16: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{version}.tar.gz -Source17: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-%{version}.tar.gz -Source18: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-%{version}.tar.gz - -Source20: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-%{version}.tar.gz -Source21: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-%{version}.tar.gz -Source22: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-%{version}.tar.gz -Source23: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-%{version}.tar.gz -Source24: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-%{version}.tar.gz -Source25: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-%{version}.tar.gz -Source26: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{version}.tar.gz -Source27: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-%{version}.tar.gz -Source28: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-%{version}.tar.gz +Source0: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{version}.tar.gz +Source1: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-%{version}.tar.gz +Source2: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-%{version}.tar.gz +Source3: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-%{version}.tar.gz +Source4: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-%{version}.tar.gz +Source5: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-%{version}.tar.gz +Source6: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{version}.tar.gz +Source7: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-%{version}.tar.gz +Source8: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-%{version}.tar.gz + +Source10: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-%{version}.tar.gz +Source11: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-%{version}.tar.gz +Source12: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-%{version}.tar.gz +Source13: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-%{version}.tar.gz +Source14: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-%{version}.tar.gz +Source15: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-%{version}.tar.gz +Source16: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{version}.tar.gz +Source17: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-%{version}.tar.gz +Source18: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-%{version}.tar.gz + +Source20: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-%{version}.tar.gz +Source21: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-%{version}.tar.gz +Source22: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-%{version}.tar.gz +Source23: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-%{version}.tar.gz +Source24: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-%{version}.tar.gz +Source25: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-%{version}.tar.gz +Source26: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{version}.tar.gz +Source27: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-%{version}.tar.gz +Source28: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -364,7 +364,7 @@ mkdir fr for file in %{S:20} %{S:21} %{S:22} %{S:23} %{S:24} %{S:25} %{S:26} %{S:27} %{S:28} do - tar tf $file | grep -E '.(alaw|g722|g729|gsm|siren7|siren14|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/fr/!' > `basename $file .tar.gz`.list + tar tf $file | grep -v '1.g729' | grep -E '.(alaw|g722|g729|gsm|siren7|siren14|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/fr/!' > `basename $file .tar.gz`.list tar --extract --directory ./fr/ --file $file done @@ -535,6 +535,9 @@ rm -rf %{buildroot} %doc asterisk-core-sounds-fr-wav-%{version}.list %changelog +* Mon Nov 2 2009 Jeffrey C. Ollie - 1.4.16-2 +- Remove fr/1.g729 as it's triggering an error in magic_file(3) (BZ#532489) + * Mon Oct 5 2009 Jeffrey C. Ollie - 1.4.16-1 - Update to 1.4.16. From pfrields at fedoraproject.org Mon Nov 2 18:38:08 2009 From: pfrields at fedoraproject.org (Paul W. Frields) Date: Mon, 2 Nov 2009 18:38:08 +0000 (UTC) Subject: rpms/nautilus-search-tool/devel nautilus-search-tool.spec, 1.18, 1.19 Message-ID: <20091102183808.9C18C11C0086@cvs1.fedora.phx.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/nautilus-search-tool/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8502/devel Modified Files: nautilus-search-tool.spec Log Message: Drop patch in favor of gnome-utils-2.28.1-3 Index: nautilus-search-tool.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-search-tool/devel/nautilus-search-tool.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- nautilus-search-tool.spec 2 Nov 2009 12:41:05 -0000 1.18 +++ nautilus-search-tool.spec 2 Nov 2009 18:38:08 -0000 1.19 @@ -1,6 +1,6 @@ Name: nautilus-search-tool Version: 0.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Nautilus extension that makes searching for files easier Group: System Environment/Shells @@ -10,7 +10,6 @@ Source0: http://dl.sourceforge.ne Patch0: nautilus-search-tool-0.3.0-headers-typos.patch Patch1: nautilus-search-tool-no-eels.patch Patch2: nautilus-search-tool-0.3.0-noninit.patch -Patch3: nautilus-search-tool-0.3.0-gstversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-desktop-devel >= 2.10.0 @@ -28,7 +27,6 @@ search for files. %patch0 -p1 -b .headers-typos %patch1 -p1 -b .no-eels %patch2 -p1 -b .noninit -%patch3 -p1 -b .gstversion autoconf %build @@ -50,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/nautilus/extensions-2.0/*.so %changelog +* Mon Nov 2 2009 Paul W. Frields - 0.3.0-5 +- Drop patch in favor of gnome-utils-2.28.1-3 + * Mon Nov 02 2009 Paul W. Frields - 0.3.0-4 - Cope with missing --version in gnome-search-tool (#516491) From pfrields at fedoraproject.org Mon Nov 2 18:38:09 2009 From: pfrields at fedoraproject.org (Paul W. Frields) Date: Mon, 2 Nov 2009 18:38:09 +0000 (UTC) Subject: rpms/nautilus-search-tool/F-12 nautilus-search-tool.spec,1.18,1.19 Message-ID: <20091102183809.8A14411C0086@cvs1.fedora.phx.redhat.com> Author: pfrields Update of /cvs/pkgs/rpms/nautilus-search-tool/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8502/F-12 Modified Files: nautilus-search-tool.spec Log Message: Drop patch in favor of gnome-utils-2.28.1-3 Index: nautilus-search-tool.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-search-tool/F-12/nautilus-search-tool.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- nautilus-search-tool.spec 2 Nov 2009 12:41:00 -0000 1.18 +++ nautilus-search-tool.spec 2 Nov 2009 18:38:07 -0000 1.19 @@ -1,6 +1,6 @@ Name: nautilus-search-tool Version: 0.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Nautilus extension that makes searching for files easier Group: System Environment/Shells @@ -10,7 +10,6 @@ Source0: http://dl.sourceforge.ne Patch0: nautilus-search-tool-0.3.0-headers-typos.patch Patch1: nautilus-search-tool-no-eels.patch Patch2: nautilus-search-tool-0.3.0-noninit.patch -Patch3: nautilus-search-tool-0.3.0-gstversion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-desktop-devel >= 2.10.0 @@ -28,7 +27,6 @@ search for files. %patch0 -p1 -b .headers-typos %patch1 -p1 -b .no-eels %patch2 -p1 -b .noninit -%patch3 -p1 -b .gstversion autoconf %build @@ -50,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/nautilus/extensions-2.0/*.so %changelog +* Mon Nov 2 2009 Paul W. Frields - 0.3.0-5 +- Drop patch in favor of gnome-utils-2.28.1-3 + * Mon Nov 02 2009 Paul W. Frields - 0.3.0-4 - Cope with missing --version in gnome-search-tool (#516491) From mclasen at fedoraproject.org Mon Nov 2 18:39:09 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 18:39:09 +0000 (UTC) Subject: rpms/gnome-panel/F-12 gnome-panel.spec, 1.383, 1.384 panel-padding.patch, 1.2, 1.3 Message-ID: <20091102183909.DA62D11C0086@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-panel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8931 Modified Files: gnome-panel.spec panel-padding.patch Log Message: Don't add padding before the first and after the last applet Index: gnome-panel.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v retrieving revision 1.383 retrieving revision 1.384 diff -u -p -r1.383 -r1.384 --- gnome-panel.spec 29 Oct 2009 14:20:54 -0000 1.383 +++ gnome-panel.spec 2 Nov 2009 18:39:09 -0000 1.384 @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.28.0 -Release: 12%{?dist} +Release: 13%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2 @@ -385,6 +385,9 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Mon Nov 2 2009 Matthias Clasen 2.28.0-13 +- Don't add padding before the first and after the last applet (#532410) + * Thu Oct 29 2009 Matthias Clasen 2.28.0-12 - Make padding work correctly in non-expanded panels (#529614) panel-padding.patch: 0 files changed Index: panel-padding.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/panel-padding.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- panel-padding.patch 29 Oct 2009 14:20:54 -0000 1.2 +++ panel-padding.patch 2 Nov 2009 18:39:09 -0000 1.3 @@ -1,343 +1,7 @@ -diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.c ---- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding 2009-09-21 12:29:33.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-10-29 09:57:25.285484907 -0400 -@@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation" - - TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size, int) - TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand, gboolean) -+TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding, int) - TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide, gboolean) - TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool, enable_buttons, gboolean) - TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows, gboolean) -@@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC - else UPDATE_INT ("monitor", monitor) - else UPDATE_STRING ("name", name) - else UPDATE_BOOL ("expand", expand) -+ else UPDATE_INT ("padding", padding) - else UPDATE_STRING ("orientation", orientation) - else UPDATE_INT ("size", size) - else UPDATE_POS ("x", x, x_right) -@@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient - GET_STRING ("name", name); - GET_INT ("monitor", monitor); - GET_BOOL ("expand", expand); -+ GET_INT ("padding", padding); - GET_STRING ("orientation", orientation); - GET_INT ("size", size); - GET_BOOL ("auto_hide", auto_hide); -diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.h ---- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding 2009-04-19 13:45:09.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-10-29 09:57:25.285484907 -0400 -@@ -92,7 +92,10 @@ void panel_profile_set_toplevel_e - gboolean expand); - gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel); - gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel); -- -+void panel_profile_set_toplevel_padding (PanelToplevel *toplevel, -+ int padding); -+int panel_profile_get_toplevel_padding (PanelToplevel *padding); -+gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel); - void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel, - gboolean auto_hide); - gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel); -diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.c ---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding 2009-08-21 06:31:49.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-10-29 09:57:25.287500667 -0400 -@@ -79,6 +79,7 @@ struct _PanelToplevelPrivate { - gboolean expand; - PanelOrientation orientation; - int size; -+ int padding; - - /* relative to the monitor origin */ - int x; -@@ -213,6 +214,7 @@ enum { - PROP_0, - PROP_NAME, - PROP_EXPAND, -+ PROP_PADDING, - PROP_ORIENTATION, - PROP_SIZE, - PROP_X, -@@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject - case PROP_EXPAND: - panel_toplevel_set_expand (toplevel, g_value_get_boolean (value)); - break; -+ case PROP_PADDING: -+ panel_toplevel_set_padding (toplevel, g_value_get_int (value)); -+ break; - case PROP_ORIENTATION: - panel_toplevel_set_orientation (toplevel, g_value_get_enum (value)); - break; -@@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject - case PROP_EXPAND: - g_value_set_boolean (value, toplevel->priv->expand); - break; -+ case PROP_PADDING: -+ g_value_set_int (value, toplevel->priv->padding); -+ break; - case PROP_ORIENTATION: - g_value_set_enum (value, toplevel->priv->orientation); - break; -@@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel - - g_object_class_install_property ( - gobject_class, -+ PROP_PADDING, -+ g_param_spec_int ( -+ "padding", -+ "Padding", -+ "Padding that is inserted between objects", -+ 0, -+ G_MAXINT, -+ 0, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); -+ -+ g_object_class_install_property ( -+ gobject_class, - PROP_ORIENTATION, - g_param_spec_enum ( - "orientation", -@@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel - return toplevel->priv->expand; - } - -+void -+panel_toplevel_set_padding (PanelToplevel *toplevel, -+ int padding) -+{ -+ g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel)); -+ -+ if (toplevel->priv->padding == padding) -+ return; -+ -+ toplevel->priv->padding = padding; -+ -+ gtk_widget_queue_resize (GTK_WIDGET (toplevel)); -+ -+ g_object_notify (G_OBJECT (toplevel), "padding"); -+} -+ -+int -+panel_toplevel_get_padding (PanelToplevel *toplevel) -+{ -+ g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0); -+ -+ return toplevel->priv->padding; -+} -+ - gboolean - panel_toplevel_get_is_floating (PanelToplevel *toplevel) - { -diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.h ---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding 2009-08-19 11:28:09.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-10-29 09:57:25.288484940 -0400 -@@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_ - void panel_toplevel_set_expand (PanelToplevel *toplevel, - gboolean expand); - gboolean panel_toplevel_get_expand (PanelToplevel *toplevel); -+void panel_toplevel_set_padding (PanelToplevel *toplevel, -+ int padding); -+int panel_toplevel_get_padding (PanelToplevel *toplevel); - void panel_toplevel_set_orientation (PanelToplevel *toplevel, - PanelOrientation orientation); - PanelOrientation panel_toplevel_get_orientation (PanelToplevel *toplevel); -diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in ---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding 2009-07-01 09:06:23.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-10-29 09:57:25.288484940 -0400 -@@ -103,6 +103,19 @@ - - - -+ /schemas/apps/panel/toplevels/padding -+ panel -+ int -+ 0 -+ -+ Padding -+ -+ Padding that will be inserted between objects on this panel. -+ -+ -+ -+ -+ - /schemas/apps/panel/toplevels/x - panel - int -diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-widget.c ---- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding 2009-08-11 07:32:38.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-10-29 10:10:43.531226534 -0400 -@@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW - { - AppletData *ad; - AppletData *nad = NULL; -- -+ gint padding; -+ - g_assert (list != NULL); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - ad = list->data; - if (ad->constrained + ad->min_cells >= panel->size) - return; -@@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW - if (list->next) - nad = list->next->data; - -- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) { -- ad->pos = ad->constrained += MOVE_INCREMENT; -+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) { -+ ad->pos = ad->constrained += MOVE_INCREMENT + padding; - gtk_widget_queue_resize (GTK_WIDGET (panel)); - emit_applet_moved (panel, ad); - return; -@@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi - { - AppletData *ad; - AppletData *pad = NULL; -+ gint padding; -+ -+ padding = panel_toplevel_get_padding (panel->toplevel); - - ad = list->data; - if (ad->constrained <= 0) -@@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi - if (list->prev) - pad = list->prev->data; - -- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) { -- ad->pos = ad->constrained -= MOVE_INCREMENT; -+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) { -+ ad->pos = ad->constrained -= MOVE_INCREMENT + padding; - gtk_widget_queue_resize (GTK_WIDGET (panel)); - emit_applet_moved (panel, ad); - return; -@@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel - { - AppletData *ad; - AppletData *nad = NULL; -+ gint padding; - - g_assert (list != NULL); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - ad = list->data; - if (list->next) - nad = list->next->data; - -- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) -- return ad->constrained + MOVE_INCREMENT; -+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) -+ return ad->constrained + MOVE_INCREMENT + padding; - - if (nad->locked) - return panel_widget_get_right_jump_pos (panel, -@@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW - { - AppletData *ad; - AppletData *pad = NULL; -+ gint padding; - - g_assert (list != NULL); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - ad = list->data; - if (list->prev) - pad = list->prev->data; - -- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) -- return ad->constrained - MOVE_INCREMENT; -+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) -+ return ad->constrained - MOVE_INCREMENT - padding; - - if (pad->locked) - return panel_widget_get_left_jump_pos (panel, -@@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid - GList *list; - GList *ad_with_hints; - gboolean dont_fill; -+ gint padding; - - g_return_if_fail(PANEL_IS_WIDGET(widget)); - g_return_if_fail(requisition!=NULL); - - panel = PANEL_WIDGET(widget); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - if(panel->orient == GTK_ORIENTATION_HORIZONTAL) { - requisition->width = 0; - requisition->height = panel->sz; -@@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid - ad_with_hints = g_list_prepend (ad_with_hints, - ad); - -- else if (panel->packed) -+ else if (panel->packed) { -+ if (list != panel->applet_list) -+ requisition->width += padding; - requisition->width += chreq.width; -+ } - } else { - if (requisition->width < chreq.width && !ad->size_constrained) - requisition->width = chreq.width; -@@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid - ad_with_hints = g_list_prepend (ad_with_hints, - ad); - -- else if (panel->packed) -+ else if (panel->packed) { -+ if (list != panel->applet_list) -+ requisition->height += padding; - requisition->height += chreq.height; -+ } - } - } - -@@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi - int i; - int old_size; - gboolean ltr; -+ gint padding; - - g_return_if_fail(PANEL_IS_WIDGET(widget)); - g_return_if_fail(allocation!=NULL); - - panel = PANEL_WIDGET(widget); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - old_size = panel->size; - ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR; - -@@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi - } - ad->min_cells = ad->cells; - gtk_widget_size_allocate(ad->applet,&challoc); -- i += ad->cells; -+ i += ad->cells + padding; - } - - /* EEEEK, there might be not enough room and we don't handle -@@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi - if (ad->constrained < i) - ad->constrained = i; - -- i = ad->constrained + ad->cells; -+ i = ad->constrained + ad->cells + padding; - } - - /* Now expand from the right */ -@@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi - ad->cells = cells; - } - -- i = ad->constrained; -+ i = ad->constrained - padding; - } - - /* EEEEK, there's not enough room, so shift applets even + panel-profile.c | 3 ++ + panel-profile.h | 5 +++- + panel-toplevel.c | 44 +++++++++++++++++++++++++++++++++++ + panel-toplevel.h | 3 ++ + panel-toplevel.schemas.in | 13 ++++++++++ + panel-widget.c | 57 +++++++++++++++++++++++++++++++++++----------- + 6 files changed, 111 insertions(+), 14 deletions(-) From uwog at fedoraproject.org Mon Nov 2 18:44:51 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 2 Nov 2009 18:44:51 +0000 (UTC) Subject: rpms/pyabiword/F-10 .cvsignore, 1.3, 1.4 pyabiword.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <20091102184451.801AF11C0086@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10692 Modified Files: .cvsignore pyabiword.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 9 Mar 2009 18:52:46 -0000 1.3 +++ .cvsignore 2 Nov 2009 18:44:50 -0000 1.4 @@ -1 +1 @@ -pyabiword-0.6.3.tar.gz +pyabiword-0.8.0.tar.gz Index: pyabiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/F-10/pyabiword.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- pyabiword.spec 9 Mar 2009 18:52:46 -0000 1.2 +++ pyabiword.spec 2 Nov 2009 18:44:50 -0000 1.3 @@ -1,13 +1,10 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# normally 2.6 would be enough for a dependency, but -# abiword 2.6.7 introduced abi_widget_render_page_to_image, -# which is is used by OLPC -%define abiword_api_version 2.6.7 +%define abiword_api_version 2.8 Summary: Python bindings for libabiword Name: pyabiword -Version: 0.6.3 +Version: 0.8.0 Release: 1%{?dist} Source0: pyabiword-%{version}.tar.gz URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz @@ -17,9 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version BuildRequires: libabiword-devel >= %{abiword_api_version} BuildRequires: pygtk2-devel BuildRequires: gtk2-devel -BuildRequires: libglade2-devel -BuildRequires: libgnomeprintui22-devel -BuildRequires: goffice04-devel BuildRequires: enchant-devel BuildRequires: fribidi-devel BuildRequires: wv-devel @@ -68,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pygtk/2.0/defs/pyabiword.defs %changelog +* Mon Nov 02 2009 Marc Maurer - 0.8.0-1 +- New upstream release + * Mon Mar 09 2009 Marc Maurer - 0.6.3-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 9 Mar 2009 18:52:46 -0000 1.3 +++ sources 2 Nov 2009 18:44:50 -0000 1.4 @@ -1 +1 @@ -f308b4cd38d5ea0e8a65b9452ea33359 pyabiword-0.6.3.tar.gz +826ea3e4cdcdd11906ce8739d07e6c26 pyabiword-0.8.0.tar.gz From dwalsh at fedoraproject.org Mon Nov 2 18:59:38 2009 From: dwalsh at fedoraproject.org (Daniel J Walsh) Date: Mon, 2 Nov 2009 18:59:38 +0000 (UTC) Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.126, 1.127 selinux-policy.spec, 1.959, 1.960 Message-ID: <20091102185938.5192511C0086@cvs1.fedora.phx.redhat.com> Author: dwalsh Update of /cvs/extras/rpms/selinux-policy/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15198 Modified Files: policy-F12.patch selinux-policy.spec Log Message: * Mon Nov 2 2009 Dan Walsh 3.6.32-39 - Allow setroubleshoot-fix to signull user domains policy-F12.patch: Makefile | 2 policy/flask/access_vectors | 1 policy/global_tunables | 24 policy/mcs | 10 policy/modules/admin/alsa.te | 2 policy/modules/admin/anaconda.te | 3 policy/modules/admin/brctl.te | 2 policy/modules/admin/certwatch.te | 2 policy/modules/admin/consoletype.te | 1 policy/modules/admin/dmesg.fc | 2 policy/modules/admin/dmesg.te | 10 policy/modules/admin/firstboot.te | 6 policy/modules/admin/logrotate.te | 13 policy/modules/admin/logwatch.te | 1 policy/modules/admin/mrtg.te | 1 policy/modules/admin/netutils.te | 2 policy/modules/admin/ntop.fc | 5 policy/modules/admin/ntop.if | 158 +++ policy/modules/admin/ntop.te | 40 policy/modules/admin/portage.te | 2 policy/modules/admin/prelink.if | 4 policy/modules/admin/prelink.te | 6 policy/modules/admin/readahead.te | 1 policy/modules/admin/rpm.fc | 20 policy/modules/admin/rpm.if | 324 ++++++ policy/modules/admin/rpm.te | 98 + policy/modules/admin/shorewall.fc | 3 policy/modules/admin/shorewall.if | 40 policy/modules/admin/shorewall.te | 2 policy/modules/admin/smoltclient.fc | 4 policy/modules/admin/smoltclient.if | 1 policy/modules/admin/smoltclient.te | 66 + policy/modules/admin/sudo.if | 13 policy/modules/admin/tmpreaper.te | 5 policy/modules/admin/tzdata.te | 2 policy/modules/admin/usermanage.if | 5 policy/modules/admin/usermanage.te | 34 policy/modules/admin/vbetool.te | 14 policy/modules/admin/vpn.te | 2 policy/modules/apps/calamaris.te | 7 policy/modules/apps/chrome.fc | 2 policy/modules/apps/chrome.if | 85 + policy/modules/apps/chrome.te | 71 + policy/modules/apps/cpufreqselector.te | 2 policy/modules/apps/execmem.fc | 35 policy/modules/apps/execmem.if | 75 + policy/modules/apps/execmem.te | 11 policy/modules/apps/firewallgui.fc | 3 policy/modules/apps/firewallgui.if | 3 policy/modules/apps/firewallgui.te | 63 + policy/modules/apps/gitosis.if | 45 policy/modules/apps/gnome.fc | 12 policy/modules/apps/gnome.if | 170 +++ policy/modules/apps/gnome.te | 99 + policy/modules/apps/gpg.te | 20 policy/modules/apps/java.fc | 18 policy/modules/apps/java.if | 114 ++ policy/modules/apps/java.te | 19 policy/modules/apps/kdumpgui.fc | 2 policy/modules/apps/kdumpgui.if | 2 policy/modules/apps/kdumpgui.te | 65 + policy/modules/apps/livecd.fc | 2 policy/modules/apps/livecd.if | 52 + policy/modules/apps/livecd.te | 27 policy/modules/apps/loadkeys.te | 4 policy/modules/apps/mono.if | 101 + policy/modules/apps/mono.te | 9 policy/modules/apps/mozilla.fc | 1 policy/modules/apps/mozilla.if | 32 policy/modules/apps/mozilla.te | 22 policy/modules/apps/nsplugin.fc | 11 policy/modules/apps/nsplugin.if | 323 ++++++ policy/modules/apps/nsplugin.te | 295 +++++ policy/modules/apps/openoffice.fc | 3 policy/modules/apps/openoffice.if | 93 + policy/modules/apps/openoffice.te | 11 policy/modules/apps/pulseaudio.if | 2 policy/modules/apps/pulseaudio.te | 11 policy/modules/apps/qemu.fc | 4 policy/modules/apps/qemu.if | 189 +++ policy/modules/apps/qemu.te | 82 + policy/modules/apps/sambagui.fc | 1 policy/modules/apps/sambagui.if | 2 policy/modules/apps/sambagui.te | 59 + policy/modules/apps/sandbox.fc | 1 policy/modules/apps/sandbox.if | 184 +++ policy/modules/apps/sandbox.te | 330 ++++++ policy/modules/apps/screen.if | 7 policy/modules/apps/sectoolm.fc | 6 policy/modules/apps/sectoolm.if | 3 policy/modules/apps/sectoolm.te | 120 ++ policy/modules/apps/seunshare.fc | 2 policy/modules/apps/seunshare.if | 81 + policy/modules/apps/seunshare.te | 45 policy/modules/apps/vmware.te | 1 policy/modules/apps/wine.fc | 24 policy/modules/apps/wine.if | 115 ++ policy/modules/apps/wine.te | 34 policy/modules/kernel/corecommands.fc | 32 policy/modules/kernel/corecommands.if | 21 policy/modules/kernel/corenetwork.te.in | 38 policy/modules/kernel/devices.fc | 11 policy/modules/kernel/devices.if | 255 +++++ policy/modules/kernel/devices.te | 25 policy/modules/kernel/domain.if | 151 ++ policy/modules/kernel/domain.te | 88 + policy/modules/kernel/files.fc | 3 policy/modules/kernel/files.if | 324 ++++++ policy/modules/kernel/files.te | 6 policy/modules/kernel/filesystem.fc | 2 policy/modules/kernel/filesystem.if | 211 ++++ policy/modules/kernel/filesystem.te | 9 policy/modules/kernel/kernel.if | 58 + policy/modules/kernel/kernel.te | 29 policy/modules/kernel/selinux.if | 25 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 3 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 40 policy/modules/kernel/terminal.te | 1 policy/modules/roles/guest.te | 8 policy/modules/roles/staff.te | 126 -- policy/modules/roles/sysadm.te | 124 -- policy/modules/roles/unconfineduser.fc | 8 policy/modules/roles/unconfineduser.if | 638 ++++++++++++ policy/modules/roles/unconfineduser.te | 428 ++++++++ policy/modules/roles/unprivuser.te | 127 -- policy/modules/roles/xguest.te | 37 policy/modules/services/abrt.fc | 5 policy/modules/services/abrt.if | 58 + policy/modules/services/abrt.te | 31 policy/modules/services/afs.fc | 1 policy/modules/services/afs.te | 1 policy/modules/services/aisexec.fc | 12 policy/modules/services/aisexec.if | 106 ++ policy/modules/services/aisexec.te | 112 ++ policy/modules/services/amavis.te | 2 policy/modules/services/apache.fc | 42 policy/modules/services/apache.if | 410 +++++--- policy/modules/services/apache.te | 450 +++++++- policy/modules/services/apm.te | 2 policy/modules/services/automount.te | 1 policy/modules/services/avahi.te | 2 policy/modules/services/bind.if | 40 policy/modules/services/bitlbee.te | 2 policy/modules/services/bluetooth.if | 21 policy/modules/services/bluetooth.te | 11 policy/modules/services/ccs.fc | 8 policy/modules/services/ccs.te | 33 policy/modules/services/certmaster.te | 2 policy/modules/services/chronyd.fc | 11 policy/modules/services/chronyd.if | 105 ++ policy/modules/services/chronyd.te | 67 + policy/modules/services/clamav.te | 16 policy/modules/services/clogd.fc | 4 policy/modules/services/clogd.if | 98 + policy/modules/services/clogd.te | 62 + policy/modules/services/cobbler.fc | 2 policy/modules/services/cobbler.if | 44 policy/modules/services/cobbler.te | 5 policy/modules/services/consolekit.fc | 3 policy/modules/services/consolekit.if | 39 policy/modules/services/consolekit.te | 23 policy/modules/services/corosync.fc | 13 policy/modules/services/corosync.if | 108 ++ policy/modules/services/corosync.te | 109 ++ policy/modules/services/courier.if | 18 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 72 + policy/modules/services/cron.te | 82 + policy/modules/services/cups.fc | 13 policy/modules/services/cups.te | 44 policy/modules/services/cvs.te | 1 policy/modules/services/cyrus.te | 1 policy/modules/services/dbus.if | 49 policy/modules/services/dbus.te | 25 policy/modules/services/dcc.te | 8 policy/modules/services/ddclient.if | 25 policy/modules/services/devicekit.fc | 2 policy/modules/services/devicekit.if | 22 policy/modules/services/devicekit.te | 58 + policy/modules/services/dnsmasq.te | 12 policy/modules/services/dovecot.te | 22 policy/modules/services/exim.te | 5 policy/modules/services/fail2ban.te | 2 policy/modules/services/fetchmail.te | 2 policy/modules/services/fprintd.te | 4 policy/modules/services/ftp.te | 60 + policy/modules/services/git.fc | 8 policy/modules/services/git.if | 286 +++++ policy/modules/services/git.te | 166 +++ policy/modules/services/gpm.te | 3 policy/modules/services/gpsd.fc | 5 policy/modules/services/gpsd.if | 27 policy/modules/services/gpsd.te | 14 policy/modules/services/hal.fc | 1 policy/modules/services/hal.if | 18 policy/modules/services/hal.te | 48 policy/modules/services/howl.te | 2 policy/modules/services/inetd.fc | 2 policy/modules/services/inetd.te | 4 policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.te | 13 policy/modules/services/kerneloops.te | 2 policy/modules/services/ktalk.te | 1 policy/modules/services/lircd.fc | 2 policy/modules/services/lircd.if | 9 policy/modules/services/lircd.te | 23 policy/modules/services/mailman.te | 4 policy/modules/services/memcached.te | 2 policy/modules/services/milter.if | 2 policy/modules/services/modemmanager.te | 3 policy/modules/services/mta.fc | 2 policy/modules/services/mta.if | 10 policy/modules/services/mta.te | 36 policy/modules/services/munin.fc | 3 policy/modules/services/munin.te | 3 policy/modules/services/mysql.te | 7 policy/modules/services/nagios.fc | 16 policy/modules/services/nagios.if | 89 + policy/modules/services/nagios.te | 72 - policy/modules/services/networkmanager.fc | 14 policy/modules/services/networkmanager.if | 65 + policy/modules/services/networkmanager.te | 115 +- policy/modules/services/nis.fc | 5 policy/modules/services/nis.if | 87 + policy/modules/services/nis.te | 13 policy/modules/services/nscd.if | 18 policy/modules/services/nscd.te | 17 policy/modules/services/nslcd.if | 8 policy/modules/services/ntp.if | 46 policy/modules/services/ntp.te | 8 policy/modules/services/nut.fc | 15 policy/modules/services/nut.if | 82 + policy/modules/services/nut.te | 140 ++ policy/modules/services/nx.fc | 1 policy/modules/services/nx.if | 19 policy/modules/services/nx.te | 6 policy/modules/services/oddjob.if | 1 policy/modules/services/openvpn.te | 2 policy/modules/services/pcscd.te | 4 policy/modules/services/pegasus.te | 28 policy/modules/services/plymouth.fc | 5 policy/modules/services/plymouth.if | 286 +++++ policy/modules/services/plymouth.te | 96 + policy/modules/services/policykit.fc | 5 policy/modules/services/policykit.if | 48 policy/modules/services/policykit.te | 64 - policy/modules/services/postfix.fc | 2 policy/modules/services/postfix.if | 150 ++ policy/modules/services/postfix.te | 142 ++ policy/modules/services/postgresql.fc | 16 policy/modules/services/postgresql.if | 43 policy/modules/services/postgresql.te | 9 policy/modules/services/ppp.if | 6 policy/modules/services/ppp.te | 16 policy/modules/services/prelude.te | 3 policy/modules/services/privoxy.fc | 3 policy/modules/services/privoxy.te | 3 policy/modules/services/procmail.te | 12 policy/modules/services/pyzor.fc | 4 policy/modules/services/pyzor.if | 47 policy/modules/services/pyzor.te | 37 policy/modules/services/radvd.te | 1 policy/modules/services/razor.fc | 1 policy/modules/services/razor.if | 42 policy/modules/services/razor.te | 32 policy/modules/services/rgmanager.fc | 8 policy/modules/services/rgmanager.if | 59 + policy/modules/services/rgmanager.te | 83 + policy/modules/services/rhcs.fc | 22 policy/modules/services/rhcs.if | 348 ++++++ policy/modules/services/rhcs.te | 394 +++++++ policy/modules/services/ricci.te | 30 policy/modules/services/rpc.if | 7 policy/modules/services/rpc.te | 16 policy/modules/services/rpcbind.if | 20 policy/modules/services/rpcbind.te | 1 policy/modules/services/rsync.te | 23 policy/modules/services/rtkit.if | 20 policy/modules/services/rtkit.te | 2 policy/modules/services/samba.fc | 4 policy/modules/services/samba.if | 104 ++ policy/modules/services/samba.te | 89 + policy/modules/services/sasl.te | 15 policy/modules/services/sendmail.if | 137 ++ policy/modules/services/sendmail.te | 87 + policy/modules/services/setroubleshoot.fc | 2 policy/modules/services/setroubleshoot.if | 123 ++ policy/modules/services/setroubleshoot.te | 82 + policy/modules/services/smartmon.te | 15 policy/modules/services/snmp.if | 38 policy/modules/services/snmp.te | 4 policy/modules/services/spamassassin.fc | 15 policy/modules/services/spamassassin.if | 89 + policy/modules/services/spamassassin.te | 138 ++ policy/modules/services/squid.te | 9 policy/modules/services/ssh.fc | 2 policy/modules/services/ssh.if | 184 ++- policy/modules/services/ssh.te | 77 - policy/modules/services/sssd.fc | 5 policy/modules/services/sssd.if | 43 policy/modules/services/sssd.te | 12 policy/modules/services/sysstat.te | 5 policy/modules/services/tftp.fc | 2 policy/modules/services/tuned.fc | 6 policy/modules/services/tuned.if | 140 ++ policy/modules/services/tuned.te | 58 + policy/modules/services/uucp.te | 7 policy/modules/services/virt.fc | 13 policy/modules/services/virt.if | 181 +++ policy/modules/services/virt.te | 274 +++++ policy/modules/services/w3c.te | 7 policy/modules/services/xserver.fc | 39 policy/modules/services/xserver.if | 613 +++++++++++- policy/modules/services/xserver.te | 343 +++++- policy/modules/system/application.if | 20 policy/modules/system/application.te | 11 policy/modules/system/authlogin.fc | 9 policy/modules/system/authlogin.if | 207 +++- policy/modules/system/authlogin.te | 10 policy/modules/system/fstools.fc | 2 policy/modules/system/fstools.te | 7 policy/modules/system/init.fc | 7 policy/modules/system/init.if | 163 +++ policy/modules/system/init.te | 290 ++++- policy/modules/system/ipsec.fc | 3 policy/modules/system/ipsec.if | 25 policy/modules/system/ipsec.te | 58 + policy/modules/system/iptables.fc | 17 policy/modules/system/iptables.if | 97 + policy/modules/system/iptables.te | 20 policy/modules/system/iscsi.if | 40 policy/modules/system/iscsi.te | 6 policy/modules/system/libraries.fc | 167 ++- policy/modules/system/libraries.if | 5 policy/modules/system/libraries.te | 18 policy/modules/system/locallogin.te | 30 policy/modules/system/logging.fc | 12 policy/modules/system/logging.if | 18 policy/modules/system/logging.te | 38 policy/modules/system/lvm.if | 39 policy/modules/system/lvm.te | 29 policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 60 + policy/modules/system/miscfiles.te | 3 policy/modules/system/modutils.fc | 1 policy/modules/system/modutils.if | 46 policy/modules/system/modutils.te | 46 policy/modules/system/mount.fc | 7 policy/modules/system/mount.if | 2 policy/modules/system/mount.te | 76 + policy/modules/system/raid.fc | 2 policy/modules/system/raid.te | 8 policy/modules/system/selinuxutil.fc | 17 policy/modules/system/selinuxutil.if | 309 ++++++ policy/modules/system/selinuxutil.te | 229 +--- policy/modules/system/setrans.if | 20 policy/modules/system/sysnetwork.fc | 9 policy/modules/system/sysnetwork.if | 117 ++ policy/modules/system/sysnetwork.te | 77 + policy/modules/system/udev.fc | 3 policy/modules/system/udev.if | 39 policy/modules/system/udev.te | 39 policy/modules/system/unconfined.fc | 15 policy/modules/system/unconfined.if | 443 -------- policy/modules/system/unconfined.te | 224 ---- policy/modules/system/userdomain.fc | 6 policy/modules/system/userdomain.if | 1517 ++++++++++++++++++++++-------- policy/modules/system/userdomain.te | 47 policy/modules/system/xen.fc | 6 policy/modules/system/xen.if | 28 policy/modules/system/xen.te | 137 ++ policy/support/obj_perm_sets.spt | 14 policy/users | 13 376 files changed, 18364 insertions(+), 2763 deletions(-) Index: policy-F12.patch =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v retrieving revision 1.126 retrieving revision 1.127 diff -u -p -r1.126 -r1.127 --- policy-F12.patch 30 Oct 2009 13:52:35 -0000 1.126 +++ policy-F12.patch 2 Nov 2009 18:59:35 -0000 1.127 @@ -306,8 +306,16 @@ diff -b -B --ignore-all-space --exclude- diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.32/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2009-08-14 16:14:31.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/admin/netutils.te 2009-09-30 16:12:48.000000000 -0400 -@@ -85,6 +85,7 @@ ++++ serefpolicy-3.6.32/policy/modules/admin/netutils.te 2009-10-30 14:18:10.000000000 -0400 +@@ -44,6 +44,7 @@ + allow netutils_t self:packet_socket create_socket_perms; + allow netutils_t self:udp_socket create_socket_perms; + allow netutils_t self:tcp_socket create_stream_socket_perms; ++allow netutils_t self:socket create_socket_perms; + + manage_dirs_pattern(netutils_t, netutils_tmp_t, netutils_tmp_t) + manage_files_pattern(netutils_t, netutils_tmp_t, netutils_tmp_t) +@@ -85,6 +86,7 @@ miscfiles_read_localization(netutils_t) @@ -1046,7 +1054,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.32/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2009-08-14 16:14:31.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/admin/rpm.te 2009-10-27 11:12:12.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/admin/rpm.te 2009-11-02 09:42:29.000000000 -0500 @@ -15,6 +15,9 @@ domain_interactive_fd(rpm_t) role system_r types rpm_t; @@ -6630,7 +6638,7 @@ diff -b -B --ignore-all-space --exclude- /var/lib/nfs/rpc_pipefs(/.*)? <> diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.32/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2009-07-14 14:19:57.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/kernel/files.if 2009-10-23 09:23:13.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/kernel/files.if 2009-11-02 09:23:57.000000000 -0500 @@ -110,6 +110,11 @@ ## # @@ -9664,7 +9672,16 @@ diff -b -B --ignore-all-space --exclude- ## All of the rules required to administrate diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.6.32/policy/modules/services/abrt.te --- nsaserefpolicy/policy/modules/services/abrt.te 2009-09-16 09:09:20.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/services/abrt.te 2009-10-30 09:36:32.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/services/abrt.te 2009-11-02 13:58:48.000000000 -0500 +@@ -38,7 +38,7 @@ + # abrt local policy + # + +-allow abrt_t self:capability { setuid setgid sys_nice dac_override }; ++allow abrt_t self:capability { chown setuid setgid sys_nice dac_override }; + allow abrt_t self:process { signal signull setsched getsched }; + + allow abrt_t self:fifo_file rw_fifo_file_perms; @@ -60,8 +60,9 @@ files_tmp_filetrans(abrt_t, abrt_tmp_t, { file dir }) @@ -10006,7 +10023,7 @@ diff -b -B --ignore-all-space --exclude- diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.32/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2009-07-14 14:19:57.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/services/apache.fc 2009-10-23 08:20:45.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/services/apache.fc 2009-10-30 16:21:42.000000000 -0400 @@ -1,12 +1,13 @@ -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) @@ -10051,15 +10068,17 @@ diff -b -B --ignore-all-space --exclude- /var/cache/mod_proxy(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0) /var/cache/mod_ssl(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0) /var/cache/php-eaccelerator(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0) -@@ -47,6 +55,7 @@ +@@ -46,7 +54,9 @@ + /var/cache/ssl.*\.sem -- gen_context(system_u:object_r:httpd_cache_t,s0) /var/lib/cacti/rra(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) ++/var/lib/cobbler/webui_sessions(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0) /var/lib/dav(/.*)? gen_context(system_u:object_r:httpd_var_lib_t,s0) +/var/lib/drupal(/.*)? gen_context(system_u:object_r:httpd_sys_content_rw_t,s0) /var/lib/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) /var/lib/httpd(/.*)? gen_context(system_u:object_r:httpd_var_lib_t,s0) /var/lib/php/session(/.*)? gen_context(system_u:object_r:httpd_var_run_t,s0) -@@ -50,8 +59,10 @@ +@@ -50,8 +60,10 @@ /var/lib/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) /var/lib/httpd(/.*)? gen_context(system_u:object_r:httpd_var_lib_t,s0) /var/lib/php/session(/.*)? gen_context(system_u:object_r:httpd_var_run_t,s0) @@ -10070,7 +10089,7 @@ diff -b -B --ignore-all-space --exclude- /var/log/apache(2)?(/.*)? gen_context(system_u:object_r:httpd_log_t,s0) /var/log/apache-ssl(2)?(/.*)? gen_context(system_u:object_r:httpd_log_t,s0) /var/log/cacti(/.*)? gen_context(system_u:object_r:httpd_log_t,s0) -@@ -64,11 +75,33 @@ +@@ -64,11 +76,33 @@ /var/run/apache.* gen_context(system_u:object_r:httpd_var_run_t,s0) /var/run/gcache_port -s gen_context(system_u:object_r:httpd_var_run_t,s0) /var/run/httpd.* gen_context(system_u:object_r:httpd_var_run_t,s0) @@ -10713,7 +10732,7 @@ diff -b -B --ignore-all-space --exclude- ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.32/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2009-08-14 16:14:31.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/services/apache.te 2009-10-29 17:36:37.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/services/apache.te 2009-10-30 16:16:22.000000000 -0400 @@ -19,6 +19,8 @@ # Declarations # @@ -10987,7 +11006,8 @@ diff -b -B --ignore-all-space --exclude- +## +gen_tunable(allow_httpd_mod_auth_pam, false) + -+tunable_policy(`allow_httpd_mod_auth_pam',` + tunable_policy(`allow_httpd_mod_auth_pam',` +- auth_domtrans_chk_passwd(httpd_t) + auth_domtrans_chkpwd(httpd_t) +') + @@ -10998,8 +11018,7 @@ diff -b -B --ignore-all-space --exclude- +## +gen_tunable(allow_httpd_mod_auth_ntlm_winbind, false) +optional_policy(` - tunable_policy(`allow_httpd_mod_auth_pam',` -- auth_domtrans_chk_passwd(httpd_t) ++tunable_policy(`allow_httpd_mod_auth_pam',` + samba_domtrans_winbind_helper(httpd_t) ') ') @@ -11104,10 +11123,14 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`httpd_ssi_exec',` corecmd_shell_domtrans(httpd_t, httpd_sys_script_t) allow httpd_sys_script_t httpd_t:fd use; -@@ -451,6 +583,10 @@ +@@ -451,6 +583,14 @@ ') optional_policy(` ++ cobbler_search_lib(httpd_t) ++') ++ ++optional_policy(` + cvs_read_data(httpd_t) +') + @@ -11115,7 +11138,7 @@ diff -b -B --ignore-all-space --exclude- cron_system_entry(httpd_t, httpd_exec_t) ') -@@ -459,8 +595,13 @@ +@@ -459,8 +599,13 @@ ') optional_policy(` @@ -11131,7 +11154,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -468,22 +609,19 @@ +@@ -468,22 +613,19 @@ mailman_domtrans_cgi(httpd_t) # should have separate types for public and private archives mailman_search_data(httpd_t) @@ -11157,7 +11180,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -494,12 +632,23 @@ +@@ -494,12 +636,23 @@ ') optional_policy(` @@ -11181,7 +11204,7 @@ diff -b -B --ignore-all-space --exclude- ') ') -@@ -508,6 +657,7 @@ +@@ -508,6 +661,7 @@ ') optional_policy(` @@ -11189,7 +11212,7 @@ diff -b -B --ignore-all-space --exclude- snmp_dontaudit_read_snmp_var_lib_files(httpd_t) snmp_dontaudit_write_snmp_var_lib_files(httpd_t) ') -@@ -535,6 +685,23 @@ +@@ -535,6 +689,23 @@ userdom_use_user_terminals(httpd_helper_t) @@ -11213,7 +11236,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## # # Apache PHP script local policy -@@ -564,20 +731,25 @@ +@@ -564,20 +735,25 @@ fs_search_auto_mountpoints(httpd_php_t) @@ -11245,7 +11268,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -595,23 +767,24 @@ +@@ -595,23 +771,24 @@ append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t) read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t) @@ -11274,7 +11297,7 @@ diff -b -B --ignore-all-space --exclude- files_read_etc_files(httpd_suexec_t) files_read_usr_files(httpd_suexec_t) -@@ -624,6 +797,7 @@ +@@ -624,6 +801,7 @@ logging_send_syslog_msg(httpd_suexec_t) miscfiles_read_localization(httpd_suexec_t) @@ -11282,7 +11305,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`httpd_can_network_connect',` allow httpd_suexec_t self:tcp_socket create_stream_socket_perms; -@@ -631,22 +805,31 @@ +@@ -631,22 +809,31 @@ corenet_all_recvfrom_unlabeled(httpd_suexec_t) corenet_all_recvfrom_netlabel(httpd_suexec_t) @@ -11321,7 +11344,7 @@ diff -b -B --ignore-all-space --exclude- ') tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` -@@ -672,15 +855,14 @@ +@@ -672,15 +859,14 @@ dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write }; ') @@ -11340,7 +11363,7 @@ diff -b -B --ignore-all-space --exclude- allow httpd_sys_script_t httpd_t:tcp_socket { read write }; dontaudit httpd_sys_script_t httpd_config_t:dir search; -@@ -699,12 +881,24 @@ +@@ -699,12 +885,24 @@ # Should we add a boolean? apache_domtrans_rotatelogs(httpd_sys_script_t) @@ -11367,7 +11390,7 @@ diff -b -B --ignore-all-space --exclude- ') tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',` -@@ -712,6 +906,35 @@ +@@ -712,6 +910,35 @@ fs_read_nfs_symlinks(httpd_sys_script_t) ') @@ -11403,7 +11426,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` fs_read_cifs_files(httpd_sys_script_t) fs_read_cifs_symlinks(httpd_sys_script_t) -@@ -724,6 +947,10 @@ +@@ -724,6 +951,10 @@ optional_policy(` mysql_stream_connect(httpd_sys_script_t) mysql_rw_db_sockets(httpd_sys_script_t) @@ -11414,7 +11437,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -735,6 +962,8 @@ +@@ -735,6 +966,8 @@ # httpd_rotatelogs local policy # @@ -11423,7 +11446,7 @@ diff -b -B --ignore-all-space --exclude- manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t) kernel_read_kernel_sysctls(httpd_rotatelogs_t) -@@ -754,11 +983,88 @@ +@@ -754,11 +987,88 @@ tunable_policy(`httpd_enable_cgi && httpd_unified',` allow httpd_user_script_t httpdcontent:file entrypoint; @@ -11443,7 +11466,7 @@ diff -b -B --ignore-all-space --exclude- + userdom_search_user_home_content(httpd_t) + userdom_search_user_home_content(httpd_suexec_t) + userdom_search_user_home_content(httpd_user_script_t) - ') ++') + +tunable_policy(`httpd_read_user_content',` + userdom_read_user_home_content_files(httpd_user_script_t) @@ -11497,7 +11520,7 @@ diff -b -B --ignore-all-space --exclude- + +optional_policy(` + postgresql_stream_connect(httpd_bugzilla_script_t) -+') + ') + +manage_dirs_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content) +manage_files_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content) @@ -12237,14 +12260,14 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.fc serefpolicy-3.6.32/policy/modules/services/cobbler.fc --- nsaserefpolicy/policy/modules/services/cobbler.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.32/policy/modules/services/cobbler.fc 2009-09-30 16:12:48.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/services/cobbler.fc 2009-10-30 16:16:35.000000000 -0400 @@ -0,0 +1,2 @@ + +/var/lib/cobbler(/.*)? gen_context(system_u:object_r:cobbler_var_lib_t,s0) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.if serefpolicy-3.6.32/policy/modules/services/cobbler.if --- nsaserefpolicy/policy/modules/services/cobbler.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.6.32/policy/modules/services/cobbler.if 2009-09-30 16:12:48.000000000 -0400 -@@ -0,0 +1,24 @@ ++++ serefpolicy-3.6.32/policy/modules/services/cobbler.if 2009-10-30 16:15:49.000000000 -0400 +@@ -0,0 +1,44 @@ +## +## Cobbler var_lib_t +## @@ -12269,6 +12292,26 @@ diff -b -B --ignore-all-space --exclude- + files_search_var_lib($1) +') + ++ ++######################################## ++## ++## Read cobbler lib files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`cobbler_search_lib',` ++ gen_require(` ++ type cobbler_var_lib_t; ++ ') ++ ++ allow $1 cobbler_var_lib_t:dir search_dir_perms; ++ files_search_var_lib($1) ++') ++ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.te serefpolicy-3.6.32/policy/modules/services/cobbler.te --- nsaserefpolicy/policy/modules/services/cobbler.te 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-3.6.32/policy/modules/services/cobbler.te 2009-09-30 16:12:48.000000000 -0400 @@ -12336,7 +12379,16 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.32/policy/modules/services/consolekit.te --- nsaserefpolicy/policy/modules/services/consolekit.te 2009-08-14 16:14:31.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/services/consolekit.te 2009-10-29 14:34:49.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/services/consolekit.te 2009-11-02 09:43:56.000000000 -0500 +@@ -21,7 +21,7 @@ + # consolekit local policy + # + +-allow consolekit_t self:capability { setuid setgid sys_tty_config dac_override sys_nice sys_ptrace }; ++allow consolekit_t self:capability { chown setuid setgid sys_tty_config dac_override sys_nice sys_ptrace }; + allow consolekit_t self:process { getsched signal }; + allow consolekit_t self:fifo_file rw_fifo_file_perms; + allow consolekit_t self:unix_stream_socket create_stream_socket_perms; @@ -59,15 +59,19 @@ term_use_all_terms(consolekit_t) @@ -15330,7 +15382,7 @@ diff -b -B --ignore-all-space --exclude- optional_policy(` diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.6.32/policy/modules/services/mysql.te --- nsaserefpolicy/policy/modules/services/mysql.te 2009-08-14 16:14:31.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/services/mysql.te 2009-09-30 16:12:48.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/services/mysql.te 2009-11-02 09:22:10.000000000 -0500 @@ -136,7 +136,12 @@ domtrans_pattern(mysqld_safe_t, mysqld_exec_t, mysqld_t) @@ -15339,7 +15391,7 @@ diff -b -B --ignore-all-space --exclude- + allow mysqld_safe_t mysqld_log_t:file manage_file_perms; + -+domain_getattr_all_domains(mysqld_safe_t) ++domain_read_all_domains_state(mysqld_safe_t) + logging_log_filetrans(mysqld_safe_t, mysqld_log_t, file) @@ -20960,7 +21012,7 @@ diff -b -B --ignore-all-space --exclude- +') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te --- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2009-08-14 16:14:31.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te 2009-10-27 17:49:35.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te 2009-11-02 08:56:55.000000000 -0500 @@ -22,13 +22,19 @@ type setroubleshoot_var_run_t; files_pid_file(setroubleshoot_var_run_t) @@ -21002,7 +21054,7 @@ diff -b -B --ignore-all-space --exclude- + dev_getattr_all_chr_files(setroubleshootd_t) domain_dontaudit_search_all_domains_state(setroubleshootd_t) -+ domain_signull_all_domains(setroubleshootd_t) ++domain_signull_all_domains(setroubleshootd_t) files_read_usr_files(setroubleshootd_t) files_read_etc_files(setroubleshootd_t) @@ -21022,7 +21074,7 @@ diff -b -B --ignore-all-space --exclude- selinux_get_enforce_mode(setroubleshootd_t) selinux_validate_context(setroubleshootd_t) -@@ -94,23 +113,75 @@ +@@ -94,23 +113,76 @@ locallogin_dontaudit_use_fds(setroubleshootd_t) @@ -21049,7 +21101,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -+ rpm_signull(setroubleshootd_t) ++ rpm_signull(setroubleshootd_t) rpm_read_db(setroubleshootd_t) rpm_dontaudit_manage_db(setroubleshootd_t) rpm_use_script_fds(setroubleshootd_t) @@ -21089,6 +21141,7 @@ diff -b -B --ignore-all-space --exclude- +miscfiles_read_localization(setroubleshoot_fixit_t) + +userdom_dontaudit_search_admin_dir(setroubleshoot_fixit_t) ++userdom_signull_unpriv_users(setroubleshoot_fixit_t) + +optional_policy(` + rpm_signull(setroubleshoot_fixit_t) @@ -24249,7 +24302,7 @@ diff -b -B --ignore-all-space --exclude- + diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.32/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2009-08-28 14:58:20.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/services/xserver.te 2009-10-29 11:16:45.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/services/xserver.te 2009-11-02 09:24:58.000000000 -0500 @@ -34,6 +34,13 @@ ## @@ -24388,7 +24441,7 @@ diff -b -B --ignore-all-space --exclude- files_tmpfs_file(xserver_tmpfs_t) ubac_constrained(xserver_tmpfs_t) -@@ -250,19 +269,21 @@ +@@ -250,23 +269,26 @@ # Xauth local policy # @@ -24413,7 +24466,12 @@ diff -b -B --ignore-all-space --exclude- domain_use_interactive_fds(xauth_t) files_read_etc_files(xauth_t) -@@ -279,6 +300,12 @@ + files_search_pids(xauth_t) ++files_dontaudit_getattr_all_dirs(xauth_t) + + fs_getattr_xattr_fs(xauth_t) + fs_search_auto_mountpoints(xauth_t) +@@ -279,6 +301,12 @@ userdom_use_user_terminals(xauth_t) userdom_read_user_tmp_files(xauth_t) @@ -24426,7 +24484,7 @@ diff -b -B --ignore-all-space --exclude- xserver_rw_xdm_tmp_files(xauth_t) tunable_policy(`use_nfs_home_dirs',` -@@ -300,20 +327,31 @@ +@@ -300,20 +328,31 @@ # XDM Local policy # @@ -24461,7 +24519,7 @@ diff -b -B --ignore-all-space --exclude- # Allow gdm to run gdm-binary can_exec(xdm_t, xdm_exec_t) -@@ -325,26 +363,43 @@ +@@ -325,26 +364,43 @@ # this is ugly, daemons should not create files under /etc! manage_files_pattern(xdm_t, xdm_rw_etc_t, xdm_rw_etc_t) @@ -24512,7 +24570,7 @@ diff -b -B --ignore-all-space --exclude- allow xdm_t xserver_t:process signal; allow xdm_t xserver_t:unix_stream_socket connectto; -@@ -358,6 +413,7 @@ +@@ -358,6 +414,7 @@ allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill }; allow xdm_t xserver_t:shm rw_shm_perms; @@ -24520,7 +24578,7 @@ diff -b -B --ignore-all-space --exclude- # connect to xdm xserver over stream socket stream_connect_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t, xserver_t) -@@ -366,10 +422,14 @@ +@@ -366,10 +423,14 @@ delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t) delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t) @@ -24536,7 +24594,7 @@ diff -b -B --ignore-all-space --exclude- kernel_read_system_state(xdm_t) kernel_read_kernel_sysctls(xdm_t) -@@ -389,11 +449,13 @@ +@@ -389,11 +450,13 @@ corenet_udp_sendrecv_all_ports(xdm_t) corenet_tcp_bind_generic_node(xdm_t) corenet_udp_bind_generic_node(xdm_t) @@ -24550,7 +24608,7 @@ diff -b -B --ignore-all-space --exclude- dev_read_rand(xdm_t) dev_read_sysfs(xdm_t) dev_getattr_framebuffer_dev(xdm_t) -@@ -401,6 +463,7 @@ +@@ -401,6 +464,7 @@ dev_getattr_mouse_dev(xdm_t) dev_setattr_mouse_dev(xdm_t) dev_rw_apm_bios(xdm_t) @@ -24558,7 +24616,7 @@ diff -b -B --ignore-all-space --exclude- dev_setattr_apm_bios_dev(xdm_t) dev_rw_dri(xdm_t) dev_rw_agp(xdm_t) -@@ -413,14 +476,17 @@ +@@ -413,14 +477,17 @@ dev_setattr_video_dev(xdm_t) dev_getattr_scanner_dev(xdm_t) dev_setattr_scanner_dev(xdm_t) @@ -24578,7 +24636,7 @@ diff -b -B --ignore-all-space --exclude- files_read_etc_files(xdm_t) files_read_var_files(xdm_t) -@@ -431,9 +497,13 @@ +@@ -431,9 +498,13 @@ files_read_usr_files(xdm_t) # Poweroff wants to create the /poweroff file when run from xdm files_create_boot_flag(xdm_t) @@ -24592,7 +24650,7 @@ diff -b -B --ignore-all-space --exclude- storage_dontaudit_read_fixed_disk(xdm_t) storage_dontaudit_write_fixed_disk(xdm_t) -@@ -442,6 +512,7 @@ +@@ -442,6 +513,7 @@ storage_dontaudit_raw_write_removable_device(xdm_t) storage_dontaudit_setattr_removable_dev(xdm_t) storage_dontaudit_rw_scsi_generic(xdm_t) @@ -24600,7 +24658,7 @@ diff -b -B --ignore-all-space --exclude- term_setattr_console(xdm_t) term_use_unallocated_ttys(xdm_t) -@@ -450,6 +521,7 @@ +@@ -450,6 +522,7 @@ auth_domtrans_pam_console(xdm_t) auth_manage_pam_pid(xdm_t) auth_manage_pam_console_data(xdm_t) @@ -24608,7 +24666,7 @@ diff -b -B --ignore-all-space --exclude- auth_rw_faillog(xdm_t) auth_write_login_records(xdm_t) -@@ -460,10 +532,11 @@ +@@ -460,10 +533,11 @@ logging_read_generic_logs(xdm_t) @@ -24622,7 +24680,7 @@ diff -b -B --ignore-all-space --exclude- userdom_dontaudit_use_unpriv_user_fds(xdm_t) userdom_create_all_users_keys(xdm_t) -@@ -472,6 +545,9 @@ +@@ -472,6 +546,9 @@ # Search /proc for any user domain processes. userdom_read_all_users_state(xdm_t) userdom_signal_all_users(xdm_t) @@ -24632,7 +24690,7 @@ diff -b -B --ignore-all-space --exclude- xserver_rw_session(xdm_t, xdm_tmpfs_t) xserver_unconfined(xdm_t) -@@ -504,10 +580,12 @@ +@@ -504,10 +581,12 @@ optional_policy(` alsa_domtrans(xdm_t) @@ -24645,7 +24703,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -515,12 +593,46 @@ +@@ -515,12 +594,46 @@ ') optional_policy(` @@ -24692,7 +24750,7 @@ diff -b -B --ignore-all-space --exclude- hostname_exec(xdm_t) ') -@@ -542,6 +654,38 @@ +@@ -542,6 +655,38 @@ ') optional_policy(` @@ -24731,7 +24789,7 @@ diff -b -B --ignore-all-space --exclude- seutil_sigchld_newrole(xdm_t) ') -@@ -550,8 +694,9 @@ +@@ -550,8 +695,9 @@ ') optional_policy(` @@ -24743,7 +24801,7 @@ diff -b -B --ignore-all-space --exclude- ifndef(`distro_redhat',` allow xdm_t self:process { execheap execmem }; -@@ -560,7 +705,6 @@ +@@ -560,7 +706,6 @@ ifdef(`distro_rhel4',` allow xdm_t self:process { execheap execmem }; ') @@ -24751,7 +24809,7 @@ diff -b -B --ignore-all-space --exclude- optional_policy(` userhelper_dontaudit_search_config(xdm_t) -@@ -571,6 +715,10 @@ +@@ -571,6 +716,10 @@ ') optional_policy(` @@ -24762,7 +24820,7 @@ diff -b -B --ignore-all-space --exclude- xfs_stream_connect(xdm_t) ') -@@ -587,10 +735,9 @@ +@@ -587,10 +736,9 @@ # execheap needed until the X module loader is fixed. # NVIDIA Needs execstack @@ -24774,7 +24832,7 @@ diff -b -B --ignore-all-space --exclude- allow xserver_t self:fd use; allow xserver_t self:fifo_file rw_fifo_file_perms; allow xserver_t self:sock_file read_sock_file_perms; -@@ -602,9 +749,12 @@ +@@ -602,9 +750,12 @@ allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto }; allow xserver_t self:tcp_socket create_stream_socket_perms; allow xserver_t self:udp_socket create_socket_perms; @@ -24787,7 +24845,7 @@ diff -b -B --ignore-all-space --exclude- allow xserver_t { input_xevent_t input_xevent_type }:x_event send; -@@ -616,13 +766,14 @@ +@@ -616,13 +767,14 @@ type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t; allow xserver_t { rootwindow_t x_domain }:x_drawable send; @@ -24803,7 +24861,7 @@ diff -b -B --ignore-all-space --exclude- manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t) manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t) -@@ -635,9 +786,19 @@ +@@ -635,9 +787,19 @@ manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t) files_search_var_lib(xserver_t) @@ -24823,7 +24881,7 @@ diff -b -B --ignore-all-space --exclude- kernel_read_system_state(xserver_t) kernel_read_device_sysctls(xserver_t) -@@ -671,7 +832,6 @@ +@@ -671,7 +833,6 @@ dev_rw_agp(xserver_t) dev_rw_framebuffer(xserver_t) dev_manage_dri_dev(xserver_t) @@ -24831,7 +24889,7 @@ diff -b -B --ignore-all-space --exclude- dev_create_generic_dirs(xserver_t) dev_setattr_generic_dirs(xserver_t) # raw memory access is needed if not using the frame buffer -@@ -681,9 +841,12 @@ +@@ -681,9 +842,12 @@ dev_rw_xserver_misc(xserver_t) # read events - the synaptics touchpad driver reads raw events dev_rw_input_dev(xserver_t) @@ -24845,7 +24903,7 @@ diff -b -B --ignore-all-space --exclude- files_read_etc_files(xserver_t) files_read_etc_runtime_files(xserver_t) -@@ -698,8 +861,12 @@ +@@ -698,8 +862,12 @@ fs_search_nfs(xserver_t) fs_search_auto_mountpoints(xserver_t) fs_search_ramfs(xserver_t) @@ -24858,7 +24916,7 @@ diff -b -B --ignore-all-space --exclude- selinux_validate_context(xserver_t) selinux_compute_access_vector(xserver_t) -@@ -721,6 +888,7 @@ +@@ -721,6 +889,7 @@ miscfiles_read_localization(xserver_t) miscfiles_read_fonts(xserver_t) @@ -24866,7 +24924,7 @@ diff -b -B --ignore-all-space --exclude- modutils_domtrans_insmod(xserver_t) -@@ -743,7 +911,7 @@ +@@ -743,7 +912,7 @@ ') ifdef(`enable_mls',` @@ -24875,7 +24933,7 @@ diff -b -B --ignore-all-space --exclude- range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh; ') -@@ -775,12 +943,20 @@ +@@ -775,12 +944,20 @@ ') optional_policy(` @@ -24897,7 +24955,7 @@ diff -b -B --ignore-all-space --exclude- unconfined_domtrans(xserver_t) ') -@@ -807,12 +983,12 @@ +@@ -807,12 +984,12 @@ allow xserver_t xdm_var_lib_t:file { getattr read }; dontaudit xserver_t xdm_var_lib_t:dir search; @@ -24914,7 +24972,7 @@ diff -b -B --ignore-all-space --exclude- # Run xkbcomp. allow xserver_t xkb_var_lib_t:lnk_file read; -@@ -828,9 +1004,14 @@ +@@ -828,9 +1005,14 @@ # to read ROLE_home_t - examine this in more detail # (xauth?) userdom_read_user_home_content_files(xserver_t) @@ -24929,7 +24987,7 @@ diff -b -B --ignore-all-space --exclude- tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs(xserver_t) fs_manage_nfs_files(xserver_t) -@@ -845,11 +1026,14 @@ +@@ -845,11 +1027,14 @@ optional_policy(` dbus_system_bus_client(xserver_t) @@ -24945,7 +25003,7 @@ diff -b -B --ignore-all-space --exclude- ') optional_policy(` -@@ -882,6 +1066,8 @@ +@@ -882,6 +1067,8 @@ # X Server # can read server-owned resources allow x_domain xserver_t:x_resource read; @@ -24954,7 +25012,7 @@ diff -b -B --ignore-all-space --exclude- # can mess with own clients allow x_domain self:x_client { manage destroy }; -@@ -906,6 +1092,8 @@ +@@ -906,6 +1093,8 @@ # operations allowed on my windows allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive }; @@ -24963,7 +25021,7 @@ diff -b -B --ignore-all-space --exclude- # X Colormaps # can use the default colormap allow x_domain rootwindow_t:x_colormap { read use add_color }; -@@ -973,17 +1161,49 @@ +@@ -973,17 +1162,49 @@ allow xserver_unconfined_type { x_domain xserver_t }:x_resource *; allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *; @@ -25528,16 +25586,28 @@ diff -b -B --ignore-all-space --exclude- # /var diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.32/policy/modules/system/init.if --- nsaserefpolicy/policy/modules/system/init.if 2009-07-14 14:19:57.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/system/init.if 2009-10-19 14:27:28.000000000 -0400 -@@ -174,6 +174,7 @@ ++++ serefpolicy-3.6.32/policy/modules/system/init.if 2009-11-02 13:55:55.000000000 -0500 +@@ -162,6 +162,7 @@ + gen_require(` + attribute direct_run_init, direct_init, direct_init_entry; + type initrc_t; ++ type init_t; + role system_r; + attribute daemon; + ') +@@ -174,6 +175,11 @@ role system_r types $1; domtrans_pattern(initrc_t,$2,$1) + allow initrc_t $1:process siginh; ++ ++ # Handle upstart direct transition to a executable ++ domtrans_pattern(init_t,$2,$1) ++ allow init_t $1:process siginh; # daemons started from init will # inherit fds from init for the console -@@ -272,6 +273,7 @@ +@@ -272,6 +278,7 @@ role system_r types $1; domtrans_pattern(initrc_t,$2,$1) @@ -25545,7 +25615,7 @@ diff -b -B --ignore-all-space --exclude- ifdef(`hide_broken_symptoms',` # RHEL4 systems seem to have a stray -@@ -280,6 +282,36 @@ +@@ -280,6 +287,36 @@ kernel_dontaudit_use_fds($1) ') ') @@ -25582,7 +25652,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -546,7 +578,7 @@ +@@ -546,7 +583,7 @@ # upstart uses a datagram socket instead of initctl pipe allow $1 self:unix_dgram_socket create_socket_perms; @@ -25591,7 +25661,7 @@ diff -b -B --ignore-all-space --exclude- ') ') -@@ -619,18 +651,19 @@ +@@ -619,18 +656,19 @@ # interface(`init_spec_domtrans_script',` gen_require(` @@ -25615,7 +25685,7 @@ diff -b -B --ignore-all-space --exclude- ') ') -@@ -646,23 +679,43 @@ +@@ -646,19 +684,39 @@ # interface(`init_domtrans_script',` gen_require(` @@ -25636,11 +25706,11 @@ diff -b -B --ignore-all-space --exclude- ifdef(`enable_mls',` - range_transition $1 initrc_exec_t:process s0 - mls_systemhigh; + range_transition $1 init_script_file_type:process s0 - mls_systemhigh; - ') - ') - - ######################################## - ## ++ ') ++') ++ ++######################################## ++## +## Execute a file in a bin directory +## in the initrc_t domain +## @@ -25653,17 +25723,13 @@ diff -b -B --ignore-all-space --exclude- +interface(`init_bin_domtrans_spec',` + gen_require(` + type initrc_t; -+ ') + ') + + corecmd_bin_domtrans($1, initrc_t) -+') -+ -+######################################## -+## - ## Execute a init script in a specified domain. - ## - ## -@@ -904,6 +957,24 @@ + ') + + ######################################## +@@ -904,6 +962,24 @@ allow $1 init_script_file_type:file read_file_perms; ') @@ -25688,7 +25754,7 @@ diff -b -B --ignore-all-space --exclude- ######################################## ## ## Execute all init scripts in the caller domain. -@@ -1123,7 +1194,7 @@ +@@ -1123,7 +1199,7 @@ type initrc_t; ') @@ -25697,7 +25763,7 @@ diff -b -B --ignore-all-space --exclude- ') ######################################## -@@ -1291,6 +1362,25 @@ +@@ -1291,6 +1367,25 @@ ######################################## ## @@ -25723,7 +25789,7 @@ diff -b -B --ignore-all-space --exclude- ## Create files in a init script ## temporary data directory. ## -@@ -1521,3 +1611,51 @@ +@@ -1521,3 +1616,51 @@ ') corenet_udp_recvfrom_labeled($1, daemon) ') @@ -26855,7 +26921,7 @@ diff -b -B --ignore-all-space --exclude- +miscfiles_read_localization(iscsid_t) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2009-08-14 16:14:31.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc 2009-10-26 15:31:02.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc 2009-11-02 10:06:15.000000000 -0500 @@ -60,12 +60,15 @@ # # /opt @@ -26905,7 +26971,7 @@ diff -b -B --ignore-all-space --exclude- /usr/(.*/)?java/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/(.*/)?java/.+\.jar -- gen_context(system_u:object_r:lib_t,s0) -@@ -115,27 +120,30 @@ +@@ -115,27 +120,32 @@ /usr/(.*/)?nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -26933,6 +26999,8 @@ diff -b -B --ignore-all-space --exclude- +/usr/lib(64)?/sse2/libx264\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?(/.*)?/libnvidia.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?(/.*)?/nvidia_drv.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib(64)?/nero/plug-ins/libMP3\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++ /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -26944,7 +27012,7 @@ diff -b -B --ignore-all-space --exclude- /usr/(local/)?.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:lib_t,s0) /usr/(local/)?lib(64)?/wine/.+\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -143,11 +151,8 @@ +@@ -143,11 +153,8 @@ /usr/NX/lib/libXcomp\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/NX/lib/libjpeg\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -26956,7 +27024,7 @@ diff -b -B --ignore-all-space --exclude- /usr/lib(64)?/xorg/modules/drivers/fglrx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/xorg/modules/drivers/nvidia_drv\.o -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -168,12 +173,12 @@ +@@ -168,12 +175,12 @@ # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv # HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php @@ -26971,7 +27039,7 @@ diff -b -B --ignore-all-space --exclude- /usr/lib/maxima/[^/]+/binary-gcl/maxima -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib/mozilla/plugins/libvlcplugin\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib/nx/libXcomp\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -185,15 +190,10 @@ +@@ -185,15 +192,10 @@ /usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8 -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libglide3\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libglide3-v[0-9]*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -26988,7 +27056,7 @@ diff -b -B --ignore-all-space --exclude- /usr/lib(64)?/libHermes\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/valgrind/hp2ps -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/valgrind/stage2 -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -228,31 +228,17 @@ +@@ -228,31 +230,17 @@ /usr/lib(64)?/ladspa/sc3_1427\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/ladspa/sc4_1882\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/ladspa/se4_1883\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -27024,7 +27092,7 @@ diff -b -B --ignore-all-space --exclude- # Jai, Sun Microsystems (Jpackage SPRM) /usr/lib(64)?/libmlib_jai\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -268,8 +254,8 @@ +@@ -268,8 +256,8 @@ /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/vmware/(.*/)?VmPerl\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -27035,7 +27103,7 @@ diff -b -B --ignore-all-space --exclude- # Java, Sun Microsystems (JPackage SRPM) /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -295,6 +281,8 @@ +@@ -295,6 +283,8 @@ /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib/acroread/.+\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib/acroread/(.*/)?ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -27044,7 +27112,7 @@ diff -b -B --ignore-all-space --exclude- ') dnl end distro_redhat # -@@ -307,10 +295,102 @@ +@@ -307,10 +297,103 @@ /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? -- gen_context(system_u:object_r:lib_t,s0) @@ -27110,6 +27178,7 @@ diff -b -B --ignore-all-space --exclude- +/usr/lib(64)?/libswscale\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + +/usr/lib/libADM5avformat\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib/libADM_coreImage\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + +ifdef(`fixed',` +/usr/lib(64)?/libavfilter\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -30471,7 +30540,7 @@ diff -b -B --ignore-all-space --exclude- +HOME_DIR/\.gvfs(/.*)? <> diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.32/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2009-08-31 13:30:04.000000000 -0400 -+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if 2009-10-29 11:16:09.000000000 -0400 ++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if 2009-11-02 08:56:44.000000000 -0500 @@ -30,8 +30,9 @@ ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v retrieving revision 1.959 retrieving revision 1.960 diff -u -p -r1.959 -r1.960 --- selinux-policy.spec 30 Oct 2009 13:52:35 -0000 1.959 +++ selinux-policy.spec 2 Nov 2009 18:59:36 -0000 1.960 @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.6.32 -Release: 38%{?dist} +Release: 39%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -445,6 +445,9 @@ exit 0 %endif %changelog +* Mon Nov 2 2009 Dan Walsh 3.6.32-39 +- Allow setroubleshoot-fix to signull user domains + * Fri Oct 30 2009 Dan Walsh 3.6.32-38 - Allow abrt to create link files in /var/cache/abrt From stevetraylen at fedoraproject.org Mon Nov 2 19:07:29 2009 From: stevetraylen at fedoraproject.org (stevetraylen) Date: Mon, 2 Nov 2009 19:07:29 +0000 (UTC) Subject: rpms/myproxy/devel .cvsignore, 1.2, 1.3 myproxy.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <20091102190729.D5D9C11C0086@cvs1.fedora.phx.redhat.com> Author: stevetraylen Update of /cvs/pkgs/rpms/myproxy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17560 Modified Files: .cvsignore myproxy.spec sources Log Message: New source. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/myproxy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 11 Oct 2009 06:06:20 -0000 1.2 +++ .cvsignore 2 Nov 2009 19:07:29 -0000 1.3 @@ -1 +1 @@ -myproxy-4.8.tar.gz +myproxy-4.9.tar.gz Index: myproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/myproxy/devel/myproxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- myproxy.spec 13 Oct 2009 07:31:54 -0000 1.2 +++ myproxy.spec 2 Nov 2009 19:07:29 -0000 1.3 @@ -7,8 +7,8 @@ %endif Name: myproxy -Version: 4.8 -Release: 5%{?dist} +Version: 4.9 +Release: 1%{?dist} Summary: Manage X.509 Public Key Infrastructure (PKI) security credentials Group: System Environment/Daemons @@ -391,6 +391,8 @@ fi %{_libdir}/pkgconfig/myproxy.pc %changelog +* Tue Oct 13 2009 Steve Traylen - 4.9-1 +- New upstream 4.9. * Tue Oct 13 2009 Steve Traylen - 4.8-5 - Disable openldap support for el4 only since openldap to old. * Wed Oct 7 2009 Steve Traylen - 4.8-4 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/myproxy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 11 Oct 2009 06:06:22 -0000 1.2 +++ sources 2 Nov 2009 19:07:29 -0000 1.3 @@ -1 +1 @@ -85f29d553bfec5fa5f2042440542524f myproxy-4.8.tar.gz +05b5540ac141de40ac6d2b90b72a4877 myproxy-4.9.tar.gz From stevetraylen at fedoraproject.org Mon Nov 2 19:09:22 2009 From: stevetraylen at fedoraproject.org (stevetraylen) Date: Mon, 2 Nov 2009 19:09:22 +0000 (UTC) Subject: rpms/myproxy/devel myproxy.spec,1.3,1.4 Message-ID: <20091102190922.5CF1211C0086@cvs1.fedora.phx.redhat.com> Author: stevetraylen Update of /cvs/pkgs/rpms/myproxy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18152 Modified Files: myproxy.spec Log Message: Silly mistake. Index: myproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/myproxy/devel/myproxy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- myproxy.spec 2 Nov 2009 19:07:29 -0000 1.3 +++ myproxy.spec 2 Nov 2009 19:09:21 -0000 1.4 @@ -8,7 +8,7 @@ Name: myproxy Version: 4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage X.509 Public Key Infrastructure (PKI) security credentials Group: System Environment/Daemons @@ -391,6 +391,8 @@ fi %{_libdir}/pkgconfig/myproxy.pc %changelog +* Tue Oct 13 2009 Steve Traylen - 4.9-2 +- Bump for my error. * Tue Oct 13 2009 Steve Traylen - 4.9-1 - New upstream 4.9. * Tue Oct 13 2009 Steve Traylen - 4.8-5 From deji at fedoraproject.org Mon Nov 2 19:11:17 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Mon, 2 Nov 2009 19:11:17 +0000 (UTC) Subject: rpms/texmaker/devel texmaker-tools.patch, 1.11, 1.12 texmaker.spec, 1.23, 1.24 Message-ID: <20091102191118.2889711C04E9@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/texmaker/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18769 Modified Files: texmaker-tools.patch texmaker.spec Log Message: * Mon Nov 02 2009 Deji Akingunola - 1.9.2-3 - Update with a more complete patch to use system hunspell (Caolan McNamara) texmaker-tools.patch: spellerdialog.h | 2 +- texmaker.cpp | 26 ++++---------------------- texmaker.pro | 34 ++-------------------------------- 3 files changed, 7 insertions(+), 55 deletions(-) Index: texmaker-tools.patch =================================================================== RCS file: /cvs/pkgs/rpms/texmaker/devel/texmaker-tools.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- texmaker-tools.patch 17 Jul 2009 05:19:17 -0000 1.11 +++ texmaker-tools.patch 2 Nov 2009 19:11:15 -0000 1.12 @@ -40,3 +40,71 @@ #endif #if defined( Q_WS_MACX ) QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/"; +--- spellerdialog.h ++++ spellerdialog.h.new +@@ -13,7 +13,7 @@ + + #include "ui_spellerdialog.h" + #include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + #include + +--- texmaker.pro ++++ texmaker.pro.new +@@ -3,7 +3,8 @@ TEMPLATE = app + TARGET = texmaker + QT += network \ + xml +-CONFIG += qt warn_off release ++CONFIG += qt warn_off release link_pkgconfig ++PKGCONFIG = hunspell + ############################### + HEADERS += texmaker.h \ + texmakerapp.h \ +@@ -39,25 +40,6 @@ HEADERS += texmaker.h \ + manhattanstyle.h \ + stylehelper.h \ + styleanimator.h \ +- hunspell/affentry.hxx \ +- hunspell/affixmgr.hxx \ +- hunspell/atypes.hxx \ +- hunspell/baseaffix.hxx \ +- hunspell/csutil.hxx \ +- hunspell/dictmgr.hxx \ +- hunspell/hashmgr.hxx \ +- hunspell/htypes.hxx \ +- hunspell/hunspell.hxx \ +- hunspell/hunspell.h \ +- hunspell/langnum.hxx \ +- hunspell/license.hunspell \ +- hunspell/phonet.hxx \ +- hunspell/suggestmgr.hxx \ +- hunspell/license.myspell \ +- hunspell/filemgr.hxx \ +- hunspell/hunzip.hxx \ +- hunspell/replist.hxx \ +- hunspell/w_char.hxx \ + singleapp/qtlocalpeer.h \ + singleapp/qtlockedfile.h \ + singleapp/qtsingleapplication.h \ +@@ -96,18 +78,6 @@ SOURCES += main.cpp \ + manhattanstyle.cpp \ + stylehelper.cpp \ + styleanimator.cpp \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/dictmgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/phonet.cxx \ +- hunspell/suggestmgr.cxx \ +- hunspell/utf_info.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/replist.cxx \ +- hunspell/hunzip.cxx \ + singleapp/qtlocalpeer.cpp \ + singleapp/qtlockedfile.cpp \ + singleapp/qtsingleapplication.cpp \ Index: texmaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/texmaker/devel/texmaker.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- texmaker.spec 27 Jul 2009 05:53:00 -0000 1.23 +++ texmaker.spec 2 Nov 2009 19:11:15 -0000 1.24 @@ -1,16 +1,16 @@ Summary: LaTeX editor Name: texmaker Version: 1.9.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2+ Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt4-devel +BuildRequires: qt4-devel, hunspell-devel BuildRequires: desktop-file-utils -Requires: tetex-latex, tetex-dvipost, tetex-xdvi, hunspell +Requires: tetex-latex, tetex-dvipost, tetex-xdvi # Patch to use default Fedora's document viewer and system's hunspell Patch0: %{name}-tools.patch @@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %exclude %{_datadir}/texmaker/*.aff %changelog +* Mon Nov 02 2009 Deji Akingunola - 1.9.2-3 +- Update with a more complete patch to use system hunspell (Caolan McNamara) + * Sun Jul 26 2009 Fedora Release Engineering - 1:1.9.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rdieter at fedoraproject.org Mon Nov 2 19:14:05 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Nov 2009 19:14:05 +0000 (UTC) Subject: rpms/kphotoalbum/devel .cvsignore, 1.16, 1.17 kphotoalbum.spec, 1.41, 1.42 sources, 1.15, 1.16 Message-ID: <20091102191405.2D5F111C0086@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kphotoalbum/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19611/devel Modified Files: .cvsignore kphotoalbum.spec sources Log Message: * Sun Oct 25 2009 Rex Dieter 4.1-1 - kphotoalbum-4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 29 Jul 2009 22:10:26 -0000 1.16 +++ .cvsignore 2 Nov 2009 19:14:04 -0000 1.17 @@ -1 +1 @@ -kphotoalbum-4.0.2.tar.bz2 +kphotoalbum-4.1.tar.bz2 Index: kphotoalbum.spec =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/kphotoalbum.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- kphotoalbum.spec 7 Aug 2009 14:09:23 -0000 1.41 +++ kphotoalbum.spec 2 Nov 2009 19:14:04 -0000 1.42 @@ -1,7 +1,7 @@ Summary: KDE Photo Album Name: kphotoalbum -Version: 4.0.2 +Version: 4.1 Release: 1%{?dist} License: GPLv2+ @@ -52,25 +52,7 @@ rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -## File lists -# locale's -%find_lang %{name} || touch %{name}.lang -# HTML (1.0) -HTML_DIR=$(kde4-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi +%find_lang %{name} --with-kde %check @@ -101,14 +83,18 @@ gtk-update-icon-cache %{_datadir}/icons/ %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README TODO -%{_kde4_bindir}/* +%{_kde4_bindir}/kphotoalbum %{_kde4_appsdir}/kphotoalbum/ -%{_kde4_datadir}/applications/kde4/*.desktop +%{_kde4_datadir}/applications/kde4/kphotoalbum.desktop +%{_kde4_datadir}/applications/kde4/kphotoalbum-import.desktop %{_kde4_datadir}/config/*rc %{_kde4_iconsdir}/hicolor/*/*/* %changelog +* Sun Oct 25 2009 Rex Dieter 4.1-1 +- kphotoalbum-4.1 + * Wed Jul 29 2009 Rex Dieter 4.0.2-1 - kphotoalbum-4.0.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 29 Jul 2009 22:10:26 -0000 1.15 +++ sources 2 Nov 2009 19:14:04 -0000 1.16 @@ -1 +1 @@ -2a01730dd3f0c14827c8ab3921fc64c2 kphotoalbum-4.0.2.tar.bz2 +27dde5c73d88f7760b80ae7955909065 kphotoalbum-4.1.tar.bz2 From rdieter at fedoraproject.org Mon Nov 2 19:14:06 2009 From: rdieter at fedoraproject.org (Rex Dieter) Date: Mon, 2 Nov 2009 19:14:06 +0000 (UTC) Subject: rpms/kphotoalbum/F-12 .cvsignore, 1.16, 1.17 kphotoalbum.spec, 1.41, 1.42 sources, 1.15, 1.16 Message-ID: <20091102191406.6011C11C0086@cvs1.fedora.phx.redhat.com> Author: rdieter Update of /cvs/pkgs/rpms/kphotoalbum/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19611/F-12 Modified Files: .cvsignore kphotoalbum.spec sources Log Message: * Sun Oct 25 2009 Rex Dieter 4.1-1 - kphotoalbum-4.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/F-12/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- .cvsignore 29 Jul 2009 22:10:26 -0000 1.16 +++ .cvsignore 2 Nov 2009 19:14:05 -0000 1.17 @@ -1 +1 @@ -kphotoalbum-4.0.2.tar.bz2 +kphotoalbum-4.1.tar.bz2 Index: kphotoalbum.spec =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/F-12/kphotoalbum.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- kphotoalbum.spec 7 Aug 2009 14:09:23 -0000 1.41 +++ kphotoalbum.spec 2 Nov 2009 19:14:05 -0000 1.42 @@ -1,7 +1,7 @@ Summary: KDE Photo Album Name: kphotoalbum -Version: 4.0.2 +Version: 4.1 Release: 1%{?dist} License: GPLv2+ @@ -52,25 +52,7 @@ rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -## File lists -# locale's -%find_lang %{name} || touch %{name}.lang -# HTML (1.0) -HTML_DIR=$(kde4-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi +%find_lang %{name} --with-kde %check @@ -101,14 +83,18 @@ gtk-update-icon-cache %{_datadir}/icons/ %files -f %{name}.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README TODO -%{_kde4_bindir}/* +%{_kde4_bindir}/kphotoalbum %{_kde4_appsdir}/kphotoalbum/ -%{_kde4_datadir}/applications/kde4/*.desktop +%{_kde4_datadir}/applications/kde4/kphotoalbum.desktop +%{_kde4_datadir}/applications/kde4/kphotoalbum-import.desktop %{_kde4_datadir}/config/*rc %{_kde4_iconsdir}/hicolor/*/*/* %changelog +* Sun Oct 25 2009 Rex Dieter 4.1-1 +- kphotoalbum-4.1 + * Wed Jul 29 2009 Rex Dieter 4.0.2-1 - kphotoalbum-4.0.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kphotoalbum/F-12/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 29 Jul 2009 22:10:26 -0000 1.15 +++ sources 2 Nov 2009 19:14:05 -0000 1.16 @@ -1 +1 @@ -2a01730dd3f0c14827c8ab3921fc64c2 kphotoalbum-4.0.2.tar.bz2 +27dde5c73d88f7760b80ae7955909065 kphotoalbum-4.1.tar.bz2 From linville at fedoraproject.org Mon Nov 2 19:22:24 2009 From: linville at fedoraproject.org (John W. Linville) Date: Mon, 2 Nov 2009 19:22:24 +0000 (UTC) Subject: rpms/kernel/F-12 prism54-remove-pci-dev-table.patch, NONE, 1.1 kernel.spec, 1.1894, 1.1895 Message-ID: <20091102192225.5523E11C0086@cvs1.fedora.phx.redhat.com> Author: linville Update of /cvs/pkgs/rpms/kernel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21885 Modified Files: kernel.spec Added Files: prism54-remove-pci-dev-table.patch Log Message: prism54: remove pci modinfo device table (#447047) prism54-remove-pci-dev-table.patch: islpci_hotplug.c | 2 ++ 1 file changed, 2 insertions(+) --- NEW FILE prism54-remove-pci-dev-table.patch --- diff -up linux-2.6.31.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig linux-2.6.31.noarch/drivers/net/wireless/prism54/islpci_hotplug.c --- linux-2.6.31.noarch/drivers/net/wireless/prism54/islpci_hotplug.c.orig 2009-11-02 13:53:48.000000000 -0500 +++ linux-2.6.31.noarch/drivers/net/wireless/prism54/islpci_hotplug.c 2009-11-02 13:53:44.000000000 -0500 @@ -72,8 +72,10 @@ static const struct pci_device_id prism5 {0,0,0,0,0,0,0} }; +#if 0 /* Favor p54pci instead... */ /* register the device with the Hotplug facilities of the kernel */ MODULE_DEVICE_TABLE(pci, prism54_id_tbl); +#endif static int prism54_probe(struct pci_dev *, const struct pci_device_id *); static void prism54_remove(struct pci_dev *); Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v retrieving revision 1.1894 retrieving revision 1.1895 diff -u -p -r1.1894 -r1.1895 --- kernel.spec 2 Nov 2009 17:54:51 -0000 1.1894 +++ kernel.spec 2 Nov 2009 19:22:22 -0000 1.1895 @@ -662,6 +662,7 @@ Patch611: alsa-tell-user-that-stream-to- Patch670: linux-2.6-ata-quirk.patch Patch671: linux-2.6-ahci-export-capabilities.patch +Patch680: prism54-remove-pci-dev-table.patch Patch687: linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch Patch800: linux-2.6-crash-driver.patch @@ -1340,6 +1341,9 @@ ApplyPatch linux-2.6-ata-quirk.patch # Make it possible to identify non-hotplug SATA ports ApplyPatch linux-2.6-ahci-export-capabilities.patch +# prism54: remove pci modinfo device table +ApplyPatch prism54-remove-pci-dev-table.patch + # iwlagn quiet ApplyPatch linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch @@ -2104,6 +2108,9 @@ fi # and build. %changelog +* Mon Nov 02 2009 John W. Linville 2.6.31.5-109 +- prism54: remove pci modinfo device table (#447047) + * Mon Nov 02 2009 Chuck Ebbert 2.6.31.5-108 - Enable acerhdf driver for fan speed control on Acer Aspire One notebook (#532463) From pkgdb at fedoraproject.org Mon Nov 2 19:44:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 19:44:44 +0000 Subject: [pkgdb] aircrack-ng: odinthegreat has requested watchcommits Message-ID: <20091102194444.EE66E10F802@bastion2.fedora.phx.redhat.com> odinthegreat has requested the watchcommits acl on aircrack-ng (Fedora 11) To make changes to this package see: /pkgdb/packages/name/aircrack-ng From rlandmann at fedoraproject.org Mon Nov 2 19:44:55 2009 From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=) Date: Mon, 2 Nov 2009 19:44:55 +0000 (UTC) Subject: rpms/publican/F-11 import.log, NONE, 1.1 .cvsignore, 1.11, 1.12 publican.spec, 1.25, 1.26 sources, 1.12, 1.13 Message-ID: <20091102194455.920B611C0086@cvs1.fedora.phx.redhat.com> Author: rlandmann Update of /cvs/pkgs/rpms/publican/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28188/F-11 Modified Files: .cvsignore publican.spec sources Added Files: import.log Log Message: * Mon Nov 2 2009 Jeff Fearn 1.1-0 - Fix brew failure. BZ #532383 - Fix distributed sets no packaging properly. --- NEW FILE import.log --- publican-1_1-0_fc11:F-11:publican-1.1-0.fc11.src.rpm:1257190938 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-11/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 12 Mar 2009 06:42:31 -0000 1.11 +++ .cvsignore 2 Nov 2009 19:44:54 -0000 1.12 @@ -1 +1 @@ -publican-0.44.tgz +Publican-1.1.tar.gz Index: publican.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-11/publican.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- publican.spec 12 Mar 2009 06:42:31 -0000 1.25 +++ publican.spec 2 Nov 2009 19:44:54 -0000 1.26 @@ -1,76 +1,124 @@ -%define my_vendor fedora -%define EMBED_DOCKBOOK45 0 -%define HTMLVIEW 0 -%define PREMOLESTATION 0 -%define FC10 0 -%define FC11 1 - -Name: publican -Summary: Common files and scripts for publishing with DocBook XML -Version: 0.44 -Release: 0%{?dist} -License: GPLv2+ and GFDL -# The following directories are licensed under the GFDL: -# content, Book_Template, Set_Template, Article_Template -Group: Applications/Text -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildarch: noarch -Source: https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz -Requires: gettext libxslt docbook-dtds docbook-style-xsl elinks aspell -Requires: %{_bindir}/xml2pot %{_bindir}/po2xml -Requires: perl-ParseLex perl-HTML-Template make -Requires: fop batik saxon ImageMagick -Requires: xerces-j2 rpm-build -Requires: perl-XML-TreeBuilder >= 3.09-11 - -BuildRequires: gettext libxslt docbook-dtds docbook-style-xsl aspell -BuildRequires: %{_bindir}/xml2pot %{_bindir}/po2xml -BuildRequires: desktop-file-utils -BuildRequires: perl-XML-TreeBuilder >= 3.09-11 -BuildRequires: fop saxon ImageMagick -#BuildRequires: xslthl -# *&%^*&^ decided to rename font packages and change font paths. -# No actual real changes. -%if %{PREMOLESTATION} -Requires: xslthl -Requires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati -Requires: fonts-hindi fonts-japanese fonts-kannada fonts-korean -Requires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala -Requires: fonts-tamil fonts-telugu liberation-fonts -BuildRequires: xslthl -BuildRequires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati -BuildRequires: fonts-hindi fonts-japanese fonts-kannada fonts-korean -BuildRequires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala -BuildRequires: fonts-tamil fonts-telugu liberation-fonts + +# Track font name changes +%define RHEL5 %(test "%{?dist}" == ".el5" && echo 1 || echo 0) +%define FC10 %(test "%{?dist}" == ".fc10" && echo 1 || echo 0) +# Assume not rhel and not FC10 means FC11+ +%define OTHER %(test "%{RHEL5}" == "0" -a "%{FC10}" == "0" && echo 1 || echo 0) + +# who doesn't have xdg-open? +%define HTMLVIEW %(test "%{RHEL5}" == "1" && echo 1 || echo 0) + +# required for desktop file install +%define my_vendor %(test "%{RHEL5}" == "1" && echo "redhat" || echo "fedora") + +# TODO after beta revert to lower case name +Name: publican +Version: 1.1 +Release: 0%{?dist} +Summary: Common files and scripts for publishing with DocBook XML +# For a breakdown of the licensing, refer to LICENSE +License: (GPLv2+ or Artistic) and CC0 +Group: Applications/Publishing +URL: https://publican.fedorahosted.org +Source0: https://fedorahosted.org/releases/publican/Publican-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +BuildRequires: perl(Devel::Cover) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Test::Exception) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod::Coverage) +BuildRequires: perl(Test::Perl::Critic) +BuildRequires: perl(Archive::Tar) +BuildRequires: perl(Carp) +BuildRequires: perl(Config::Simple) +BuildRequires: perl(Cwd) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(DateTime) +BuildRequires: perl(DateTime::Format::DateParse) +BuildRequires: perl(Encode) +BuildRequires: perl(File::Copy::Recursive) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Find::Rule) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::pushd) +BuildRequires: perl(HTML::FormatText) +BuildRequires: perl(HTML::TreeBuilder) +BuildRequires: perl(I18N::LangTags::List) +BuildRequires: perl(Image::Magick) +BuildRequires: perl(Image::Size) +BuildRequires: perl(Locale::Maketext::Gettext) +BuildRequires: perl(Locale::Language) +BuildRequires: perl(Locale::PO) +BuildRequires: perl(Makefile::Parser) +BuildRequires: perl(Syntax::Highlight::Engine::Kate) +BuildRequires: perl(Term::ANSIColor) +BuildRequires: perl(Text::Wrap) +BuildRequires: perl(version) +BuildRequires: perl(XML::LibXML) >= 1.67 +BuildRequires: perl(XML::LibXSLT) >= 1.67 +BuildRequires: perl(XML::TreeBuilder) >= 3.09-15 +BuildRequires: fop >= 0.90 +BuildRequires: batik +BuildRequires: docbook-style-xsl >= 1.75.1 +BuildRequires: desktop-file-utils + +# Most of these are handled automatically +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(Locale::Maketext::Gettext) +Requires: fop >= 0.90 +Requires: batik +Requires: docbook-style-xsl >= 1.75.1 +Requires: perl(XML::LibXML) >= 1.67 +Requires: perl(XML::LibXSLT) >= 1.67 +Requires: perl(XML::TreeBuilder) >= 3.09-15 + +# Pull in the fonts for all languages, else you can't build translated PDF in brew/koji +%if %{RHEL5} +Requires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati +Requires: fonts-hindi fonts-japanese fonts-kannada fonts-korean +Requires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala +Requires: fonts-tamil fonts-telugu liberation-fonts +BuildRequires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati +BuildRequires: fonts-hindi fonts-japanese fonts-kannada fonts-korean +BuildRequires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala +BuildRequires: fonts-tamil fonts-telugu liberation-fonts %endif %if %{FC10} -Requires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati -Requires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada -Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts -Requires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang - -BuildRequires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati -BuildRequires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada -BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts -BuildRequires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang +Requires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati +Requires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada +Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts +Requires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang + +BuildRequires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati +BuildRequires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada +BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts +BuildRequires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang %endif -%if %{FC11} -Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts -Requires: lohit-fonts-bengali cjkuni-uming-fonts lohit-fonts-gujarati -Requires: lohit-fonts-hindi sazanami-gothic-fonts sazanami-mincho-fonts lohit-fonts-kannada -Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts -Requires: lohit-fonts-tamil lohit-fonts-telugu baekmuk-ttf-batang-fonts - -BuildRequires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts -BuildRequires: lohit-fonts-bengali cjkuni-uming-fonts lohit-fonts-gujarati -BuildRequires: lohit-fonts-hindi sazanami-gothic-fonts sazanami-mincho-fonts lohit-fonts-kannada -BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts -BuildRequires: lohit-fonts-tamil lohit-fonts-telugu baekmuk-ttf-batang-fonts +%if %{OTHER} +Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts +Requires: cjkuni-uming-fonts sazanami-gothic-fonts sazanami-mincho-fonts +Requires: lklug-fonts baekmuk-ttf-batang-fonts + +BuildRequires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts +BuildRequires: cjkuni-uming-fonts sazanami-gothic-fonts sazanami-mincho-fonts +BuildRequires: lklug-fonts baekmuk-ttf-batang-fonts +# Indic font names have changed AGAIN (F12) +# and AGAIN they fail to set Provides +# but they don't work for PDFs anyway +# So we aren't going to use them +#Requires: lohit-fonts-bengali lohit-fonts-gujarati +#Requires: lohit-fonts-hindi lohit-fonts-kannada +#Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi +#Requires: lohit-fonts-tamil lohit-fonts-telugu +#BuildRequires: lohit-fonts-bengali lohit-fonts-gujarati +#BuildRequires: lohit-fonts-hindi lohit-fonts-kannada +#BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi +#BuildRequires: lohit-fonts-tamil lohit-fonts-telugu %endif -URL: https://fedorahosted.org/publican -Obsoletes: documentation-devel < 0.26-3 -Obsoletes: perl-SGML-Translate <= 0.37-3 +Obsoletes: Publican < 1.0 %description Publican is a DocBook publication system, not just a DocBook processing tool. @@ -78,13 +126,14 @@ As well as ensuring your DocBook XML is your XML is up to publishable standard. %package doc -Group: Documentation -Summary: Documentation for the Publican package +Group: Documentation +Summary: Documentation for the Publican package %if %{HTMLVIEW} -Requires: htmlview +Requires: htmlview %else -Requires: xdg-utils +Requires: xdg-utils %endif +Obsoletes: Publican-doc < 1.0 %description doc Publican is a tool for publishing material authored in DocBook XML. @@ -93,34 +142,23 @@ using publican. It is not a DocBook XML solely on using the publican tools. %prep -%setup -q +%setup -q -n Publican-%{version} %build -%{__make} OS_VER=%{?dist} docs +%{__perl} Build.PL installdirs=vendor +./Build +dir=`pwd` && cd Users_Guide && perl -I $dir/blib/lib $dir/blib/script/publican build \ + --formats=html-desktop --publish --langs=all \ + --common_config="$dir/blib/datadir" \ + --common_content="$dir/blib/datadir/Common_Content" %install rm -rf $RPM_BUILD_ROOT -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/applications -mkdir -p -m755 $RPM_BUILD_ROOT%{_bindir} -install -m 755 bin/* $RPM_BUILD_ROOT%{_bindir} - -%if %{EMBED_DOCKBOOK45} -%{__perl} -p -i -e 's|^#CATALOGS_OVERRIDE$|CATALOGS\t= XML_CATALOG_FILES="%{_datadir}/%{name}/xsl/docbook/dtd-4.5/catalog.xml %{_datadir}/%{name}/xsl/docbook/1.72.0/catalog.xml"|g' make/Makefile.templates -%endif -for i in fop make xsl Common_Content templates maven; do - cp -rf $i $RPM_BUILD_ROOT%{_datadir}/%{name}/$i -done -cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Book_Template -cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Set_Template -cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Article_Template - -%if %{EMBED_DOCKBOOK45} -cp -rf xsl_extras/docbook $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/. -%endif +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -cp xsl_extras/docbook/1.72.0/extensions/saxon65.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/. +%{_fixperms} $RPM_BUILD_ROOT/* sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc-%{version}/en-US/index.html|' %{name}.desktop sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc-%{version}/en-US/images/icon.svg|' %{name}.desktop @@ -131,33 +169,66 @@ sed -i -e 's|xdg-open|htmlview|' %{name} desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop +%check +#./Build test + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README -%doc COPYING -%doc fdl.txt -%{_datadir}/%{name} -%{_bindir}/create_book -%{_bindir}/mkxpot -%{_bindir}/msgxmerge -%{_bindir}/po2xlf -%{_bindir}/po2sgml -%{_bindir}/potmerge -%{_bindir}/poxmerge -%{_bindir}/rmImages -%{_bindir}/StSe_Reports -%{_bindir}/xlf2pot -%{_bindir}/xmlClean +%doc Changes README COPYING Artistic +%{perl_vendorlib}/* +%{_mandir}/man3/* +%{_mandir}/man1/* +%{_bindir}/publican +%{_datadir}/publican %files doc -%doc docs/* +%defattr(-,root,root,-) +%doc Users_Guide/publish/desktop/* %{_datadir}/applications/%{my_vendor}-%{name}.desktop %doc fdl.txt %changelog +* Mon Nov 2 2009 Jeff Fearn 1.1-0 +- Fix brew failure. BZ #532383 +- Fix distributed sets no packaging properly. + +* Mon Oct 26 2009 Jeff Fearn 1.0-0 +- Add base langauge summary & descriptions to translated spec file. BZ #515573 +- Fix translated package build failure. +- Change tabs to spaces in generated spec files. +- Fix Locale::Maketext::Gettext dep being missed on RHEL. +- Fix common paths on Windows +- Added docbook-style-xsl dep for version 1.75.1+ +- POD fix from Mikhail Gusarov +- Added processing file message to update_pot. BZ #518354 +- add EPUB stub +- Clean up Copyright in numerous files. +- Add security callback for exslt:document. +- Update XML::LibXML & XML::LibXSLT minimum versions to 1.67 +- Fix rounded corners in HTML. BZ #509768 +- Fix nested images breakin in PDF. BZ #491782 +- Remove border from HTML table for simplelist. BZ #502126 +- Fix remarks not being highlighted in PDF. BZ #509307 +- Resize shade.verbatim font size. BZ #497462 +- Change step page size limitation to para size limitation. BZ#492984 +- Add warning message for missing images. BZ #495821 +- Fix fuzzy images. BZ #479794 +- swap from paths from Publican to publican and obsolete beta packages. +- Fix large example PDF issue. BZ #531685 + +* Sat Jul 18 2009 Jeff Fearn 0.99-0.ALPHA1 +- Rebase to Perl rewrite. + +* Wed Mar 25 2009 Jeff Fearn 0.45 +- Add keep-together.within-column="always" to step. BZ #492021 +- Fix right to left fo ar-AR. BZ #486162 +- Patches and translations by Muayyad Alsadi +- Added missing doccomment and number to PDF highlight. BZ #491241 +- Fix files dir missing from RPMs. BZ #492034 + * Wed Mar 11 2009 Jeff Fearn 0.44 - Add 0-9 and '.' to DOCNAME regex. BZ #489626 @@ -508,10 +579,10 @@ rm -rf $RPM_BUILD_ROOT - Added build message when copying Product Specific common files - Move local entity to first position so it overrides common entity files - Added missing DocBook tags to xmlClean: -- accel blockquote classname code colophon envar example footnote -- guisubmenu interface keycap keycombo literal literallayout option -- parameter prompt property see seealso substeps systemitem wordasword -- glossary glossdiv glosssee glossseealso +- accel blockquote classname code colophon envar example footnote +- guisubmenu interface keycap keycombo literal literallayout option +- parameter prompt property see seealso substeps systemitem wordasword +- glossary glossdiv glosssee glossseealso - Moved executables in to bin directory. - Fixed layout of formal para titles in PDF - Removed trunctaion and elipses from title used for page headers @@ -597,23 +668,23 @@ rm -rf $RPM_BUILD_ROOT - add DocBook 1.72.0 xsl to package - modify makefiles to use new DocBook catalogs - xmlClean: -- Changed DTD from 4.3 to 4.5 -- Added bookname to node id's to help avoid id clashes in sets -- Fixed line wrap issue in PDF generation for zh-CN and zh-TW -- Enforced validation of xml on all build targets -- Add legalnotice tag -- Add address tag -- Add street tag -- Add city tag -- Add state tag -- Add postcode tag -- Add country tag -- Add phone tag -- Add fax tag -- Add pob tag -- Add preface tag -- Add bibliograpy related tags -- Add qandaset related tags +- Changed DTD from 4.3 to 4.5 +- Added bookname to node id's to help avoid id clashes in sets +- Fixed line wrap issue in PDF generation for zh-CN and zh-TW +- Enforced validation of xml on all build targets +- Add legalnotice tag +- Add address tag +- Add street tag +- Add city tag +- Add state tag +- Add postcode tag +- Add country tag +- Add phone tag +- Add fax tag +- Add pob tag +- Add preface tag +- Add bibliograpy related tags +- Add qandaset related tags - Removed Confidential image and restyle confidential html text - Added po2xlf script - Added xlf2po script @@ -638,9 +709,9 @@ rm -rf $RPM_BUILD_ROOT - fix image dimensions on content/common/en-US/images/redhat-logo.svg - remove leading space from rpm spec desription - Made abstract wrap at 72 characters and be left aligned. -- it's used for the spec description +- it's used for the spec description - Move legal notice link param from xhtml.xsl to main-html so nochunks -- target will have legal notice embedded in page +- target will have legal notice embedded in page * Tue Apr 24 2007 Jeff Fearn 0.9.1 - fix path to xsl @@ -730,3 +801,4 @@ rm -rf $RPM_BUILD_ROOT * Wed Feb 07 2007 Jeff Fearn 0.0 - Initial creation + Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/publican/F-11/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 12 Mar 2009 06:42:31 -0000 1.12 +++ sources 2 Nov 2009 19:44:54 -0000 1.13 @@ -1 +1 @@ -720fcfd8903fe370a69107350e2afa22 publican-0.44.tgz +2a27f069ef259da30ebda56fbabad36e Publican-1.1.tar.gz From deji at fedoraproject.org Mon Nov 2 19:50:49 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Mon, 2 Nov 2009 19:50:49 +0000 (UTC) Subject: rpms/texmaker/F-12 texmaker-tools.patch, 1.11, 1.12 texmaker.spec, 1.23, 1.24 Message-ID: <20091102195050.E474D11C0417@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/texmaker/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29665 Modified Files: texmaker-tools.patch texmaker.spec Log Message: * Mon Nov 02 2009 Deji Akingunola - 1.9.2-3 - Update with a more complete patch to use system hunspell (Caolan McNamara) texmaker-tools.patch: spellerdialog.h | 2 +- texmaker.cpp | 26 ++++---------------------- texmaker.pro | 34 ++-------------------------------- 3 files changed, 7 insertions(+), 55 deletions(-) Index: texmaker-tools.patch =================================================================== RCS file: /cvs/pkgs/rpms/texmaker/F-12/texmaker-tools.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- texmaker-tools.patch 17 Jul 2009 05:19:17 -0000 1.11 +++ texmaker-tools.patch 2 Nov 2009 19:50:49 -0000 1.12 @@ -40,3 +40,71 @@ #endif #if defined( Q_WS_MACX ) QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/"; +--- spellerdialog.h ++++ spellerdialog.h.new +@@ -13,7 +13,7 @@ + + #include "ui_spellerdialog.h" + #include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + #include + +--- texmaker.pro ++++ texmaker.pro.new +@@ -3,7 +3,8 @@ TEMPLATE = app + TARGET = texmaker + QT += network \ + xml +-CONFIG += qt warn_off release ++CONFIG += qt warn_off release link_pkgconfig ++PKGCONFIG = hunspell + ############################### + HEADERS += texmaker.h \ + texmakerapp.h \ +@@ -39,25 +40,6 @@ HEADERS += texmaker.h \ + manhattanstyle.h \ + stylehelper.h \ + styleanimator.h \ +- hunspell/affentry.hxx \ +- hunspell/affixmgr.hxx \ +- hunspell/atypes.hxx \ +- hunspell/baseaffix.hxx \ +- hunspell/csutil.hxx \ +- hunspell/dictmgr.hxx \ +- hunspell/hashmgr.hxx \ +- hunspell/htypes.hxx \ +- hunspell/hunspell.hxx \ +- hunspell/hunspell.h \ +- hunspell/langnum.hxx \ +- hunspell/license.hunspell \ +- hunspell/phonet.hxx \ +- hunspell/suggestmgr.hxx \ +- hunspell/license.myspell \ +- hunspell/filemgr.hxx \ +- hunspell/hunzip.hxx \ +- hunspell/replist.hxx \ +- hunspell/w_char.hxx \ + singleapp/qtlocalpeer.h \ + singleapp/qtlockedfile.h \ + singleapp/qtsingleapplication.h \ +@@ -96,18 +78,6 @@ SOURCES += main.cpp \ + manhattanstyle.cpp \ + stylehelper.cpp \ + styleanimator.cpp \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/dictmgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/phonet.cxx \ +- hunspell/suggestmgr.cxx \ +- hunspell/utf_info.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/replist.cxx \ +- hunspell/hunzip.cxx \ + singleapp/qtlocalpeer.cpp \ + singleapp/qtlockedfile.cpp \ + singleapp/qtsingleapplication.cpp \ Index: texmaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/texmaker/F-12/texmaker.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- texmaker.spec 27 Jul 2009 05:53:00 -0000 1.23 +++ texmaker.spec 2 Nov 2009 19:50:49 -0000 1.24 @@ -1,16 +1,16 @@ Summary: LaTeX editor Name: texmaker Version: 1.9.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2+ Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt4-devel +BuildRequires: qt4-devel, hunspell-devel BuildRequires: desktop-file-utils -Requires: tetex-latex, tetex-dvipost, tetex-xdvi, hunspell +Requires: tetex-latex, tetex-dvipost, tetex-xdvi # Patch to use default Fedora's document viewer and system's hunspell Patch0: %{name}-tools.patch @@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %exclude %{_datadir}/texmaker/*.aff %changelog +* Mon Nov 02 2009 Deji Akingunola - 1.9.2-3 +- Update with a more complete patch to use system hunspell (Caolan McNamara) + * Sun Jul 26 2009 Fedora Release Engineering - 1:1.9.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From deji at fedoraproject.org Mon Nov 2 19:54:21 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Mon, 2 Nov 2009 19:54:21 +0000 (UTC) Subject: rpms/texmaker/F-11 texmaker-tools.patch, 1.11, 1.12 texmaker.spec, 1.22, 1.23 Message-ID: <20091102195422.02FBC11C0086@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/texmaker/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30514 Modified Files: texmaker-tools.patch texmaker.spec Log Message: * Mon Nov 02 2009 Deji Akingunola - 1.9.2-3 - Update with a more complete patch to use system hunspell (Caolan McNamara) texmaker-tools.patch: spellerdialog.h | 2 +- texmaker.cpp | 26 ++++---------------------- texmaker.pro | 34 ++-------------------------------- 3 files changed, 7 insertions(+), 55 deletions(-) Index: texmaker-tools.patch =================================================================== RCS file: /cvs/pkgs/rpms/texmaker/F-11/texmaker-tools.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- texmaker-tools.patch 25 Sep 2009 20:00:09 -0000 1.11 +++ texmaker-tools.patch 2 Nov 2009 19:54:20 -0000 1.12 @@ -40,3 +40,71 @@ #endif #if defined( Q_WS_MACX ) QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/"; +--- spellerdialog.h ++++ spellerdialog.h.new +@@ -13,7 +13,7 @@ + + #include "ui_spellerdialog.h" + #include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + #include + +--- texmaker.pro ++++ texmaker.pro.new +@@ -3,7 +3,8 @@ TEMPLATE = app + TARGET = texmaker + QT += network \ + xml +-CONFIG += qt warn_off release ++CONFIG += qt warn_off release link_pkgconfig ++PKGCONFIG = hunspell + ############################### + HEADERS += texmaker.h \ + texmakerapp.h \ +@@ -39,25 +40,6 @@ HEADERS += texmaker.h \ + manhattanstyle.h \ + stylehelper.h \ + styleanimator.h \ +- hunspell/affentry.hxx \ +- hunspell/affixmgr.hxx \ +- hunspell/atypes.hxx \ +- hunspell/baseaffix.hxx \ +- hunspell/csutil.hxx \ +- hunspell/dictmgr.hxx \ +- hunspell/hashmgr.hxx \ +- hunspell/htypes.hxx \ +- hunspell/hunspell.hxx \ +- hunspell/hunspell.h \ +- hunspell/langnum.hxx \ +- hunspell/license.hunspell \ +- hunspell/phonet.hxx \ +- hunspell/suggestmgr.hxx \ +- hunspell/license.myspell \ +- hunspell/filemgr.hxx \ +- hunspell/hunzip.hxx \ +- hunspell/replist.hxx \ +- hunspell/w_char.hxx \ + singleapp/qtlocalpeer.h \ + singleapp/qtlockedfile.h \ + singleapp/qtsingleapplication.h \ +@@ -96,18 +78,6 @@ SOURCES += main.cpp \ + manhattanstyle.cpp \ + stylehelper.cpp \ + styleanimator.cpp \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/dictmgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/phonet.cxx \ +- hunspell/suggestmgr.cxx \ +- hunspell/utf_info.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/replist.cxx \ +- hunspell/hunzip.cxx \ + singleapp/qtlocalpeer.cpp \ + singleapp/qtlockedfile.cpp \ + singleapp/qtsingleapplication.cpp \ Index: texmaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/texmaker/F-11/texmaker.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- texmaker.spec 25 Sep 2009 20:00:09 -0000 1.22 +++ texmaker.spec 2 Nov 2009 19:54:20 -0000 1.23 @@ -1,16 +1,16 @@ Summary: LaTeX editor Name: texmaker Version: 1.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt4-devel +BuildRequires: qt4-devel, hunspell-devel BuildRequires: desktop-file-utils -Requires: tetex-latex, tetex-dvipost, tetex-xdvi, hunspell +Requires: tetex-latex, tetex-dvipost, tetex-xdvi # Patch to use default Fedora's document viewer and system's hunspell Patch0: %{name}-tools.patch @@ -85,6 +85,9 @@ rm -rf %buildroot %exclude %{_datadir}/texmaker/*.aff %changelog +* Mon Nov 02 2009 Deji Akingunola - 1.9.2-2 +- Update with a more complete patch to use system hunspell (Caolan McNamara) + * Sat Sep 25 2009 Deji Akingunola - 1.9.2-1 - Update to 1.9.2 From deji at fedoraproject.org Mon Nov 2 19:56:14 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Mon, 2 Nov 2009 19:56:14 +0000 (UTC) Subject: rpms/texmaker/F-10 texmaker-tools.patch, 1.11, 1.12 texmaker.spec, 1.21, 1.22 Message-ID: <20091102195615.09D0911C0086@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/texmaker/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31307 Modified Files: texmaker-tools.patch texmaker.spec Log Message: * Mon Nov 02 2009 Deji Akingunola - 1.9.2-2 - Update with a more complete patch to use system hunspell (Caolan McNamara) texmaker-tools.patch: spellerdialog.h | 2 +- texmaker.cpp | 26 ++++---------------------- texmaker.pro | 34 ++-------------------------------- 3 files changed, 7 insertions(+), 55 deletions(-) Index: texmaker-tools.patch =================================================================== RCS file: /cvs/pkgs/rpms/texmaker/F-10/texmaker-tools.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- texmaker-tools.patch 25 Sep 2009 20:02:10 -0000 1.11 +++ texmaker-tools.patch 2 Nov 2009 19:56:12 -0000 1.12 @@ -40,3 +40,71 @@ #endif #if defined( Q_WS_MACX ) QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/"; +--- spellerdialog.h ++++ spellerdialog.h.new +@@ -13,7 +13,7 @@ + + #include "ui_spellerdialog.h" + #include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + #include + +--- texmaker.pro ++++ texmaker.pro.new +@@ -3,7 +3,8 @@ TEMPLATE = app + TARGET = texmaker + QT += network \ + xml +-CONFIG += qt warn_off release ++CONFIG += qt warn_off release link_pkgconfig ++PKGCONFIG = hunspell + ############################### + HEADERS += texmaker.h \ + texmakerapp.h \ +@@ -39,25 +40,6 @@ HEADERS += texmaker.h \ + manhattanstyle.h \ + stylehelper.h \ + styleanimator.h \ +- hunspell/affentry.hxx \ +- hunspell/affixmgr.hxx \ +- hunspell/atypes.hxx \ +- hunspell/baseaffix.hxx \ +- hunspell/csutil.hxx \ +- hunspell/dictmgr.hxx \ +- hunspell/hashmgr.hxx \ +- hunspell/htypes.hxx \ +- hunspell/hunspell.hxx \ +- hunspell/hunspell.h \ +- hunspell/langnum.hxx \ +- hunspell/license.hunspell \ +- hunspell/phonet.hxx \ +- hunspell/suggestmgr.hxx \ +- hunspell/license.myspell \ +- hunspell/filemgr.hxx \ +- hunspell/hunzip.hxx \ +- hunspell/replist.hxx \ +- hunspell/w_char.hxx \ + singleapp/qtlocalpeer.h \ + singleapp/qtlockedfile.h \ + singleapp/qtsingleapplication.h \ +@@ -96,18 +78,6 @@ SOURCES += main.cpp \ + manhattanstyle.cpp \ + stylehelper.cpp \ + styleanimator.cpp \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/dictmgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/phonet.cxx \ +- hunspell/suggestmgr.cxx \ +- hunspell/utf_info.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/replist.cxx \ +- hunspell/hunzip.cxx \ + singleapp/qtlocalpeer.cpp \ + singleapp/qtlockedfile.cpp \ + singleapp/qtsingleapplication.cpp \ Index: texmaker.spec =================================================================== RCS file: /cvs/pkgs/rpms/texmaker/F-10/texmaker.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- texmaker.spec 25 Sep 2009 20:02:10 -0000 1.21 +++ texmaker.spec 2 Nov 2009 19:56:12 -0000 1.22 @@ -1,16 +1,16 @@ Summary: LaTeX editor Name: texmaker Version: 1.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ Group: Applications/Publishing URL: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt4-devel +BuildRequires: qt4-devel, hunspell-devel BuildRequires: desktop-file-utils -Requires: tetex-latex, tetex-dvipost, tetex-xdvi, hunspell +Requires: tetex-latex, tetex-dvipost, tetex-xdvi # Patch to use default Fedora's document viewer and system's hunspell Patch0: %{name}-tools.patch @@ -85,6 +85,9 @@ rm -rf %buildroot %exclude %{_datadir}/texmaker/*.aff %changelog +* Mon Nov 02 2009 Deji Akingunola - 1.9.2-2 +- Update with a more complete patch to use system hunspell (Caolan McNamara) + * Fri Sep 25 2009 Deji Akingunola - 1.9.2-1 - Update to 1.9.2 From jorton at fedoraproject.org Mon Nov 2 19:57:42 2009 From: jorton at fedoraproject.org (jorton) Date: Mon, 2 Nov 2009 19:57:42 +0000 (UTC) Subject: rpms/expat/F-10 expat-1.95.8-CVE-2009-3720.patch, NONE, 1.1 expat.spec, 1.31, 1.32 Message-ID: <20091102195742.1CD5311C0086@cvs1.fedora.phx.redhat.com> Author: jorton Update of /cvs/extras/rpms/expat/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32373 Modified Files: expat.spec Added Files: expat-1.95.8-CVE-2009-3720.patch Log Message: * Fri Oct 30 2009 Joe Orton - 2.0.1-5.1 - add security fix for CVE-2009-3720 expat-1.95.8-CVE-2009-3720.patch: xmltok_impl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE expat-1.95.8-CVE-2009-3720.patch --- --- expat-1.95.8/lib/xmltok_impl.c.cve3720 +++ expat-1.95.8/lib/xmltok_impl.c @@ -1741,7 +1741,7 @@ PREFIX(updatePosition)(const ENCODING *e const char *end, POSITION *pos) { - while (ptr != end) { + while (ptr < end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: \ Index: expat.spec =================================================================== RCS file: /cvs/extras/rpms/expat/F-10/expat.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- expat.spec 19 Feb 2008 07:04:42 -0000 1.31 +++ expat.spec 2 Nov 2009 19:57:42 -0000 1.32 @@ -1,9 +1,10 @@ Summary: An XML parser library Name: expat Version: 2.0.1 -Release: 5 +Release: 5%{?dist}.1 Group: System Environment/Libraries Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz +Patch1: expat-1.95.8-CVE-2009-3720.patch URL: http://www.libexpat.org/ License: MIT BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +29,7 @@ to develop XML applications with expat. %prep %setup -q +%patch1 -p1 -b .cve3720 %build rm -rf autom4te*.cache @@ -74,6 +76,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_includedir}/*.h %changelog +* Fri Oct 30 2009 Joe Orton - 2.0.1-5.1 +- add security fix for CVE-2009-3720 + * Tue Feb 19 2008 Fedora Release Engineering - 2.0.1-5 - Autorebuild for GCC 4.3 From deji at fedoraproject.org Mon Nov 2 19:57:48 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Mon, 2 Nov 2009 19:57:48 +0000 (UTC) Subject: rpms/nautilus-actions/devel nautilus-actions.spec, 1.27, 1.28 sources, 1.11, 1.12 Message-ID: <20091102195748.91F3D11C0086@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/nautilus-actions/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32337 Modified Files: nautilus-actions.spec sources Log Message: * Mon Nov 02 2009 Deji Akingunola - 1.12.2-1 - Update to 1.12.2 Index: nautilus-actions.spec =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/nautilus-actions.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- nautilus-actions.spec 14 Aug 2009 01:30:35 -0000 1.27 +++ nautilus-actions.spec 2 Nov 2009 19:57:47 -0000 1.28 @@ -1,11 +1,11 @@ Summary: Nautilus extension for customizing the context menu Name: nautilus-actions -Version: 1.12.0 +Version: 1.12.2 Release: 1%{?dist} Group: User Interface/Desktops License: GPLv2+ URL: http://www.grumz.net/node/8 -Source0: http://download.gnome.org/sources/%{name}/1.12/%{name}-%{version}.tar.gz +Source0: http://download.gnome.org/sources/%{name}/1.12/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel, libglade2-devel, nautilus-devel BuildRequires: libuuid-devel, unique-devel, gettext, perl(XML::Parser) @@ -69,6 +69,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %{_datadir}/applications/fedora-nact.desktop %changelog +* Mon Nov 02 2009 Deji Akingunola - 1.12.2-1 +- Update to 1.12.2 + * Wed Aug 12 2009 Deji Akingunola - 1.12.0-1 - Update to 1.12.0 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/nautilus-actions/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- sources 13 Aug 2009 04:52:55 -0000 1.11 +++ sources 2 Nov 2009 19:57:47 -0000 1.12 @@ -1 +1 @@ -901f0c75419d9b7ca2a18ac4ed695323 nautilus-actions-1.12.0.tar.gz +aaec0ad0feae67c8e876edc105558b4e nautilus-actions-1.12.2.tar.bz2 From rlandmann at fedoraproject.org Mon Nov 2 20:13:46 2009 From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=) Date: Mon, 2 Nov 2009 20:13:46 +0000 (UTC) Subject: rpms/publican-fedora/devel import.log,1.4,1.5 Message-ID: <20091102201346.A29F311C0086@cvs1.fedora.phx.redhat.com> Author: rlandmann Update of /cvs/pkgs/rpms/publican-fedora/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4246/devel Modified Files: import.log Log Message: * Fri Oct 30 2009 Jeff Fearn 1.0 - port to publican 1.0. Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/devel/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- import.log 31 Oct 2009 23:49:47 -0000 1.4 +++ import.log 2 Nov 2009 20:13:46 -0000 1.5 @@ -2,3 +2,4 @@ publican-fedora-0_19-1_fc11:HEAD:publica publican-fedora-0_19-2_fc11:HEAD:publican-fedora-0.19-2.fc11.src.rpm:1254883023 publican-fedora-0_19-3_fc11:HEAD:publican-fedora-0.19-3.fc11.src.rpm:1254885351 publican-fedora-1_0-0_fc11:HEAD:publican-fedora-1.0-0.fc11.src.rpm:1257032853 +publican-fedora-1_0-0_fc11:HEAD:publican-fedora-1.0-0.fc11.src.rpm:1257192691 From jcollie at fedoraproject.org Mon Nov 2 20:18:21 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Mon, 2 Nov 2009 20:18:21 +0000 (UTC) Subject: rpms/asterisk-sounds-core/F-12 asterisk-sounds-core.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <20091102201821.CBC0C11C02BA@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk-sounds-core/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5826 Modified Files: asterisk-sounds-core.spec sources Log Message: * Mon Nov 2 2009 Jeffrey C. Ollie - 1.4.16-2 - Remove fr/1.g729 as it's triggering an error in magic_file(3) (BZ#532489) Index: asterisk-sounds-core.spec =================================================================== RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/F-12/asterisk-sounds-core.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- asterisk-sounds-core.spec 24 Jul 2009 17:24:37 -0000 1.4 +++ asterisk-sounds-core.spec 2 Nov 2009 20:18:18 -0000 1.5 @@ -1,7 +1,7 @@ %define sounds_dir %{_datadir}/asterisk/sounds Name: asterisk-sounds-core -Version: 1.4.15 +Version: 1.4.16 Release: 2%{?dist} Summary: Core sounds for Asterisk @@ -10,35 +10,35 @@ Group: Applications/Internet License: CC-BY-SA URL: http://www.asterisk.org/ -Source0: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{version}.tar.gz -Source1: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-%{version}.tar.gz -Source2: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-%{version}.tar.gz -Source3: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-%{version}.tar.gz -Source4: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-%{version}.tar.gz -Source5: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-%{version}.tar.gz -Source6: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{version}.tar.gz -Source7: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-%{version}.tar.gz -Source8: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-%{version}.tar.gz - -Source10: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-%{version}.tar.gz -Source11: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-%{version}.tar.gz -Source12: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-%{version}.tar.gz -Source13: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-%{version}.tar.gz -Source14: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-%{version}.tar.gz -Source15: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-%{version}.tar.gz -Source16: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{version}.tar.gz -Source17: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-%{version}.tar.gz -Source18: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-%{version}.tar.gz - -Source20: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-%{version}.tar.gz -Source21: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-%{version}.tar.gz -Source22: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-%{version}.tar.gz -Source23: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-%{version}.tar.gz -Source24: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-%{version}.tar.gz -Source25: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-%{version}.tar.gz -Source26: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{version}.tar.gz -Source27: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-%{version}.tar.gz -Source28: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-%{version}.tar.gz +Source0: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{version}.tar.gz +Source1: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-%{version}.tar.gz +Source2: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-%{version}.tar.gz +Source3: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-%{version}.tar.gz +Source4: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-%{version}.tar.gz +Source5: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-%{version}.tar.gz +Source6: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-%{version}.tar.gz +Source7: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-%{version}.tar.gz +Source8: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-%{version}.tar.gz + +Source10: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-%{version}.tar.gz +Source11: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-%{version}.tar.gz +Source12: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-%{version}.tar.gz +Source13: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-%{version}.tar.gz +Source14: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-%{version}.tar.gz +Source15: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-%{version}.tar.gz +Source16: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-%{version}.tar.gz +Source17: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-%{version}.tar.gz +Source18: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-%{version}.tar.gz + +Source20: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-%{version}.tar.gz +Source21: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-%{version}.tar.gz +Source22: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-%{version}.tar.gz +Source23: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-%{version}.tar.gz +Source24: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-%{version}.tar.gz +Source25: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-%{version}.tar.gz +Source26: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-%{version}.tar.gz +Source27: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-%{version}.tar.gz +Source28: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -364,7 +364,7 @@ mkdir fr for file in %{S:20} %{S:21} %{S:22} %{S:23} %{S:24} %{S:25} %{S:26} %{S:27} %{S:28} do - tar tf $file | grep -E '.(alaw|g722|g729|gsm|siren7|siren14|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/fr/!' > `basename $file .tar.gz`.list + tar tf $file | grep -v '1.g729' | grep -E '.(alaw|g722|g729|gsm|siren7|siren14|sln16|ulaw|wav)$' | sed -e 's!^!%{sounds_dir}/fr/!' > `basename $file .tar.gz`.list tar --extract --directory ./fr/ --file $file done @@ -535,6 +535,12 @@ rm -rf %{buildroot} %doc asterisk-core-sounds-fr-wav-%{version}.list %changelog +* Mon Nov 2 2009 Jeffrey C. Ollie - 1.4.16-2 +- Remove fr/1.g729 as it's triggering an error in magic_file(3) (BZ#532489) + +* Mon Oct 5 2009 Jeffrey C. Ollie - 1.4.16-1 +- Update to 1.4.16. + * Fri Jul 24 2009 Fedora Release Engineering - 1.4.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/F-12/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 8 Apr 2009 16:34:44 -0000 1.3 +++ sources 2 Nov 2009 20:18:18 -0000 1.4 @@ -1,27 +1,27 @@ -e9531e871d5b24e7b83d3ef946390d40 asterisk-core-sounds-en-alaw-1.4.15.tar.gz -54532b85f56cc91de6e7a85b50cf9800 asterisk-core-sounds-en-g722-1.4.15.tar.gz -b489cb2cac74734b22d834406132048e asterisk-core-sounds-en-g729-1.4.15.tar.gz -8c6f13636ada5b3371ab57121f7afd8e asterisk-core-sounds-en-gsm-1.4.15.tar.gz -4e37aebb361f58033fd0812b75aa5a23 asterisk-core-sounds-en-siren14-1.4.15.tar.gz -a3d69737799888c6fa5c938d4190d532 asterisk-core-sounds-en-siren7-1.4.15.tar.gz -49fd91087da17417ddfd23a2d450741d asterisk-core-sounds-en-sln16-1.4.15.tar.gz -fd97a409e12c9e19d1af3fc381a9f8ad asterisk-core-sounds-en-ulaw-1.4.15.tar.gz -eaf43394b94681c31bdf56f1df653790 asterisk-core-sounds-en-wav-1.4.15.tar.gz -b2d3aa168f9661c6e39d288d06789fc7 asterisk-core-sounds-es-alaw-1.4.15.tar.gz -d1c7612659bd2280b3e4402167a6cc8c asterisk-core-sounds-es-g722-1.4.15.tar.gz -aa9828d6fbff14fc02f07a7b2b918b71 asterisk-core-sounds-es-g729-1.4.15.tar.gz -c45fff747cadad68a7c20f64b0ae3075 asterisk-core-sounds-es-gsm-1.4.15.tar.gz -81fe0abfd4f7248a4bf5ba8cbec98aa7 asterisk-core-sounds-es-siren14-1.4.15.tar.gz -6c94ab98ecd60c9acc273ada07382c40 asterisk-core-sounds-es-siren7-1.4.15.tar.gz -d9458dd770fde192ea433fce0b271501 asterisk-core-sounds-es-sln16-1.4.15.tar.gz -fd1f5eefbb03f07a27391dd332b2fb78 asterisk-core-sounds-es-ulaw-1.4.15.tar.gz -89dadc24f420c83614ed6286112b765a asterisk-core-sounds-es-wav-1.4.15.tar.gz -4752b5dbd543188c050d8baf77a34e9e asterisk-core-sounds-fr-alaw-1.4.15.tar.gz -7d6578b73b68b41fa7ac53ffae927ae8 asterisk-core-sounds-fr-g722-1.4.15.tar.gz -fbfff0b1d52e37eefb2bcf8554623e1a asterisk-core-sounds-fr-g729-1.4.15.tar.gz -1208be19c83123e6240982cfe97ff91c asterisk-core-sounds-fr-gsm-1.4.15.tar.gz -ead24df2276e3ca9ab50a8babd850fc1 asterisk-core-sounds-fr-siren14-1.4.15.tar.gz -a29bb61f9b5df1659f8b944ee50499bc asterisk-core-sounds-fr-siren7-1.4.15.tar.gz -a2b677b23edcb990b43b1179518f87c7 asterisk-core-sounds-fr-sln16-1.4.15.tar.gz -491d3bdf569a9cb9c2beda7b10c0c869 asterisk-core-sounds-fr-ulaw-1.4.15.tar.gz -0f762ebf09719e375408565b60a3f432 asterisk-core-sounds-fr-wav-1.4.15.tar.gz +298194870d8566b19e6b14e041555636 asterisk-core-sounds-en-alaw-1.4.16.tar.gz +1642f87ca7b3a915228031707bf9e100 asterisk-core-sounds-en-g722-1.4.16.tar.gz +0e61c7fc83ef024e923c184ca89f20f0 asterisk-core-sounds-en-g729-1.4.16.tar.gz +87145c1775141613d1471864dae12bdd asterisk-core-sounds-en-gsm-1.4.16.tar.gz +62b3180445e808f6f240c7a46afdb33d asterisk-core-sounds-en-siren14-1.4.16.tar.gz +3e0e8373e03a867ef1baeb9ee6504fd0 asterisk-core-sounds-en-siren7-1.4.16.tar.gz +b86dc7d00b7c04604f5e6fd9ee3f3aad asterisk-core-sounds-en-sln16-1.4.16.tar.gz +29725f0e2c32c9347f6e44a61830af8e asterisk-core-sounds-en-ulaw-1.4.16.tar.gz +f5eb575eab0cab465546089c3cea95d3 asterisk-core-sounds-en-wav-1.4.16.tar.gz +6380e4c13577c3bf3c0f83cfda8d4bec asterisk-core-sounds-es-alaw-1.4.16.tar.gz +a42f6af87b6de2533b99f51aa1eb615b asterisk-core-sounds-es-g722-1.4.16.tar.gz +48face93838576602ef9d6c055768983 asterisk-core-sounds-es-g729-1.4.16.tar.gz +499e4d241420576289a5a24408d4392b asterisk-core-sounds-es-gsm-1.4.16.tar.gz +267649f01309e4df914a6724f025229d asterisk-core-sounds-es-siren14-1.4.16.tar.gz +9cb8f9d3e8b1245f75c05b4c7470bc5f asterisk-core-sounds-es-siren7-1.4.16.tar.gz +26adba5f8304864f2059e4ae7602b6be asterisk-core-sounds-es-sln16-1.4.16.tar.gz +cfc35eec0b2a25b03d409452852aa7fd asterisk-core-sounds-es-ulaw-1.4.16.tar.gz +9567f6b61c4abb0d07ff352706722dc0 asterisk-core-sounds-es-wav-1.4.16.tar.gz +aa3553dcc507fdae75cf8d7ec086c8ca asterisk-core-sounds-fr-alaw-1.4.16.tar.gz +7bf244fc16b76d82eac8cbe9b29e91e6 asterisk-core-sounds-fr-g722-1.4.16.tar.gz +ef17dd261b89204f15f5328fa9ed0108 asterisk-core-sounds-fr-g729-1.4.16.tar.gz +a3e1b41d6fcf21719872cae821bce948 asterisk-core-sounds-fr-gsm-1.4.16.tar.gz +926a173c365b84847852567b67797a72 asterisk-core-sounds-fr-siren14-1.4.16.tar.gz +2f1d6ff46cdf53a60e7298f421fffb20 asterisk-core-sounds-fr-siren7-1.4.16.tar.gz +03d363fb8f08a679a06bcb4b7fca103c asterisk-core-sounds-fr-sln16-1.4.16.tar.gz +2c7cad768b8d662505cefd70390cf3f0 asterisk-core-sounds-fr-ulaw-1.4.16.tar.gz +1693dbf9c976653223e44d48931963d2 asterisk-core-sounds-fr-wav-1.4.16.tar.gz From jcollie at fedoraproject.org Mon Nov 2 20:19:23 2009 From: jcollie at fedoraproject.org (Jeffrey C. Ollie) Date: Mon, 2 Nov 2009 20:19:23 +0000 (UTC) Subject: rpms/asterisk-sounds-core/F-12 .cvsignore,1.3,1.4 Message-ID: <20091102201923.31B0111C0086@cvs1.fedora.phx.redhat.com> Author: jcollie Update of /cvs/pkgs/rpms/asterisk-sounds-core/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6260 Modified Files: .cvsignore Log Message: Don't forget to update .cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/F-12/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 8 Apr 2009 16:34:44 -0000 1.3 +++ .cvsignore 2 Nov 2009 20:19:20 -0000 1.4 @@ -1,27 +1,27 @@ -asterisk-core-sounds-en-alaw-1.4.15.tar.gz -asterisk-core-sounds-en-g722-1.4.15.tar.gz -asterisk-core-sounds-en-g729-1.4.15.tar.gz -asterisk-core-sounds-en-gsm-1.4.15.tar.gz -asterisk-core-sounds-en-siren14-1.4.15.tar.gz -asterisk-core-sounds-en-siren7-1.4.15.tar.gz -asterisk-core-sounds-en-sln16-1.4.15.tar.gz -asterisk-core-sounds-en-ulaw-1.4.15.tar.gz -asterisk-core-sounds-en-wav-1.4.15.tar.gz -asterisk-core-sounds-es-alaw-1.4.15.tar.gz -asterisk-core-sounds-es-g722-1.4.15.tar.gz -asterisk-core-sounds-es-g729-1.4.15.tar.gz -asterisk-core-sounds-es-gsm-1.4.15.tar.gz -asterisk-core-sounds-es-siren14-1.4.15.tar.gz -asterisk-core-sounds-es-siren7-1.4.15.tar.gz -asterisk-core-sounds-es-sln16-1.4.15.tar.gz -asterisk-core-sounds-es-ulaw-1.4.15.tar.gz -asterisk-core-sounds-es-wav-1.4.15.tar.gz -asterisk-core-sounds-fr-alaw-1.4.15.tar.gz -asterisk-core-sounds-fr-g722-1.4.15.tar.gz -asterisk-core-sounds-fr-g729-1.4.15.tar.gz -asterisk-core-sounds-fr-gsm-1.4.15.tar.gz -asterisk-core-sounds-fr-siren14-1.4.15.tar.gz -asterisk-core-sounds-fr-siren7-1.4.15.tar.gz -asterisk-core-sounds-fr-sln16-1.4.15.tar.gz -asterisk-core-sounds-fr-ulaw-1.4.15.tar.gz -asterisk-core-sounds-fr-wav-1.4.15.tar.gz +asterisk-core-sounds-en-alaw-1.4.16.tar.gz +asterisk-core-sounds-en-g722-1.4.16.tar.gz +asterisk-core-sounds-en-g729-1.4.16.tar.gz +asterisk-core-sounds-en-gsm-1.4.16.tar.gz +asterisk-core-sounds-en-siren14-1.4.16.tar.gz +asterisk-core-sounds-en-siren7-1.4.16.tar.gz +asterisk-core-sounds-en-sln16-1.4.16.tar.gz +asterisk-core-sounds-en-ulaw-1.4.16.tar.gz +asterisk-core-sounds-en-wav-1.4.16.tar.gz +asterisk-core-sounds-es-alaw-1.4.16.tar.gz +asterisk-core-sounds-es-g722-1.4.16.tar.gz +asterisk-core-sounds-es-g729-1.4.16.tar.gz +asterisk-core-sounds-es-gsm-1.4.16.tar.gz +asterisk-core-sounds-es-siren14-1.4.16.tar.gz +asterisk-core-sounds-es-siren7-1.4.16.tar.gz +asterisk-core-sounds-es-sln16-1.4.16.tar.gz +asterisk-core-sounds-es-ulaw-1.4.16.tar.gz +asterisk-core-sounds-es-wav-1.4.16.tar.gz +asterisk-core-sounds-fr-alaw-1.4.16.tar.gz +asterisk-core-sounds-fr-g722-1.4.16.tar.gz +asterisk-core-sounds-fr-g729-1.4.16.tar.gz +asterisk-core-sounds-fr-gsm-1.4.16.tar.gz +asterisk-core-sounds-fr-siren14-1.4.16.tar.gz +asterisk-core-sounds-fr-siren7-1.4.16.tar.gz +asterisk-core-sounds-fr-sln16-1.4.16.tar.gz +asterisk-core-sounds-fr-ulaw-1.4.16.tar.gz +asterisk-core-sounds-fr-wav-1.4.16.tar.gz From uwog at fedoraproject.org Mon Nov 2 20:36:44 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 2 Nov 2009 20:36:44 +0000 (UTC) Subject: rpms/pyabiword/F-10 pyabiword.spec,1.3,1.4 Message-ID: <20091102203644.675AC11C0086@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12011 Modified Files: pyabiword.spec Log Message: Add libgsf-devel BR Index: pyabiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/F-10/pyabiword.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- pyabiword.spec 2 Nov 2009 18:44:50 -0000 1.3 +++ pyabiword.spec 2 Nov 2009 20:36:44 -0000 1.4 @@ -5,7 +5,7 @@ Summary: Python bindings for libabiword Name: pyabiword Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Source0: pyabiword-%{version}.tar.gz URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz License: GPL+ @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version BuildRequires: libabiword-devel >= %{abiword_api_version} BuildRequires: pygtk2-devel BuildRequires: gtk2-devel +BuildRequires: libgsf-devel BuildRequires: enchant-devel BuildRequires: fribidi-devel BuildRequires: wv-devel @@ -62,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pygtk/2.0/defs/pyabiword.defs %changelog +* Mon Nov 02 2009 Marc Maurer - 0.8.0-2 +- Add libgsf-devel BR + * Mon Nov 02 2009 Marc Maurer - 0.8.0-1 - New upstream release From rishi at fedoraproject.org Mon Nov 2 20:40:53 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Mon, 2 Nov 2009 20:40:53 +0000 (UTC) Subject: rpms/anjuta/devel anjuta-2.28.1.0-libxml.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 anjuta.spec, 1.84, 1.85 sources, 1.23, 1.24 anjuta-2.27.3.0-class-gen-templates.patch, 1.1, NONE anjuta-2.27.3.0-docdir.patch, 1.1, NONE anjuta-2.27.92.0-libxml.patch, 1.1, NONE Message-ID: <20091102204053.A517711C0419@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/anjuta/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13268 Modified Files: .cvsignore anjuta.spec sources Added Files: anjuta-2.28.1.0-libxml.patch Removed Files: anjuta-2.27.3.0-class-gen-templates.patch anjuta-2.27.3.0-docdir.patch anjuta-2.27.92.0-libxml.patch Log Message: * Thu Oct 29 2009 Debarshi Ray - 1:2.28.1.0-1 - Version bump to 2.28.1.0. * Debug manager plugin: + Report error when location is < 0 for markers. (GNOME Bugzilla #593954) * File loader plugin: + Improved drag-and-drop behaviour. (GNOME Bugzilla #567363) * GtkSourceView editor plugin: + Improved drag-and-drop behaviour. (GNOME Bugzilla #355151) * Subversion plugin: + Removed duplicate IDs from the Glade file. (GNOME Bugzilla #596001) * Symbol-db plugin: + Fixed crash when loading a project. (GNOME Bugzilla #597113) * Terminal plugin: + Prevented it from crashing and freezing X. (GNOME Bugzilla #597318) * http://download.gnome.org/sources/anjuta/2.28/anjuta-2.28.1.0.news - Added 'BuildRequires: GConf2-devel ORBit2-devel' and removed 'BuildRequires: binutils-devel graphviz-devel libgnomeui-devel pcre-devel'. anjuta-2.28.1.0-libxml.patch: document-manager/Makefile.in | 4 +++- gbf-am/Makefile.in | 1 + gbf-mkfile/Makefile.in | 4 +++- language-manager/Makefile.in | 7 ++++--- macro/Makefile.in | 6 ++++-- 5 files changed, 15 insertions(+), 7 deletions(-) --- NEW FILE anjuta-2.28.1.0-libxml.patch --- diff -urNp anjuta-2.28.1.0.orig/plugins/document-manager/Makefile.in anjuta-2.28.1.0/plugins/document-manager/Makefile.in --- anjuta-2.28.1.0.orig/plugins/document-manager/Makefile.in 2009-10-19 19:17:19.000000000 +0300 +++ anjuta-2.28.1.0/plugins/document-manager/Makefile.in 2009-10-29 16:58:08.900396638 +0200 @@ -349,13 +349,15 @@ AM_CPPFLAGS = \ $(GDL_CFLAGS) \ $(GIO_CFLAGS) \ $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) \ -DG_LOG_DOMAIN=\"libanjuta-document-manager\" libanjuta_document_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS) libanjuta_document_manager_la_LIBADD = \ $(GDL_LIBS) \ $(GIO_LIBS) \ - $(LIBANJUTA_LIBS) + $(LIBANJUTA_LIBS) \ + $(LIBXML_LIBS) libanjuta_document_manager_la_SOURCES = \ plugin.c \ diff -urNp anjuta-2.28.1.0.orig/plugins/gbf-am/Makefile.in anjuta-2.28.1.0/plugins/gbf-am/Makefile.in --- anjuta-2.28.1.0.orig/plugins/gbf-am/Makefile.in 2009-10-19 19:17:20.000000000 +0300 +++ anjuta-2.28.1.0/plugins/gbf-am/Makefile.in 2009-10-29 16:55:44.076396823 +0200 @@ -359,6 +359,7 @@ AM_CPPFLAGS = \ $(DEPRECATED_FLAGS) \ $(GIO_CFLAGS) \ $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) \ -DSCRIPTS_DIR=\"$(scriptsdir)\" plugin_LTLIBRARIES = \ diff -urNp anjuta-2.28.1.0.orig/plugins/gbf-mkfile/Makefile.in anjuta-2.28.1.0/plugins/gbf-mkfile/Makefile.in --- anjuta-2.28.1.0.orig/plugins/gbf-mkfile/Makefile.in 2009-10-19 19:17:20.000000000 +0300 +++ anjuta-2.28.1.0/plugins/gbf-mkfile/Makefile.in 2009-10-29 17:48:21.042781607 +0200 @@ -348,6 +348,7 @@ AM_CPPFLAGS = \ $(DEPRECATED_FLAGS) \ $(GIO_CFLAGS) \ $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) \ -DSCRIPTS_DIR=\"$(scriptsdir)\" plugin_LTLIBRARIES = \ @@ -366,7 +367,8 @@ libgbf_mkfile_la_SOURCES = \ libgbf_mkfile_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS) libgbf_mkfile_la_LIBADD = \ $(GIO_LIBS) \ - $(LIBANJUTA_LIBS) + $(LIBANJUTA_LIBS) \ + $(LIBXML_LIBS) EXTRA_DIST = \ $(plugin_in_files) \ diff -urNp anjuta-2.28.1.0.orig/plugins/language-manager/Makefile.in anjuta-2.28.1.0/plugins/language-manager/Makefile.in --- anjuta-2.28.1.0.orig/plugins/language-manager/Makefile.in 2009-10-19 19:17:21.000000000 +0300 +++ anjuta-2.28.1.0/plugins/language-manager/Makefile.in 2009-10-29 16:59:30.104397009 +0200 @@ -332,8 +332,8 @@ language_manager_plugin_DATA = $(plugin_ # Include paths AM_CPPFLAGS = \ - $(LIBANJUTA_CFLAGS) - + $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) # Where to install the plugin plugindir = $(anjuta_plugin_dir) @@ -346,7 +346,8 @@ liblanguage_manager_la_SOURCES = plugin. # Plugin dependencies liblanguage_manager_la_LIBADD = \ - $(LIBANJUTA_LIBS) + $(LIBANJUTA_LIBS) \ + $(LIBXML_LIBS) liblanguage_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS) EXTRA_DIST = \ diff -urNp anjuta-2.28.1.0.orig/plugins/macro/Makefile.in anjuta-2.28.1.0/plugins/macro/Makefile.in --- anjuta-2.28.1.0.orig/plugins/macro/Makefile.in 2009-10-19 19:17:21.000000000 +0300 +++ anjuta-2.28.1.0/plugins/macro/Makefile.in 2009-10-29 16:59:00.309396944 +0200 @@ -328,14 +328,16 @@ macro_plugin_DATA = $(plugin_in_files:.p AM_CPPFLAGS = \ $(WARN_CFLAGS) \ $(DEPRECATED_FLAGS) \ - $(LIBANJUTA_CFLAGS) + $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) plugindir = $(anjuta_plugin_dir) plugin_LTLIBRARIES = libanjuta-macro.la libanjuta_macro_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS) libanjuta_macro_la_LIBADD = \ $(GIO_LIBS) \ - $(LIBANJUTA_LIBS) + $(LIBANJUTA_LIBS) \ + $(LIBXML_LIBS) libanjuta_macro_la_SOURCES = \ plugin.c\ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- .cvsignore 12 Sep 2009 14:32:59 -0000 1.23 +++ .cvsignore 2 Nov 2009 20:40:51 -0000 1.24 @@ -1 +1 @@ -anjuta-2.27.92.0.tar.bz2 +anjuta-2.28.1.0.tar.bz2 Index: anjuta.spec =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -p -r1.84 -r1.85 --- anjuta.spec 12 Sep 2009 14:32:59 -0000 1.84 +++ anjuta.spec 2 Nov 2009 20:40:52 -0000 1.85 @@ -1,16 +1,16 @@ Summary: A GNOME development IDE for C/C++ Name: anjuta Epoch: 1 -Version: 2.27.92.0 +Version: 2.28.1.0 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.anjuta.org/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.27/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/anjuta/2.28/%{name}-%{version}.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -# Lots of places where libxml cflags/libs are not being used (but are needed) -Patch0: anjuta-2.27.92.0-libxml.patch +# https://bugzilla.gnome.org/600407 +Patch0: %{name}-%{version}-libxml.patch Obsoletes: gnome-build <= 2.24.1-1.fc10 Provides: perl(GBF::Make) = %{version}-%{release} @@ -29,22 +29,20 @@ Requires(post): /sbin/ldconfig Requires(preun): GConf2 Requires(postun): /sbin/ldconfig +BuildRequires: GConf2-devel +BuildRequires: ORBit2-devel BuildRequires: autogen -BuildRequires: binutils-devel BuildRequires: desktop-file-utils BuildRequires: devhelp-devel >= 0.22 -BuildRequires: libuuid-devel BuildRequires: gettext BuildRequires: glade3-libgladeui-devel >= 3.6.0 BuildRequires: gnome-doc-utils BuildRequires: gtksourceview2-devel >= 2.4.0 -BuildRequires: libgda-devel >= 3.99.7 -BuildRequires: graphviz-devel BuildRequires: intltool +BuildRequires: libgda-devel >= 4.0.0 BuildRequires: libgdl-devel >= 2.26.0 -BuildRequires: libgnomeui-devel +BuildRequires: libuuid-devel BuildRequires: neon-devel -BuildRequires: pcre-devel BuildRequires: perl(Locale::gettext) BuildRequires: perl(XML::Parser) BuildRequires: scrollkeeper @@ -60,7 +58,8 @@ an on-board interactive debugger, powerf intellisense autocompletions, symbol navigation, version controls, integrated GUI designing and other tools. -The documentation for this package is in %{name}-doc. +The documentation for this package is in %{name}-doc. Some extra +plugins are in %{name}-extras. %package devel Summary: Development files for %{name} @@ -76,10 +75,6 @@ This package contains development files Summary: Documentation for Anjuta DevStudio Group: Documentation -# Will be dropped in Fedora 10. -Provides: %{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-docs < 1:2.2.3 - Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -91,8 +86,7 @@ Documentation for Anjuta DevStudio provi %prep %setup -q - -%patch0 -p1 -b .libxml +%patch0 -p1 # Filter unwanted Provides. cat << \EOF > %{name}-prov @@ -140,10 +134,9 @@ sed --expression 's|-R/usr/lib64||' %{_l %build export PKG_CONFIG_PATH="./PKGCONFIG" %configure --disable-schemas-install --disable-static \ - --enable-gtk-doc --enable-scrollkeeper \ - --enable-plugin-devhelp --enable-graphviz --enable-plugin-glade \ - --enable-plugin-scintilla --enable-plugin-sourceview \ - --enable-plugin-subversion --enable-plugin-valgrind \ + --enable-gtk-doc --enable-plugin-devhelp --enable-plugin-glade \ + --enable-plugin-sourceview --enable-plugin-subversion \ + --enable-scrollkeeper \ --docdir=%{_docdir}/%{name}-%{version} \ --with-svn-lib=%{_libdir} @@ -196,8 +189,6 @@ rm -rf $RPM_BUILD_ROOT if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : - gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null || : fi @@ -206,8 +197,6 @@ fi export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : -gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || : if [ -x %{_bindir}/update-desktop-database ]; then @@ -229,8 +218,6 @@ fi if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : - gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || : fi @@ -261,11 +248,9 @@ scrollkeeper-update -q || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS -%doc ChangeLog %doc COPYING %doc MAINTAINERS %doc NEWS -%doc README %doc ROADMAP %doc THANKS %doc %{_mandir}/man1/%{name}.1* @@ -328,21 +313,47 @@ scrollkeeper-update -q || : %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf %changelog +* Thu Oct 29 2009 Debarshi Ray - 1:2.28.1.0-1 +- Version bump to 2.28.1.0. + * Debug manager plugin: + + Report error when location is < 0 for markers. (GNOME Bugzilla #593954) + * File loader plugin: + + Improved drag-and-drop behaviour. (GNOME Bugzilla #567363) + * GtkSourceView editor plugin: + + Improved drag-and-drop behaviour. (GNOME Bugzilla #355151) + * Subversion plugin: + + Removed duplicate IDs from the Glade file. (GNOME Bugzilla #596001) + * Symbol-db plugin: + + Fixed crash when loading a project. (GNOME Bugzilla #597113) + * Terminal plugin: + + Prevented it from crashing and freezing X. (GNOME Bugzilla #597318) + * http://download.gnome.org/sources/anjuta/2.28/anjuta-2.28.1.0.news +- Added 'BuildRequires: GConf2-devel ORBit2-devel' and removed + 'BuildRequires: binutils-devel graphviz-devel libgnomeui-devel pcre-devel'. + * Sat Sep 12 2009 Tom "spot" Callaway - 1:2.27.92.0-1 -- bump to 2.27.92.0, rebuild for broken deps -- fix compile (missing libxml cflags/libs) +- Version bump to 2.27.92.0, rebuild for broken deps. + * A better Git plugin and working C++ auto-completion. + * http://download.gnome.org/sources/anjuta/2.27/anjuta-2.27.92.0.news + * http://download.gnome.org/sources/anjuta/2.27/anjuta-2.27.91.0.news + * http://download.gnome.org/sources/anjuta/2.27/anjuta-2.27.5.0.news +- Fixed build failures due to missing libxml cflags/libs. (GNOME + Bugzilla #600407) * Mon Aug 10 2009 Ville Skytt? - 1:2.27.3.0-3 - Use bzipped upstream tarball. -* Fri Jul 24 2009 Fedora Release Engineering - 1:2.27.3.0-2 +* Fri Jul 24 2009 Release Engineering - 1:2.27.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Tue Jul 14 2009 Debarshi Ray - 1:2.27.3.0-1 - Version bump to 2.27.3.0. - Improvements in auto-completion speed. - Improvements in Git and Subversion plugins. - Ported to GtkBuilder. (GNOME Bugzilla #530740) + * The Graphviz, profiler, Scintilla, ScratchBox and Valgrind plugins + are now part of Anjuta Extras. They are no longer shipped with + this package. + * Improvements in auto-completion speed. + * Improvements in Git and Subversion plugins. + * Ported to GtkBuilder. (GNOME Bugzilla #530740) * Git plugin: + Commit dialog should have the "amend" option. (GNOME Bugzilla #580340) * GTodo plugin: Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- sources 12 Sep 2009 14:32:59 -0000 1.23 +++ sources 2 Nov 2009 20:40:52 -0000 1.24 @@ -1 +1 @@ -302691ed64826292fea61dac31212d1d anjuta-2.27.92.0.tar.bz2 +610624984bd62ee1e280090900a0ada7 anjuta-2.28.1.0.tar.bz2 --- anjuta-2.27.3.0-class-gen-templates.patch DELETED --- --- anjuta-2.27.3.0-docdir.patch DELETED --- --- anjuta-2.27.92.0-libxml.patch DELETED --- From uwog at fedoraproject.org Mon Nov 2 20:44:44 2009 From: uwog at fedoraproject.org (Marc Maurer) Date: Mon, 2 Nov 2009 20:44:44 +0000 (UTC) Subject: rpms/pyabiword/F-10 pyabiword.spec,1.4,1.5 Message-ID: <20091102204444.F02F811C0086@cvs1.fedora.phx.redhat.com> Author: uwog Update of /cvs/pkgs/rpms/pyabiword/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14218 Modified Files: pyabiword.spec Log Message: Add librsvg2-devel BR Index: pyabiword.spec =================================================================== RCS file: /cvs/pkgs/rpms/pyabiword/F-10/pyabiword.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- pyabiword.spec 2 Nov 2009 20:36:44 -0000 1.4 +++ pyabiword.spec 2 Nov 2009 20:44:44 -0000 1.5 @@ -5,7 +5,7 @@ Summary: Python bindings for libabiword Name: pyabiword Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Source0: pyabiword-%{version}.tar.gz URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz License: GPL+ @@ -15,6 +15,7 @@ BuildRequires: libabiword-devel >= %{abi BuildRequires: pygtk2-devel BuildRequires: gtk2-devel BuildRequires: libgsf-devel +BuildRequires: librsvg2-devel BuildRequires: enchant-devel BuildRequires: fribidi-devel BuildRequires: wv-devel @@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pygtk/2.0/defs/pyabiword.defs %changelog +* Mon Nov 02 2009 Marc Maurer - 0.8.0-3 +- Add librsvg2-devel BR + * Mon Nov 02 2009 Marc Maurer - 0.8.0-2 - Add libgsf-devel BR From mtruch at fedoraproject.org Mon Nov 2 20:50:34 2009 From: mtruch at fedoraproject.org (Matthew D Truch) Date: Mon, 2 Nov 2009 20:50:34 +0000 (UTC) Subject: rpms/cfitsio/devel cfitsio.patch,1.4,1.5 cfitsio.spec,1.36,1.37 Message-ID: <20091102205034.7C85F11C0417@cvs1.fedora.phx.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15641 Modified Files: cfitsio.patch cfitsio.spec Log Message: Reintroduce accidentally removed patch which fixes soname during library build. cfitsio.patch: Makefile.in | 4 ++-- configure | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) Index: cfitsio.patch =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- cfitsio.patch 19 Sep 2008 23:14:02 -0000 1.4 +++ cfitsio.patch 2 Nov 2009 20:50:32 -0000 1.5 @@ -1,7 +1,7 @@ -diff -u cfitsio/configure cfitsio-fixed/configure ---- cfitsio/configure 2007-11-05 15:52:57.000000000 -0500 -+++ cfitsio-fixed/configure 2008-09-19 18:50:51.000000000 -0400 -@@ -3397,7 +3397,8 @@ +diff -ur cfitsio/configure cfitio-fixed/configure +--- cfitsio/configure 2009-09-03 16:33:59.000000000 -0400 ++++ cfitio-fixed/configure 2009-11-02 15:33:12.000000000 -0500 +@@ -4061,7 +4061,8 @@ SHLIB_SUFFIX=".sl" ;; lnx) @@ -11,7 +11,7 @@ diff -u cfitsio/configure cfitsio-fixed/ ;; osf) SHLIB_LD="ld -shared -expect_unresolved '*'" -@@ -3418,7 +3419,7 @@ +@@ -4082,7 +4083,7 @@ # Darwin uses gcc (=cc), but needs different flags (see above) # if test "x$GCC" = xyes; then if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then @@ -20,9 +20,9 @@ diff -u cfitsio/configure cfitsio-fixed/ lhea_shlib_cflags='-fPIC' fi if test "x$lhea_shlib_cflags" != x; then -diff -u cfitsio/Makefile.in cfitsio-fixed/Makefile.in ---- cfitsio/Makefile.in 2008-01-14 13:30:51.000000000 -0500 -+++ cfitsio-fixed/Makefile.in 2008-09-19 18:51:41.000000000 -0400 +diff -ur cfitsio/Makefile.in cfitio-fixed/Makefile.in +--- cfitsio/Makefile.in 2009-07-14 16:40:37.000000000 -0400 ++++ cfitio-fixed/Makefile.in 2009-11-02 15:33:12.000000000 -0500 @@ -22,8 +22,8 @@ exec_prefix = @exec_prefix@ DESTDIR = Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- cfitsio.spec 20 Oct 2009 21:19:49 -0000 1.36 +++ cfitsio.spec 2 Nov 2009 20:50:32 -0000 1.37 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.210 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -8,6 +8,7 @@ License: GPLv2+ URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: cfitsio.patch BuildRequires: gcc-gfortran Requires(post): /sbin/ldconfig @@ -49,6 +50,7 @@ Stand-alone documentation for cfitsio. %prep %setup -q -n cfitsio +%patch0 -p1 %build FC=f95 @@ -76,7 +78,6 @@ mkdir -p %{buildroot}%{_includedir}/%{na make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \ CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} install pushd %{buildroot}%{_libdir} -mv libcfitsio.so libcfitsio.so.0 ln -s libcfitsio.so.0 libcfitsio.so popd @@ -107,6 +108,9 @@ rm -rf %{buildroot} %doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps %changelog +* Mon Nov 2 2009 Matthew Truch - 3.210-2 +- Re-introduce library soname patch (accidentally removed it). + * Tue Oct 20 2009 Matthew Truch - 3.210-1 - Update to upstream 3.210 release. From scop at fedoraproject.org Mon Nov 2 20:52:53 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Mon, 2 Nov 2009 20:52:53 +0000 (UTC) Subject: rpms/subversion/devel subversion-1.6.5-newlines.patch, NONE, 1.1 subversion.spec, 1.154, 1.155 Message-ID: <20091102205253.DA6F111C0086@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/subversion/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16565 Modified Files: subversion.spec Added Files: subversion-1.6.5-newlines.patch Log Message: * Mon Nov 2 2009 Ville Skytt? - 1.6.5-3 - Apply svn2cl upstream patch to fix newline issues with libxml2 2.7.4+, see http://bugs.debian.org/546990 for details. subversion-1.6.5-newlines.patch: svn2cl.xsl | 64 ++++++++++++++++++++++++++--------------------------------- svn2html.xsl | 19 ++++++----------- 2 files changed, 36 insertions(+), 47 deletions(-) --- NEW FILE subversion-1.6.5-newlines.patch --- diff -up svn2cl-0.11/svn2cl.xsl~ svn2cl-0.11/svn2cl.xsl --- svn2cl-0.11/svn2cl.xsl~ 2008-12-21 17:41:20.000000000 +0200 +++ svn2cl-0.11/svn2cl.xsl 2009-11-02 22:29:34.000000000 +0200 @@ -55,12 +55,6 @@ --> - - - -]> - @@ -119,7 +113,7 @@ - &newl; + @@ -149,33 +143,33 @@ - &newl; + - &space;&space; + - &newl; - &newl; + + - &newl; + - &space;&space; + - &newl;&newl; + @@ -187,7 +181,7 @@ [r - ]&space; + ] @@ -195,7 +189,7 @@ - &newl; + @@ -208,14 +202,14 @@ - &newl; + - &tab;*&space; + * - + @@ -232,7 +226,7 @@ - &space; + @@ -306,7 +300,7 @@ - ,&space; + , @@ -324,7 +318,7 @@ - ,&space; + , @@ -382,23 +376,23 @@ - + - + - &tab;&space;&space; + - + - &newl; + @@ -420,7 +414,7 @@ - &newl;&tab;&space;&space; + @@ -449,26 +443,26 @@ - + - + - + - + - &newl;&newl; + - + @@ -485,7 +479,7 @@ - &newl; + diff -up svn2cl-0.11/svn2html.xsl~ svn2cl-0.11/svn2html.xsl --- svn2cl-0.11/svn2html.xsl~ 2008-12-21 17:41:20.000000000 +0200 +++ svn2cl-0.11/svn2html.xsl 2009-11-02 22:30:11.000000000 +0200 @@ -47,11 +47,6 @@ --> - - -]> - - &space; + @@ -145,7 +140,7 @@
  • - &space; +
    • @@ -167,10 +162,10 @@ [r] - &space; + - &space; + @@ -189,14 +184,14 @@ - + - +
    - +     Index: subversion.spec =================================================================== RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -p -r1.154 -r1.155 --- subversion.spec 19 Sep 2009 14:54:38 -0000 1.154 +++ subversion.spec 2 Nov 2009 20:52:53 -0000 1.155 @@ -17,7 +17,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.6.5 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -26,6 +26,8 @@ Source1: subversion.conf Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el Source5: psvn-init.el +# http://bugs.debian.org/546990 +Patch0: subversion-1.6.5-newlines.patch Patch2: subversion-1.6.0-deplibs.patch Patch3: subversion-1.6.1-rpath.patch Patch6: subversion-1.6.0-pie.patch @@ -144,6 +146,9 @@ constructs found in different places. %prep %setup -q +cd contrib/client-side/svn2cl +%patch0 -p1 -b .newlines +cd ../../.. %patch2 -p1 -b .deplibs %patch3 -p1 -b .rpath #patch6 -p1 -b .pie @@ -380,6 +385,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man1/svn2cl.1* %changelog +* Mon Nov 2 2009 Ville Skytt? - 1.6.5-3 +- Apply svn2cl upstream patch to fix newline issues with libxml2 2.7.4+, + see http://bugs.debian.org/546990 for details. + * Sat Sep 19 2009 Ville Skytt? - 1.6.5-2 - Ship svn2cl and bash completion (#496456). - Add %%defattr to -gnome and -kde. From rishi at fedoraproject.org Mon Nov 2 21:02:52 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Mon, 2 Nov 2009 21:02:52 +0000 (UTC) Subject: rpms/anjuta/F-12 anjuta-2.28.1.0-libxml.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 anjuta.spec, 1.84, 1.85 sources, 1.23, 1.24 anjuta-2.27.3.0-class-gen-templates.patch, 1.1, NONE anjuta-2.27.3.0-docdir.patch, 1.1, NONE anjuta-2.27.92.0-libxml.patch, 1.1, NONE Message-ID: <20091102210252.A0F1B11C02BC@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/anjuta/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20590 Modified Files: .cvsignore anjuta.spec sources Added Files: anjuta-2.28.1.0-libxml.patch Removed Files: anjuta-2.27.3.0-class-gen-templates.patch anjuta-2.27.3.0-docdir.patch anjuta-2.27.92.0-libxml.patch Log Message: * Thu Oct 29 2009 Debarshi Ray - 1:2.28.1.0-1 - Version bump to 2.28.1.0. * Debug manager plugin: + Report error when location is < 0 for markers. (GNOME Bugzilla #593954) * File loader plugin: + Improved drag-and-drop behaviour. (GNOME Bugzilla #567363) * GtkSourceView editor plugin: + Improved drag-and-drop behaviour. (GNOME Bugzilla #355151) * Subversion plugin: + Removed duplicate IDs from the Glade file. (GNOME Bugzilla #596001) * Symbol-db plugin: + Fixed crash when loading a project. (GNOME Bugzilla #597113) * Terminal plugin: + Prevented it from crashing and freezing X. (GNOME Bugzilla #597318) * http://download.gnome.org/sources/anjuta/2.28/anjuta-2.28.1.0.news - Added 'BuildRequires: GConf2-devel ORBit2-devel' and removed 'BuildRequires: binutils-devel graphviz-devel libgnomeui-devel pcre-devel'. anjuta-2.28.1.0-libxml.patch: document-manager/Makefile.in | 4 +++- gbf-am/Makefile.in | 1 + gbf-mkfile/Makefile.in | 4 +++- language-manager/Makefile.in | 7 ++++--- macro/Makefile.in | 6 ++++-- 5 files changed, 15 insertions(+), 7 deletions(-) --- NEW FILE anjuta-2.28.1.0-libxml.patch --- diff -urNp anjuta-2.28.1.0.orig/plugins/document-manager/Makefile.in anjuta-2.28.1.0/plugins/document-manager/Makefile.in --- anjuta-2.28.1.0.orig/plugins/document-manager/Makefile.in 2009-10-19 19:17:19.000000000 +0300 +++ anjuta-2.28.1.0/plugins/document-manager/Makefile.in 2009-10-29 16:58:08.900396638 +0200 @@ -349,13 +349,15 @@ AM_CPPFLAGS = \ $(GDL_CFLAGS) \ $(GIO_CFLAGS) \ $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) \ -DG_LOG_DOMAIN=\"libanjuta-document-manager\" libanjuta_document_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS) libanjuta_document_manager_la_LIBADD = \ $(GDL_LIBS) \ $(GIO_LIBS) \ - $(LIBANJUTA_LIBS) + $(LIBANJUTA_LIBS) \ + $(LIBXML_LIBS) libanjuta_document_manager_la_SOURCES = \ plugin.c \ diff -urNp anjuta-2.28.1.0.orig/plugins/gbf-am/Makefile.in anjuta-2.28.1.0/plugins/gbf-am/Makefile.in --- anjuta-2.28.1.0.orig/plugins/gbf-am/Makefile.in 2009-10-19 19:17:20.000000000 +0300 +++ anjuta-2.28.1.0/plugins/gbf-am/Makefile.in 2009-10-29 16:55:44.076396823 +0200 @@ -359,6 +359,7 @@ AM_CPPFLAGS = \ $(DEPRECATED_FLAGS) \ $(GIO_CFLAGS) \ $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) \ -DSCRIPTS_DIR=\"$(scriptsdir)\" plugin_LTLIBRARIES = \ diff -urNp anjuta-2.28.1.0.orig/plugins/gbf-mkfile/Makefile.in anjuta-2.28.1.0/plugins/gbf-mkfile/Makefile.in --- anjuta-2.28.1.0.orig/plugins/gbf-mkfile/Makefile.in 2009-10-19 19:17:20.000000000 +0300 +++ anjuta-2.28.1.0/plugins/gbf-mkfile/Makefile.in 2009-10-29 17:48:21.042781607 +0200 @@ -348,6 +348,7 @@ AM_CPPFLAGS = \ $(DEPRECATED_FLAGS) \ $(GIO_CFLAGS) \ $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) \ -DSCRIPTS_DIR=\"$(scriptsdir)\" plugin_LTLIBRARIES = \ @@ -366,7 +367,8 @@ libgbf_mkfile_la_SOURCES = \ libgbf_mkfile_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS) libgbf_mkfile_la_LIBADD = \ $(GIO_LIBS) \ - $(LIBANJUTA_LIBS) + $(LIBANJUTA_LIBS) \ + $(LIBXML_LIBS) EXTRA_DIST = \ $(plugin_in_files) \ diff -urNp anjuta-2.28.1.0.orig/plugins/language-manager/Makefile.in anjuta-2.28.1.0/plugins/language-manager/Makefile.in --- anjuta-2.28.1.0.orig/plugins/language-manager/Makefile.in 2009-10-19 19:17:21.000000000 +0300 +++ anjuta-2.28.1.0/plugins/language-manager/Makefile.in 2009-10-29 16:59:30.104397009 +0200 @@ -332,8 +332,8 @@ language_manager_plugin_DATA = $(plugin_ # Include paths AM_CPPFLAGS = \ - $(LIBANJUTA_CFLAGS) - + $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) # Where to install the plugin plugindir = $(anjuta_plugin_dir) @@ -346,7 +346,8 @@ liblanguage_manager_la_SOURCES = plugin. # Plugin dependencies liblanguage_manager_la_LIBADD = \ - $(LIBANJUTA_LIBS) + $(LIBANJUTA_LIBS) \ + $(LIBXML_LIBS) liblanguage_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS) EXTRA_DIST = \ diff -urNp anjuta-2.28.1.0.orig/plugins/macro/Makefile.in anjuta-2.28.1.0/plugins/macro/Makefile.in --- anjuta-2.28.1.0.orig/plugins/macro/Makefile.in 2009-10-19 19:17:21.000000000 +0300 +++ anjuta-2.28.1.0/plugins/macro/Makefile.in 2009-10-29 16:59:00.309396944 +0200 @@ -328,14 +328,16 @@ macro_plugin_DATA = $(plugin_in_files:.p AM_CPPFLAGS = \ $(WARN_CFLAGS) \ $(DEPRECATED_FLAGS) \ - $(LIBANJUTA_CFLAGS) + $(LIBANJUTA_CFLAGS) \ + $(LIBXML_CFLAGS) plugindir = $(anjuta_plugin_dir) plugin_LTLIBRARIES = libanjuta-macro.la libanjuta_macro_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS) libanjuta_macro_la_LIBADD = \ $(GIO_LIBS) \ - $(LIBANJUTA_LIBS) + $(LIBANJUTA_LIBS) \ + $(LIBXML_LIBS) libanjuta_macro_la_SOURCES = \ plugin.c\ Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/F-12/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- .cvsignore 12 Sep 2009 14:32:59 -0000 1.23 +++ .cvsignore 2 Nov 2009 21:02:49 -0000 1.24 @@ -1 +1 @@ -anjuta-2.27.92.0.tar.bz2 +anjuta-2.28.1.0.tar.bz2 Index: anjuta.spec =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/F-12/anjuta.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -p -r1.84 -r1.85 --- anjuta.spec 12 Sep 2009 14:32:59 -0000 1.84 +++ anjuta.spec 2 Nov 2009 21:02:50 -0000 1.85 @@ -1,16 +1,16 @@ Summary: A GNOME development IDE for C/C++ Name: anjuta Epoch: 1 -Version: 2.27.92.0 +Version: 2.28.1.0 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.anjuta.org/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.27/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/anjuta/2.28/%{name}-%{version}.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -# Lots of places where libxml cflags/libs are not being used (but are needed) -Patch0: anjuta-2.27.92.0-libxml.patch +# https://bugzilla.gnome.org/600407 +Patch0: %{name}-%{version}-libxml.patch Obsoletes: gnome-build <= 2.24.1-1.fc10 Provides: perl(GBF::Make) = %{version}-%{release} @@ -29,22 +29,20 @@ Requires(post): /sbin/ldconfig Requires(preun): GConf2 Requires(postun): /sbin/ldconfig +BuildRequires: GConf2-devel +BuildRequires: ORBit2-devel BuildRequires: autogen -BuildRequires: binutils-devel BuildRequires: desktop-file-utils BuildRequires: devhelp-devel >= 0.22 -BuildRequires: libuuid-devel BuildRequires: gettext BuildRequires: glade3-libgladeui-devel >= 3.6.0 BuildRequires: gnome-doc-utils BuildRequires: gtksourceview2-devel >= 2.4.0 -BuildRequires: libgda-devel >= 3.99.7 -BuildRequires: graphviz-devel BuildRequires: intltool +BuildRequires: libgda-devel >= 4.0.0 BuildRequires: libgdl-devel >= 2.26.0 -BuildRequires: libgnomeui-devel +BuildRequires: libuuid-devel BuildRequires: neon-devel -BuildRequires: pcre-devel BuildRequires: perl(Locale::gettext) BuildRequires: perl(XML::Parser) BuildRequires: scrollkeeper @@ -60,7 +58,8 @@ an on-board interactive debugger, powerf intellisense autocompletions, symbol navigation, version controls, integrated GUI designing and other tools. -The documentation for this package is in %{name}-doc. +The documentation for this package is in %{name}-doc. Some extra +plugins are in %{name}-extras. %package devel Summary: Development files for %{name} @@ -76,10 +75,6 @@ This package contains development files Summary: Documentation for Anjuta DevStudio Group: Documentation -# Will be dropped in Fedora 10. -Provides: %{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-docs < 1:2.2.3 - Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -91,8 +86,7 @@ Documentation for Anjuta DevStudio provi %prep %setup -q - -%patch0 -p1 -b .libxml +%patch0 -p1 # Filter unwanted Provides. cat << \EOF > %{name}-prov @@ -140,10 +134,9 @@ sed --expression 's|-R/usr/lib64||' %{_l %build export PKG_CONFIG_PATH="./PKGCONFIG" %configure --disable-schemas-install --disable-static \ - --enable-gtk-doc --enable-scrollkeeper \ - --enable-plugin-devhelp --enable-graphviz --enable-plugin-glade \ - --enable-plugin-scintilla --enable-plugin-sourceview \ - --enable-plugin-subversion --enable-plugin-valgrind \ + --enable-gtk-doc --enable-plugin-devhelp --enable-plugin-glade \ + --enable-plugin-sourceview --enable-plugin-subversion \ + --enable-scrollkeeper \ --docdir=%{_docdir}/%{name}-%{version} \ --with-svn-lib=%{_libdir} @@ -196,8 +189,6 @@ rm -rf $RPM_BUILD_ROOT if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : - gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}-*.schemas >/dev/null || : fi @@ -206,8 +197,6 @@ fi export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : -gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || : if [ -x %{_bindir}/update-desktop-database ]; then @@ -229,8 +218,6 @@ fi if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : - gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}-*.schemas > /dev/null || : fi @@ -261,11 +248,9 @@ scrollkeeper-update -q || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS -%doc ChangeLog %doc COPYING %doc MAINTAINERS %doc NEWS -%doc README %doc ROADMAP %doc THANKS %doc %{_mandir}/man1/%{name}.1* @@ -328,21 +313,47 @@ scrollkeeper-update -q || : %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf %changelog +* Thu Oct 29 2009 Debarshi Ray - 1:2.28.1.0-1 +- Version bump to 2.28.1.0. + * Debug manager plugin: + + Report error when location is < 0 for markers. (GNOME Bugzilla #593954) + * File loader plugin: + + Improved drag-and-drop behaviour. (GNOME Bugzilla #567363) + * GtkSourceView editor plugin: + + Improved drag-and-drop behaviour. (GNOME Bugzilla #355151) + * Subversion plugin: + + Removed duplicate IDs from the Glade file. (GNOME Bugzilla #596001) + * Symbol-db plugin: + + Fixed crash when loading a project. (GNOME Bugzilla #597113) + * Terminal plugin: + + Prevented it from crashing and freezing X. (GNOME Bugzilla #597318) + * http://download.gnome.org/sources/anjuta/2.28/anjuta-2.28.1.0.news +- Added 'BuildRequires: GConf2-devel ORBit2-devel' and removed + 'BuildRequires: binutils-devel graphviz-devel libgnomeui-devel pcre-devel'. + * Sat Sep 12 2009 Tom "spot" Callaway - 1:2.27.92.0-1 -- bump to 2.27.92.0, rebuild for broken deps -- fix compile (missing libxml cflags/libs) +- Version bump to 2.27.92.0, rebuild for broken deps. + * A better Git plugin and working C++ auto-completion. + * http://download.gnome.org/sources/anjuta/2.27/anjuta-2.27.92.0.news + * http://download.gnome.org/sources/anjuta/2.27/anjuta-2.27.91.0.news + * http://download.gnome.org/sources/anjuta/2.27/anjuta-2.27.5.0.news +- Fixed build failures due to missing libxml cflags/libs. (GNOME + Bugzilla #600407) * Mon Aug 10 2009 Ville Skytt? - 1:2.27.3.0-3 - Use bzipped upstream tarball. -* Fri Jul 24 2009 Fedora Release Engineering - 1:2.27.3.0-2 +* Fri Jul 24 2009 Release Engineering - 1:2.27.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Tue Jul 14 2009 Debarshi Ray - 1:2.27.3.0-1 - Version bump to 2.27.3.0. - Improvements in auto-completion speed. - Improvements in Git and Subversion plugins. - Ported to GtkBuilder. (GNOME Bugzilla #530740) + * The Graphviz, profiler, Scintilla, ScratchBox and Valgrind plugins + are now part of Anjuta Extras. They are no longer shipped with + this package. + * Improvements in auto-completion speed. + * Improvements in Git and Subversion plugins. + * Ported to GtkBuilder. (GNOME Bugzilla #530740) * Git plugin: + Commit dialog should have the "amend" option. (GNOME Bugzilla #580340) * GTodo plugin: Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/anjuta/F-12/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- sources 12 Sep 2009 14:32:59 -0000 1.23 +++ sources 2 Nov 2009 21:02:50 -0000 1.24 @@ -1 +1 @@ -302691ed64826292fea61dac31212d1d anjuta-2.27.92.0.tar.bz2 +610624984bd62ee1e280090900a0ada7 anjuta-2.28.1.0.tar.bz2 --- anjuta-2.27.3.0-class-gen-templates.patch DELETED --- --- anjuta-2.27.3.0-docdir.patch DELETED --- --- anjuta-2.27.92.0-libxml.patch DELETED --- From lkundrak at fedoraproject.org Mon Nov 2 21:03:42 2009 From: lkundrak at fedoraproject.org (Lubomir Rintel) Date: Mon, 2 Nov 2009 21:03:42 +0000 (UTC) Subject: rpms/erlang/devel .cvsignore,1.14,1.15 sources,1.14,1.15 Message-ID: <20091102210342.25DB611C0086@cvs1.fedora.phx.redhat.com> Author: lkundrak Update of /cvs/pkgs/rpms/erlang/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21139 Modified Files: .cvsignore sources Log Message: Update sources Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- .cvsignore 10 Aug 2009 22:43:20 -0000 1.14 +++ .cvsignore 2 Nov 2009 21:03:41 -0000 1.15 @@ -1,3 +1,3 @@ -otp_src_R13B01.tar.gz -otp_doc_html_R13B01.tar.gz -otp_doc_man_R13B01.tar.gz +otp_doc_html_R13B02.tar.gz +otp_doc_man_R13B02.tar.gz +otp_src_R13B02.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/erlang/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- sources 10 Aug 2009 22:43:20 -0000 1.14 +++ sources 2 Nov 2009 21:03:42 -0000 1.15 @@ -1,3 +1,3 @@ -b3db581de6c13e1ec93d74e54a7b4231 otp_src_R13B01.tar.gz -42cb55bbfa5dc071fd56034615072f7a otp_doc_html_R13B01.tar.gz -fa8f96159bd9a88aa2fb9e4d79d7affe otp_doc_man_R13B01.tar.gz +78fc0c139a0297e502a6008bd8166887 otp_doc_html_R13B02.tar.gz +975b2c8a1cc2fda017cb5cd3864e32ba otp_doc_man_R13B02.tar.gz +d70bfba6935e52a7759168a35fbcabe7 otp_src_R13B02.tar.gz From tmraz at fedoraproject.org Mon Nov 2 21:05:33 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 2 Nov 2009 21:05:33 +0000 (UTC) Subject: rpms/gnutls/devel .cvsignore, 1.25, 1.26 gnutls.spec, 1.48, 1.49 sources, 1.25, 1.26 Message-ID: <20091102210533.E5CDF11C0086@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/gnutls/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21923 Modified Files: .cvsignore gnutls.spec sources Log Message: * Mon Nov 2 2009 Tomas Mraz 2.8.5-1 - upgrade to a new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- .cvsignore 23 Sep 2009 18:53:50 -0000 1.25 +++ .cvsignore 2 Nov 2009 21:05:33 -0000 1.26 @@ -1 +1 @@ -gnutls-2.8.4-nosrp.tar.bz2 +gnutls-2.8.5-nosrp.tar.bz2 Index: gnutls.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -r1.48 -r1.49 --- gnutls.spec 23 Sep 2009 18:53:50 -0000 1.48 +++ gnutls.spec 2 Nov 2009 21:05:33 -0000 1.49 @@ -1,6 +1,6 @@ Summary: A TLS protocol implementation Name: gnutls -Version: 2.8.4 +Version: 2.8.5 Release: 1%{?dist} # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ License: GPLv3+ and LGPLv2+ @@ -147,6 +147,9 @@ fi %{_datadir}/guile/site/gnutls.scm %changelog +* Mon Nov 2 2009 Tomas Mraz 2.8.5-1 +- upgrade to a new upstream version + * Wed Sep 23 2009 Tomas Mraz 2.8.4-1 - upgrade to a new upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- sources 23 Sep 2009 18:53:50 -0000 1.25 +++ sources 2 Nov 2009 21:05:33 -0000 1.26 @@ -1 +1 @@ -b4fe7ddd702a55d719ba5940b004ed3a gnutls-2.8.4-nosrp.tar.bz2 +21b5caa451af00f9a9dd680a0430c00b gnutls-2.8.5-nosrp.tar.bz2 From stevetraylen at fedoraproject.org Mon Nov 2 21:07:51 2009 From: stevetraylen at fedoraproject.org (stevetraylen) Date: Mon, 2 Nov 2009 21:07:51 +0000 (UTC) Subject: rpms/myproxy/devel myproxy.spec,1.4,1.5 Message-ID: <20091102210751.BDACC11C0086@cvs1.fedora.phx.redhat.com> Author: stevetraylen Update of /cvs/pkgs/rpms/myproxy/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22584 Modified Files: myproxy.spec Log Message: Glob on .so.* libs. Index: myproxy.spec =================================================================== RCS file: /cvs/pkgs/rpms/myproxy/devel/myproxy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- myproxy.spec 2 Nov 2009 19:09:21 -0000 1.4 +++ myproxy.spec 2 Nov 2009 21:07:51 -0000 1.5 @@ -8,7 +8,7 @@ Name: myproxy Version: 4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage X.509 Public Key Infrastructure (PKI) security credentials Group: System Environment/Daemons @@ -310,8 +310,7 @@ fi %doc %{_defaultdocdir}/%{name}-%{version} -%{_libdir}/libmyproxy.so.4 -%{_libdir}/libmyproxy.so.4.0.8 +%{_libdir}/libmyproxy.so.* %files client %defattr(-,root,root,-) @@ -391,8 +390,8 @@ fi %{_libdir}/pkgconfig/myproxy.pc %changelog -* Tue Oct 13 2009 Steve Traylen - 4.9-2 -- Bump for my error. +* Tue Oct 13 2009 Steve Traylen - 4.9-3 +- Glob on .so.* files to future proof for upgrades. * Tue Oct 13 2009 Steve Traylen - 4.9-1 - New upstream 4.9. * Tue Oct 13 2009 Steve Traylen - 4.8-5 From pkgdb at fedoraproject.org Mon Nov 2 21:10:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 21:10:18 +0000 Subject: [pkgdb] subversion: scop has requested watchbugzilla Message-ID: <20091102211018.413F010F887@bastion2.fedora.phx.redhat.com> scop has requested the watchbugzilla acl on subversion (Fedora devel) To make changes to this package see: /pkgdb/packages/name/subversion From pkgdb at fedoraproject.org Mon Nov 2 21:10:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 21:10:22 +0000 Subject: [pkgdb] subversion: scop has requested watchcommits Message-ID: <20091102211022.7BEC410F88E@bastion2.fedora.phx.redhat.com> scop has requested the watchcommits acl on subversion (Fedora devel) To make changes to this package see: /pkgdb/packages/name/subversion From pkgdb at fedoraproject.org Mon Nov 2 21:10:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 21:10:24 +0000 Subject: [pkgdb] subversion: scop has requested commit Message-ID: <20091102211024.526BE10F899@bastion2.fedora.phx.redhat.com> scop has requested the commit acl on subversion (Fedora devel) To make changes to this package see: /pkgdb/packages/name/subversion From davidz at fedoraproject.org Mon Nov 2 21:21:53 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Mon, 2 Nov 2009 21:21:53 +0000 (UTC) Subject: rpms/DeviceKit-disks/F-12 .cvsignore, 1.13, 1.14 DeviceKit-disks.spec, 1.38, 1.39 sources, 1.13, 1.14 Message-ID: <20091102212153.AE06511C02BC@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/DeviceKit-disks/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25765 Modified Files: .cvsignore DeviceKit-disks.spec sources Log Message: * Mon Nov 02 2009 David Zeuthen - 009-1%{?dist} - Update to release 009 (bugfixes, #528874) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- .cvsignore 19 Oct 2009 02:59:47 -0000 1.13 +++ .cvsignore 2 Nov 2009 21:21:52 -0000 1.14 @@ -1 +1,2 @@ DeviceKit-disks-008.tar.gz +DeviceKit-disks-009.tar.gz Index: DeviceKit-disks.spec =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/DeviceKit-disks.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- DeviceKit-disks.spec 19 Oct 2009 02:59:47 -0000 1.38 +++ DeviceKit-disks.spec 2 Nov 2009 21:21:52 -0000 1.39 @@ -1,6 +1,6 @@ %define glib2_version 2.6.0 %define dbus_version 1.2 -%define dbus_glib_version 0.76 +%define dbus_glib_version 0.82 %define polkit_version 0.92 %define parted_version 1.8.8 %define udev_version 145 @@ -11,7 +11,7 @@ Summary: Disk Management Service Name: DeviceKit-disks -Version: 008 +Version: 009 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Mon Nov 02 2009 David Zeuthen - 009-1%{?dist} +- Update to release 009 (bugfixes, #528874) + * Sun Oct 18 2009 Matthias Clasen - 008-1%{?dist} - Update to 008 - See http://lists.freedesktop.org/archives/devkit-devel/2009-October/000513.html Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- sources 19 Oct 2009 02:59:47 -0000 1.13 +++ sources 2 Nov 2009 21:21:52 -0000 1.14 @@ -1 +1 @@ -11c2bf346644e99bdca941394e019130 DeviceKit-disks-008.tar.gz +2771769829e544e8ffb64297084b9ed9 DeviceKit-disks-009.tar.gz From kwizart at fedoraproject.org Mon Nov 2 21:28:08 2009 From: kwizart at fedoraproject.org (Nicolas Chauvet) Date: Mon, 2 Nov 2009 21:28:08 +0000 (UTC) Subject: rpms/filezilla/devel .cvsignore, 1.43, 1.44 sources, 1.47, 1.48 filezilla.spec, 1.53, 1.54 Message-ID: <20091102212808.840D311C0086@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26843 Modified Files: .cvsignore sources filezilla.spec Log Message: Update to 3.3.0 beta2 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- .cvsignore 16 Oct 2009 21:44:31 -0000 1.43 +++ .cvsignore 2 Nov 2009 21:28:06 -0000 1.44 @@ -1 +1 @@ -FileZilla_3.2.8.1_src.tar.bz2 +FileZilla_3.3.0-beta2_src.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -r1.47 -r1.48 --- sources 16 Oct 2009 21:44:31 -0000 1.47 +++ sources 2 Nov 2009 21:28:06 -0000 1.48 @@ -1 +1 @@ -dd5c0288f229090a00ecaebb157e5a84 FileZilla_3.2.8.1_src.tar.bz2 +e39e768162bc488f03785afd6fa13f11 FileZilla_3.3.0-beta2_src.tar.bz2 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -p -r1.53 -r1.54 --- filezilla.spec 16 Oct 2009 21:44:31 -0000 1.53 +++ filezilla.spec 2 Nov 2009 21:28:06 -0000 1.54 @@ -1,7 +1,7 @@ -#global fz_rc rc1 +%global fz_rc beta2 Name: filezilla -Version: 3.2.8.1 +Version: 3.3.0 Release: 1%{?fz_rc:_%{?fz_rc}}%{?dist} Summary: FileZilla FTP, FTPS and SFTP client @@ -119,6 +119,12 @@ fi || : %changelog +* Mon Nov 2 2009 kwizart < kwizart at gmail.com > - 3.3.0-0.2_beta2 +- Update to 3.3.0-beta2 + +* Tue Oct 27 2009 kwizart < kwizart at gmail.com > - 3.3.0-0.1_beta1 +- Update to 3.3.0-beta1 + * Fri Oct 16 2009 kwizart < kwizart at gmail.com > - 3.2.8.1-1 - Update to 3.2.8.1 From kwizart at fedoraproject.org Mon Nov 2 21:29:11 2009 From: kwizart at fedoraproject.org (Nicolas Chauvet) Date: Mon, 2 Nov 2009 21:29:11 +0000 (UTC) Subject: rpms/filezilla/devel filezilla.spec,1.54,1.55 Message-ID: <20091102212911.5562511C0086@cvs1.fedora.phx.redhat.com> Author: kwizart Update of /cvs/pkgs/rpms/filezilla/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27074 Modified Files: filezilla.spec Log Message: Bump tag, should have been 0.2 Index: filezilla.spec =================================================================== RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- filezilla.spec 2 Nov 2009 21:28:06 -0000 1.54 +++ filezilla.spec 2 Nov 2009 21:29:10 -0000 1.55 @@ -2,7 +2,7 @@ Name: filezilla Version: 3.3.0 -Release: 1%{?fz_rc:_%{?fz_rc}}%{?dist} +Release: 2%{?fz_rc:_%{?fz_rc}}%{?dist} Summary: FileZilla FTP, FTPS and SFTP client Group: Applications/Internet From scop at fedoraproject.org Mon Nov 2 21:40:43 2009 From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=) Date: Mon, 2 Nov 2009 21:40:43 +0000 (UTC) Subject: rpms/rpmlint/devel .cvsignore, 1.26, 1.27 rpmlint.config, 1.37, 1.38 rpmlint.spec, 1.69, 1.70 sources, 1.26, 1.27 rpmlint-0.87-compile.patch, 1.1, NONE Message-ID: <20091102214043.CDDF211C0337@cvs1.fedora.phx.redhat.com> Author: scop Update of /cvs/pkgs/rpms/rpmlint/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30061 Modified Files: .cvsignore rpmlint.config rpmlint.spec sources Removed Files: rpmlint-0.87-compile.patch Log Message: * Mon Nov 2 2009 Ville Skytt? - 0.92-1 - Update to 0.92; fixes #528535, and #531102 (partially). - Python byte compile patch applied/superseded upstream. - Add to list of valid scriptlet shells. - Sync Fedora license list with Wiki revision 1.53. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- .cvsignore 13 Sep 2009 22:15:35 -0000 1.26 +++ .cvsignore 2 Nov 2009 21:40:41 -0000 1.27 @@ -1 +1 @@ -rpmlint-0.91.tar.bz2 +rpmlint-0.92.tar.bz2 Index: rpmlint.config =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- rpmlint.config 13 Sep 2009 22:15:36 -0000 1.37 +++ rpmlint.config 2 Nov 2009 21:40:42 -0000 1.38 @@ -19,6 +19,7 @@ setOption("UseEpoch", False) setOption("UseUTF8", True) setOption("ValidSrcPerms", (0664, 0644, )) setOption("ValidShells", ( + "", "/bin/sh", "/bin/bash", "/sbin/ldconfig", @@ -34,7 +35,7 @@ setOption("DanglingSymlinkExceptions", ( setOption("ValidLicenses", ( # These are the short names for all of the Fedora approved licenses. # The master list is kept here: http://fedoraproject.org/wiki/Licensing - # Last synced with revision "1.49, 15 August 2009" of that page. + # Last synced with revision "1.53, 8 Oct 2009" of that page. 'AAL', 'Adobe', 'ADSL', @@ -132,6 +133,7 @@ setOption("ValidLicenses", ( 'MirOS', 'MIT', 'MIT with advertising', + 'mod_macro', 'Motosoto', 'MPLv1.0', 'MPLv1.0+', Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- rpmlint.spec 13 Sep 2009 22:15:36 -0000 1.69 +++ rpmlint.spec 2 Nov 2009 21:40:42 -0000 1.70 @@ -1,5 +1,5 @@ Name: rpmlint -Version: 0.91 +Version: 0.92 Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages @@ -10,8 +10,6 @@ Source0: http://rpmlint.zarb.org/ Source1: %{name}.config Source2: %{name}-CHANGES.package.old Source3: %{name}-etc.config -# Fedora specific, not upstreamable -Patch0: %{name}-0.87-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -20,8 +18,10 @@ BuildRequires: rpm-python >= 4.4 BuildRequires: sed >= 3.95 Requires: rpm-python >= 4.4 Requires: python >= 2.4 -# python-magic is strictly speaking an optional dep, but it's quite desirable. +# python-magic and python-enchant are actually optional dependencies, but +# they bring quite desirable features. Requires: python-magic +Requires: python-enchant Requires: cpio Requires: binutils Requires: desktop-file-utils @@ -36,14 +36,13 @@ and source packages as well as spec file %prep %setup -q -%patch0 -p1 sed -i -e /MenuCheck/d Config.py install -pm 644 %{SOURCE2} CHANGES.package.old install -pm 644 %{SOURCE3} config %build -make +make COMPILE_PYC=1 %install @@ -75,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 2 2009 Ville Skytt? - 0.92-1 +- Update to 0.92; fixes #528535, and #531102 (partially). +- Python byte compile patch applied/superseded upstream. +- Add to list of valid scriptlet shells. +- Sync Fedora license list with Wiki revision 1.53. + * Mon Sep 14 2009 Ville Skytt? - 0.91-1 - Update to 0.91; fixes #513811, #515185, #516492, #519694, and #521630. - Add dependencies on gzip, bzip2, and xz. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- sources 13 Sep 2009 22:15:36 -0000 1.26 +++ sources 2 Nov 2009 21:40:42 -0000 1.27 @@ -1 +1 @@ -38b22629d28a02c0f6d675860dc6f6d7 rpmlint-0.91.tar.bz2 +87b07adf3a93066546223a007af18169 rpmlint-0.92.tar.bz2 --- rpmlint-0.87-compile.patch DELETED --- From pkgdb at fedoraproject.org Mon Nov 2 21:48:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 21:48:08 +0000 Subject: [pkgdb] subversion had acl change status Message-ID: <20091102214808.A59F710F871@bastion2.fedora.phx.redhat.com> jorton has set the watchbugzilla acl on subversion (Fedora devel) to Approved for scop To make changes to this package see: /pkgdb/packages/name/subversion From pkgdb at fedoraproject.org Mon Nov 2 21:48:08 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 21:48:08 +0000 Subject: [pkgdb] subversion had acl change status Message-ID: <20091102214808.E2DA010F879@bastion2.fedora.phx.redhat.com> jorton has set the watchcommits acl on subversion (Fedora devel) to Approved for scop To make changes to this package see: /pkgdb/packages/name/subversion From pkgdb at fedoraproject.org Mon Nov 2 21:48:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Mon, 02 Nov 2009 21:48:10 +0000 Subject: [pkgdb] subversion had acl change status Message-ID: <20091102214810.A6D5C10F887@bastion2.fedora.phx.redhat.com> jorton has set the commit acl on subversion (Fedora devel) to Approved for scop To make changes to this package see: /pkgdb/packages/name/subversion From orion at fedoraproject.org Mon Nov 2 21:48:57 2009 From: orion at fedoraproject.org (Orion Poplawski) Date: Mon, 2 Nov 2009 21:48:57 +0000 (UTC) Subject: rpms/eclipse-photran/F-11 .cvsignore, 1.4, 1.5 eclipse-photran.spec, 1.9, 1.10 makesource.sh, 1.2, 1.3 sources, 1.4, 1.5 eclipse-photran-4.0.0b5-outline.patch, 1.1, NONE Message-ID: <20091102214857.3942811C0086@cvs1.fedora.phx.redhat.com> Author: orion Update of /cvs/pkgs/rpms/eclipse-photran/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31626 Modified Files: .cvsignore eclipse-photran.spec makesource.sh sources Removed Files: eclipse-photran-4.0.0b5-outline.patch Log Message: * Mon Nov 2 2009 Orion Poplawski - 4.0.5-0.1.v20090801 - Update to final 4.0.5 cvs - Drop patch fixed upstream - Add Requires on eclipse-cdt (bug #532059) - Cleanup spec file - Rebuild included jar files Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-photran/F-11/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- .cvsignore 24 Feb 2009 00:00:59 -0000 1.4 +++ .cvsignore 2 Nov 2009 21:48:55 -0000 1.5 @@ -1 +1,3 @@ -org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz +photran-v20090801-LastBeforePhotran50.tar.gz +cdtdb-4.0.3-eclipse.jar +vpg-eclipse.jar Index: eclipse-photran.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-photran/F-11/eclipse-photran.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- eclipse-photran.spec 7 Apr 2009 14:57:51 -0000 1.9 +++ eclipse-photran.spec 2 Nov 2009 21:48:55 -0000 1.10 @@ -1,25 +1,30 @@ %define gcj_support 1 %define major 4 %define minor 0 -%define patch 0 +%define patch 5 %define majmin %{major}.%{minor} %define eclipse_base %{_libdir}/eclipse -Summary: Eclipse Fortran Development Tools (Photran) plugin Name: eclipse-photran Version: %{majmin}.%{patch} -Release: 0.6.b5%{?dist} -License: EPL +Release: 0.1.v20090801%{?dist} +Summary: Eclipse Fortran Development Tools (Photran) plugin + Group: Development/Tools +License: EPL URL: http://www.eclipse.org/photran -Requires: eclipse-platform - # The following tarball was generated by the makesource.sh script -Source0: org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz -Source1: makesource.sh -Patch0: eclipse-photran-4.0.0b5-outline.patch -BuildRequires: eclipse-pde -BuildRequires: eclipse-cdt >= 4.0.1 +Source0: photran-v20090801-LastBeforePhotran50.tar.gz +Source1: makesource.sh +Source2: cdtdb-4.0.3-eclipse.jar +Source3: vpg-eclipse.jar +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# Currently, upstream CDT only supports building on the platforms listed here. +ExclusiveArch: %{ix86} x86_64 ppc ia64 + +BuildRequires: eclipse-pde +BuildRequires: eclipse-cdt >= 1:5.0 %if %{gcj_support} BuildRequires: gcc-java >= 4.0.2 BuildRequires: java-gcj-compat-devel >= 1.0.64 @@ -29,12 +34,8 @@ Requires(postun): java-gcj-compat >= 1.0 BuildRequires: java-devel >= 1.4.2 %endif +Requires: eclipse-cdt >= 1:5.0 Requires: gdb make gcc-gfortran -Requires: eclipse-platform >= 1:3.3.0 - -# Currently, upstream CDT only supports building on the platforms listed here. -ExclusiveArch: %{ix86} x86_64 ppc ia64 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -61,8 +62,7 @@ Requires: %{name} = %{version}-%{r %prep -%setup -q -n org.eclipse.photran-v20090220_4_0_0_Beta5 -%patch0 -p1 -b .outline +%setup -q -n photran-v20090801-LastBeforePhotran50 -a 2 -a 3 # Fixup to use 1.5 source level find -name \*.prefs | xargs sed -i -e 's/source=1.3/source=1.5/' # This prevents the intel feature from building @@ -72,22 +72,39 @@ sed -i -e 's/os="linux"//' org.eclipse.p %build export JAVA_HOME=%{java_home} export PATH=%{java_bin}:/usr/bin:$PATH -for feature in org.eclipse.photran_feature org.eclipse.photran.intel \ - org.eclipse.photran.vpg_feature org.eclipse.photran.xlf_feature +# Build the helper jars first +pushd cdtdb-4.0.3-eclipse +classpath=$(echo %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar | sed -e 's/ /:/g') +find -name \*java -exec javac -classpath $classpath '{}' + +jar cf ../org.eclipse.photran.core.vpg/cdtdb-4.0.3-eclipse.jar * +popd +#Interferes with feature build +rm -rf cdtdb-4.0.3-eclipse + +pushd vpg-eclipse +classpath=$(echo %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar %{_libdir}/eclipse/plugins/org.eclipse.core.jobs_*.jar %{_libdir}/eclipse/plugins/org.eclipse.core.resources_*.jar %{_libdir}/eclipse/plugins/org.eclipse.core.runtime_*.jar ../org.eclipse.photran.core.vpg/cdtdb-4.0.3-eclipse.jar | sed -e 's/ /:/g') +find -name \*java -exec javac -classpath $classpath '{}' + +jar cf ../org.eclipse.photran.core.vpg/vpg-eclipse.jar * +popd +#Interferes with feature build +rm -rf vpg-eclipse + +# Build the eclipse features +for feature in org.eclipse.photran org.eclipse.photran.intel org.eclipse.photran.xlf do - %{eclipse_base}/buildscripts/pdebuild -d cdt \ + %{eclipse_base}/buildscripts/pdebuild -d "cdt rse" \ -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" 2>&1 | tee ${feature}.log done %install rm -rf ${RPM_BUILD_ROOT} -for feature in photran_feature photran.vpg_feature photran.intel photran.xlf_feature +for feature in org.eclipse.photran org.eclipse.photran.intel org.eclipse.photran.xlf do install -d -m755 ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature} - + unzip -o -d ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature} \ - build/rpmBuild/org.eclipse.${feature}.zip + build/rpmBuild/${feature}.zip mv ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse/* \ ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature} rmdir ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse @@ -112,22 +129,28 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc org.eclipse.photran-feature/epl-v10.html -%{eclipse_base}/dropins/photran_feature -%{eclipse_base}/dropins/photran.vpg_feature +%{eclipse_base}/dropins/org.eclipse.photran %if %{gcj_support} %{_libdir}/gcj/%{name} %endif %files intel %defattr(-,root,root,-) -%{eclipse_base}/dropins/photran.intel +%{eclipse_base}/dropins/org.eclipse.photran.intel %files xlf %defattr(-,root,root,-) -%{eclipse_base}/dropins/photran.xlf_feature +%{eclipse_base}/dropins/org.eclipse.photran.xlf %changelog +* Mon Nov 2 2009 Orion Poplawski - 4.0.5-0.1.v20090801 +- Update to final 4.0.5 cvs +- Drop patch fixed upstream +- Add Requires on eclipse-cdt (bug #532059) +- Cleanup spec file +- Rebuild included jar files + * Tue Apr 7 2009 Orion Poplawski - 4.0.0-0.6.b5 - Add patch from discussion list to fix outline view Index: makesource.sh =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-photran/F-11/makesource.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- makesource.sh 24 Feb 2009 00:00:59 -0000 1.2 +++ makesource.sh 2 Nov 2009 21:48:55 -0000 1.3 @@ -1,15 +1,21 @@ #!/bin/sh -rel=v20090220_4_0_0_Beta5 -rm -rf org.eclipse.photran-$rel -cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -r $rel -d org.eclipse.photran-$rel org.eclipse.photran - -#Cleanup deprecated stuff -pushd org.eclipse.photran-$rel -for deprecated in */THIS_*_DEPRECATED +rel=v20090801-LastBeforePhotran50 +rm -rf photran-$rel +cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools -z3 export -r $rel -d photran-$rel org.eclipse.ptp/photran +#Pull out the pre-build jars +find photran-$rel -name \*.jar -exec mv '{}' `pwd` \; +tar czf photran-$rel.tar.gz photran-$rel +#Repack the jar files removing the compiled class files +for jar in *.jar do - rm -rf `dirname $deprecated` + name=${jar/.jar/} + rm -rf $name + mkdir $name + pushd $name + unzip -o ../$jar + find -name \*.class -exec rm '{}' + + popd + rm $jar + zip -r $jar $name done -popd - -tar czf org.eclipse.photran-$rel.tar.gz org.eclipse.photran-$rel Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-photran/F-11/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 24 Feb 2009 00:00:59 -0000 1.4 +++ sources 2 Nov 2009 21:48:55 -0000 1.5 @@ -1 +1,3 @@ -deb885704962b8d5815c27595e47d526 org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz +42717919cd5411588646a81bb641d525 photran-v20090801-LastBeforePhotran50.tar.gz +1add9282953c7e68dfa4d92767e4cb05 cdtdb-4.0.3-eclipse.jar +ad1f5eca7775344a2cdd80a5d6ee9318 vpg-eclipse.jar --- eclipse-photran-4.0.0b5-outline.patch DELETED --- From davidz at fedoraproject.org Mon Nov 2 22:08:55 2009 From: davidz at fedoraproject.org (David Zeuthen) Date: Mon, 2 Nov 2009 22:08:55 +0000 (UTC) Subject: rpms/gnome-disk-utility/F-12 .cvsignore, 1.10, 1.11 gnome-disk-utility.spec, 1.25, 1.26 sources, 1.10, 1.11 0001-Use-stock-delete-and-apply-buttons.patch, 1.1, NONE 0002-Fix-library-translations.patch, 1.1, NONE 0003-Use-translated-string-for-button-label.patch, 1.1, NONE 0004-Translate-file-system-types.patch, 1.1, NONE button-translations.patch, 1.1, NONE gdu-2.28.1-nautilus-extension-fix-refs.patch, 1.1, NONE Message-ID: <20091102220855.535B511C0086@cvs1.fedora.phx.redhat.com> Author: davidz Update of /cvs/pkgs/rpms/gnome-disk-utility/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3290 Modified Files: .cvsignore gnome-disk-utility.spec sources Removed Files: 0001-Use-stock-delete-and-apply-buttons.patch 0002-Fix-library-translations.patch 0003-Use-translated-string-for-button-label.patch 0004-Translate-file-system-types.patch button-translations.patch gdu-2.28.1-nautilus-extension-fix-refs.patch Log Message: * Mon Nov 2 2009 David Zeuthen - 2.28.1-1%{?dist} - Update to 2.28.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-12/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- .cvsignore 18 Sep 2009 23:55:50 -0000 1.10 +++ .cvsignore 2 Nov 2009 22:08:54 -0000 1.11 @@ -7,3 +7,4 @@ gnome-disk-utility-0.3.tar.bz2 gnome-disk-utility-0.4.tar.bz2 gnome-disk-utility-0.5.tar.bz2 gnome-disk-utility-2.28.0.tar.bz2 +gnome-disk-utility-2.28.1.tar.bz2 Index: gnome-disk-utility.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-12/gnome-disk-utility.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- gnome-disk-utility.spec 13 Oct 2009 15:28:29 -0000 1.25 +++ gnome-disk-utility.spec 2 Nov 2009 22:08:54 -0000 1.26 @@ -12,8 +12,8 @@ Summary: Disk management application Name: gnome-disk-utility -Version: 2.28.0 -Release: 5%{?dist} +Version: 2.28.1 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://git.gnome.org/cgit/gnome-disk-utility @@ -40,13 +40,6 @@ Requires: %{name}-libs = %{version}-%{re Obsoletes: gnome-disk-utility-format Obsoletes: nautilus-gdu -# from the gnome-2-28 branch -Patch1: 0001-Use-stock-delete-and-apply-buttons.patch -Patch2: 0002-Fix-library-translations.patch -Patch3: 0003-Use-translated-string-for-button-label.patch -Patch4: 0004-Translate-file-system-types.patch -Patch5: gdu-2.28.1-nautilus-extension-fix-refs.patch - %description This package contains the Palimpsest disk management application. Palimpsest supports partitioning, file system creation, encryption, @@ -101,11 +94,6 @@ develop applications with gnome-disk-uti %prep %setup -q -%patch1 -p1 -b .use-stock-delete-and-apply-buttons -%patch2 -p1 -b fix-library-translations -%patch3 -p1 -b use-translated-string-for-button-label -%patch4 -p1 -b translate-file-system-types -%patch5 -p1 -b .nautilus-ext-ref-fixes %build %configure @@ -222,6 +210,9 @@ fi %{_includedir}/gnome-disk-utility/gdu-gtk/* %changelog +* Mon Nov 2 2009 David Zeuthen - 2.28.1-1%{?dist} +- Update to 2.28.1 + * Tue Oct 13 2009 Tomas Bzatek - 2.28.0-5%{?dist} - Fix nautilus crashes by proper object referencing Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-12/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- sources 18 Sep 2009 23:55:50 -0000 1.10 +++ sources 2 Nov 2009 22:08:54 -0000 1.11 @@ -1 +1 @@ -2ef95e6d5949c0d623b16bb98108cce8 gnome-disk-utility-2.28.0.tar.bz2 +d0e6191b7446717d80ccd7b3da611941 gnome-disk-utility-2.28.1.tar.bz2 --- 0001-Use-stock-delete-and-apply-buttons.patch DELETED --- --- 0002-Fix-library-translations.patch DELETED --- --- 0003-Use-translated-string-for-button-label.patch DELETED --- --- 0004-Translate-file-system-types.patch DELETED --- --- button-translations.patch DELETED --- --- gdu-2.28.1-nautilus-extension-fix-refs.patch DELETED --- From jkeating at fedoraproject.org Mon Nov 2 22:15:06 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Mon, 2 Nov 2009 22:15:06 +0000 (UTC) Subject: fedora-release fedora-rawhide.repo, 1.5, 1.5.4.1 fedora-release.spec, 1.76.2.1, 1.76.2.2 fedora-updates.repo, 1.18, 1.18.2.1 fedora.repo, 1.18, 1.18.2.1 Message-ID: <20091102221507.0C63911C0086@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4329 Modified Files: Tag: F-12 fedora-rawhide.repo fedora-release.spec fedora-updates.repo fedora.repo Log Message: It's 12! Index: fedora-rawhide.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-rawhide.repo,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -r1.5 -r1.5.4.1 --- fedora-rawhide.repo 4 Mar 2009 04:46:04 -0000 1.5 +++ fedora-rawhide.repo 2 Nov 2009 22:15:04 -0000 1.5.4.1 @@ -23,7 +23,7 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/$basearch/os/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch -enabled=1 +enabled=0 gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.76.2.1 retrieving revision 1.76.2.2 diff -u -r1.76.2.1 -r1.76.2.2 --- fedora-release.spec 5 Oct 2009 23:14:33 -0000 1.76.2.1 +++ fedora-release.spec 2 Nov 2009 22:15:04 -0000 1.76.2.2 @@ -1,9 +1,9 @@ -%define release_name Rawhide +%define release_name Constantine %define dist_version 12 Summary: Fedora release files Name: fedora-release -Version: 11.92 +Version: 12 Release: 1 License: GPLv2 Group: System Environment/Base @@ -84,6 +84,9 @@ /etc/pki/rpm-gpg/* %changelog +* Mon Nov 02 2009 Jesse Keating - 12-1 +- Set up for Fedora 12 + * Mon Oct 05 2009 Jesse Keating - 11.92-1 - Bump for 12-Beta Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -r1.18 -r1.18.2.1 --- fedora-updates.repo 7 Aug 2009 23:09:15 -0000 1.18 +++ fedora-updates.repo 2 Nov 2009 22:15:04 -0000 1.18.2.1 @@ -3,7 +3,7 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -enabled=0 +enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch Index: fedora.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora.repo,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -r1.18 -r1.18.2.1 --- fedora.repo 7 Aug 2009 23:09:15 -0000 1.18 +++ fedora.repo 2 Nov 2009 22:15:04 -0000 1.18.2.1 @@ -3,7 +3,7 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -enabled=0 +enabled=1 metadata_expire=7d gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch From zkota at fedoraproject.org Mon Nov 2 22:16:47 2009 From: zkota at fedoraproject.org (Zoltan Kota) Date: Mon, 2 Nov 2009 22:16:47 +0000 (UTC) Subject: rpms/bazaar/devel bazaar.spec,1.20,1.21 Message-ID: <20091102221647.A205311C0086@cvs1.fedora.phx.redhat.com> Author: zkota Update of /cvs/pkgs/rpms/bazaar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4551 Modified Files: bazaar.spec Log Message: Fix source url. Index: bazaar.spec =================================================================== RCS file: /cvs/pkgs/rpms/bazaar/devel/bazaar.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- bazaar.spec 24 Jul 2009 17:53:40 -0000 1.20 +++ bazaar.spec 2 Nov 2009 22:16:45 -0000 1.21 @@ -1,11 +1,11 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 Group: Development/Tools -Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz -Source1: http://bazaar.canonical.com/releases/src/bazaar-doc_1.4.tar.gz +Source: http://bazaar-vcs.org/releases/src/obsolete/%{name}_%{version}.tar.gz +Source1: http://bazaar-vcs.org/releases/src/obsolete/bazaar-doc_1.4.tar.gz Patch0: bazaar-neon-escape.patch Patch1: bazaar-1.4.2-macropen.patch Patch2: bazaar-1.4.2-neon026.patch @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/* %changelog +* Mon Nov 02 2009 Zoltan Kota 1.4.2-14 +- Fix source url + * Fri Jul 24 2009 Fedora Release Engineering - 1.4.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From jkeating at fedoraproject.org Mon Nov 2 22:19:15 2009 From: jkeating at fedoraproject.org (Jesse Keating) Date: Mon, 2 Nov 2009 22:19:15 +0000 (UTC) Subject: rpms/fedora-release/F-12 .cvsignore, 1.40, 1.41 fedora-release.spec, 1.80, 1.81 sources, 1.67, 1.68 Message-ID: <20091102221915.C752911C0086@cvs1.fedora.phx.redhat.com> Author: jkeating Update of /cvs/pkgs/rpms/fedora-release/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5104 Modified Files: .cvsignore fedora-release.spec sources Log Message: * Mon Nov 02 2009 Jesse Keating - 12-1 - Set up for Fedora 12 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/F-12/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- .cvsignore 5 Oct 2009 23:16:14 -0000 1.40 +++ .cvsignore 2 Nov 2009 22:19:13 -0000 1.41 @@ -1 +1 @@ -fedora-release-11.92.tar.gz +fedora-release-12.tar.gz Index: fedora-release.spec =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/F-12/fedora-release.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -p -r1.80 -r1.81 --- fedora-release.spec 5 Oct 2009 23:16:14 -0000 1.80 +++ fedora-release.spec 2 Nov 2009 22:19:13 -0000 1.81 @@ -1,9 +1,9 @@ -%define release_name Rawhide +%define release_name Constantine %define dist_version 12 Summary: Fedora release files Name: fedora-release -Version: 11.92 +Version: 12 Release: 1 License: GPLv2 Group: System Environment/Base @@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT /etc/pki/rpm-gpg/* %changelog +* Mon Nov 02 2009 Jesse Keating - 12-1 +- Set up for Fedora 12 + * Mon Oct 05 2009 Jesse Keating - 11.92-1 - Bump for 12-Beta Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fedora-release/F-12/sources,v retrieving revision 1.67 retrieving revision 1.68 diff -u -p -r1.67 -r1.68 --- sources 5 Oct 2009 23:16:14 -0000 1.67 +++ sources 2 Nov 2009 22:19:14 -0000 1.68 @@ -1 +1 @@ -cac63de13656aee3f71bd07906a4a2e6 fedora-release-11.92.tar.gz +3b531a0bfbea1cf67b27cb8d14ecc075 fedora-release-12.tar.gz From rlandmann at fedoraproject.org Mon Nov 2 22:25:09 2009 From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=) Date: Mon, 2 Nov 2009 22:25:09 +0000 (UTC) Subject: rpms/publican-fedora/F-11 .cvsignore, 1.11, 1.12 import.log, 1.2, 1.3 publican-fedora.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <20091102222509.6682911C0086@cvs1.fedora.phx.redhat.com> Author: rlandmann Update of /cvs/pkgs/rpms/publican-fedora/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6109/F-11 Modified Files: .cvsignore import.log publican-fedora.spec sources Log Message: * Fri Oct 30 2009 Jeff Fearn 1.0 - port to publican 1.0. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- .cvsignore 5 Oct 2009 06:54:47 -0000 1.11 +++ .cvsignore 2 Nov 2009 22:25:08 -0000 1.12 @@ -1 +1 @@ -publican-fedora-0.19.tgz +publican-fedora-1.0.tgz Index: import.log =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 7 Oct 2009 03:24:31 -0000 1.2 +++ import.log 2 Nov 2009 22:25:08 -0000 1.3 @@ -1,2 +1,3 @@ publican-fedora-0_19-1_fc11:F-11:publican-fedora-0.19-1.fc11.src.rpm:1254725592 publican-fedora-0_19-3_fc11:F-11:publican-fedora-0.19-3.fc11.src.rpm:1254885785 +publican-fedora-1_0-0_fc11:F-11:publican-fedora-1.0-0.fc11.src.rpm:1257200546 Index: publican-fedora.spec =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/publican-fedora.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- publican-fedora.spec 7 Oct 2009 03:24:31 -0000 1.12 +++ publican-fedora.spec 2 Nov 2009 22:25:09 -0000 1.13 @@ -2,16 +2,16 @@ Name: publican-%{brand} Summary: Publican documentation template files for %{brand} -Version: 0.19 -Release: 3%{?dist} +Version: 1.0 +Release: 0%{?dist} License: Open Publication Group: Development/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildarch: noarch -Source: https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz -Requires: publican -BuildRequires: publican -URL: https://fedorahosted.org/publican +Source: https://fedorahosted.org/releases/publican/%{name}-%{version}.tgz +Requires: publican >= 1.0 +BuildRequires: publican >= 1.0 +URL: https://publican.fedorahosted.org/ Obsoletes: documentation-devel-Fedora %description @@ -22,19 +22,12 @@ for %{brand} with publican. %setup -q %build -%{__make} Common_Content +publican build --formats=xml --langs=all --publish %install rm -rf $RPM_BUILD_ROOT -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Templates -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/make -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand} -cp -rf Common_Content $RPM_BUILD_ROOT%{_datadir}/publican/ -cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Book_Template -cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Set_Template -cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Article_Template -install -m 755 make/Makefile.%{brand} $RPM_BUILD_ROOT%{_datadir}/publican/make/. -install -m 755 xsl/*.xsl $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}/. +mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Common_Content +publican installbrand --path=$RPM_BUILD_ROOT%{_datadir}/publican/Common_Content %clean rm -rf $RPM_BUILD_ROOT @@ -44,61 +37,14 @@ rm -rf $RPM_BUILD_ROOT %doc README %doc COPYING %{_datadir}/publican/Common_Content/%{brand} -%{_datadir}/publican/Templates/%{brand}-*_Template -%{_datadir}/publican/make/Makefile.%{brand} -%{_datadir}/publican/xsl/%{brand} %changelog -* Wed Oct 7 2009 R?diger Landmann 0.19-3 -- Fix date in 0.19-2 changelog -- Update Fedora Feedback in Polish Piotr Dr?g -* Wed Oct 7 2009 R?diger Landmann 0.19-2 -- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE -- Tue Oct 6 2009 Maxim V. Dziumanenko -- Update Fedora Feedback in Ukrainian -* Mon Oct 5 2009 R?diger Landmann 0.19-1 -- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal -- Add Fedora logos with correct trademarks. BZ #492041 -- Sat Oct 3 2009 Maxim V. Dziumanenko -- Translate Fedora Feedback into Ukrainian -- Fri Sep 4 2009 Ville-Pekka Vainio -- Translate Fedora Feedback into Finnish -- Sun Aug 9 2009 Josip ?ume?ki -- Translate Fedora Feedback into Croatian -- Sun Aug 9 2009 Robert Buj -- Translate Fedora Feedback into Catalan -- Sun Jun 15 2009 Sindre Wetjen -- Translate Fedora Feedback into Norwegian (Bokm?l) -- Fri Jun 05 2009 Oron Peled -- Translate Fedora Feedback into Hebrew -- Thu Jun 04 2009 Jurijs Kolomijecs -- Translate Fedora Feedback into Latvian -- Mon May 25 2009 Nikola ?tohanzl -- Translate Fedora Feedback into Czech -- Sun May 10 2009 Pavol ?imo -- Translate Fedora Feedback into Slovak -- Fri May 08 2009 Arnes Arnautovi? -- Translate Fedora Feedback into Bosnian -- Sun Apr 19 2009 Manatsawin Hanmongkolchai -- Translate Fedora Feedback into Thai -- Thu Apr 16 2009 Sveinn ? Felli -- Translate Fedora Feedback into Icelandic -- Wed Apr 08 2009 Sulyok Peti -- Translate Fedora Feedback into Hungarian -- Mon Mar 23 2009 G?ran Uddeborg -- Translate Fedora Feedback into Swedish -- Fri Mar 20 2009 Noriko Mizumoto -- Update Fedora Feedback in Japanese -- Thu Mar 19 2009 Kris Thomsen -- Translate Fedora Feedback into Danish -- Fri Mar 13 2009 Jeff Fearn +* Fri Oct 30 2009 Jeff Fearn 1.0 +- port to publican 1.0. + +* Fri Mar 13 2009 Jeff Fearn 0.19 - Fix right to left fo ar-AR. BZ #486162 - Patches and translations by Muayyad Alsadi -- Tue Mar 10 2009 Alexey Vasyukov -- Translate Fedora Feedback into Russian - -* Sun Jul 26 2009 Fedora Release Engineering - 0.18-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Mar 9 2009 Jeff Fearn 0.18 - Add symlinks for langauges without country codes. BZ #487256 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- sources 7 Oct 2009 03:24:31 -0000 1.12 +++ sources 2 Nov 2009 22:25:09 -0000 1.13 @@ -1 +1 @@ -25ca41070d4156adb05c44b21a50df08 publican-fedora-0.19.tgz +d77ae1709114946cbc06c1c898f100e2 publican-fedora-1.0.tgz From steved at fedoraproject.org Mon Nov 2 22:26:47 2009 From: steved at fedoraproject.org (Steve Dickson) Date: Mon, 2 Nov 2009 22:26:47 +0000 (UTC) Subject: rpms/nfs-utils/F-12 nfs-utils.spec, 1.247, 1.248 nfs.init, 1.34, 1.35 nfslock.init, 1.27, 1.28 rpcgssd.init, 1.13, 1.14 rpcidmapd.init, 1.12, 1.13 rpcsvcgssd.init, 1.11, 1.12 Message-ID: <20091102222647.0E27211C0086@cvs1.fedora.phx.redhat.com> Author: steved Update of /cvs/pkgs/rpms/nfs-utils/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6585 Modified Files: nfs-utils.spec nfs.init nfslock.init rpcgssd.init rpcidmapd.init rpcsvcgssd.init Log Message: - Reworked and remove some of the Default-Start/Stop stanzas in the init scripts (bz 531425) Index: nfs-utils.spec =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils.spec,v retrieving revision 1.247 retrieving revision 1.248 diff -u -p -r1.247 -r1.248 --- nfs-utils.spec 22 Oct 2009 20:29:52 -0000 1.247 +++ nfs-utils.spec 2 Nov 2009 22:26:46 -0000 1.248 @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.2.0 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 # group all 32bit related archs @@ -265,6 +265,10 @@ fi %attr(4755,root,root) /sbin/umount.nfs4 %changelog +* Mon Nov 2 2009 Steve Dickson 1.2.0-18 +- Reworked and remove some of the Default-Start/Stop stanzas + in the init scripts (bz 531425) + * Thu Oct 22 2009 Steve Dickson 1.2.0-17 - Updated to the latest pseudo root release (rel7). - Added upstream 1.2.1-rc7 patch which fixes: Index: nfs.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs.init,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- nfs.init 10 Jun 2009 16:14:13 -0000 1.34 +++ nfs.init 2 Nov 2009 22:26:46 -0000 1.35 @@ -3,7 +3,7 @@ # nfs This shell script takes care of starting and stopping # the NFS services. # -# chkconfig: - 60 20 +# chkconfig: - 30 60 # description: NFS is a popular protocol for file sharing across networks. # This service provides NFS server functionality, which is \ # configured via the /etc/exports file. @@ -14,7 +14,6 @@ # Provides: nfs # Required-Start: $local_fs $network $syslog # Required-Stop: $local_fs $network $syslog -# Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start up the NFS server sevice # Description: NFS is a popular protocol for file sharing across networks \ Index: nfslock.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfslock.init,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- nfslock.init 22 Jun 2009 14:31:55 -0000 1.27 +++ nfslock.init 2 Nov 2009 22:26:46 -0000 1.28 @@ -13,7 +13,7 @@ # Provides: nfslock # Required-Start: $network $syslog # Required-Stop: $network $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start up the NFS file locking sevice # Description: NFS is a popular protocol for file sharing across \ Index: rpcgssd.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/rpcgssd.init,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- rpcgssd.init 10 Jun 2009 16:14:13 -0000 1.13 +++ rpcgssd.init 2 Nov 2009 22:26:46 -0000 1.14 @@ -10,7 +10,7 @@ # Provides: rpcgssd # Required-Start: $network $syslog # Required-Stop: $network $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Starts the RPCSEC GSS client daemon # Description: NFS is a popular protocol for file sharing across \ Index: rpcidmapd.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/rpcidmapd.init,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- rpcidmapd.init 10 Jun 2009 16:14:13 -0000 1.12 +++ rpcidmapd.init 2 Nov 2009 22:26:46 -0000 1.13 @@ -10,7 +10,7 @@ # Provides: rpcidmapd # Required-Start: $network $syslog # Required-Stop: $network $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Starts the NFSv4 id mapping daemon # Description: NFS is a popular protocol for file sharing across \ Index: rpcsvcgssd.init =================================================================== RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/rpcsvcgssd.init,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- rpcsvcgssd.init 10 Jun 2009 16:14:13 -0000 1.11 +++ rpcsvcgssd.init 2 Nov 2009 22:26:46 -0000 1.12 @@ -2,7 +2,7 @@ # # rpcsvcgssd Start up and shut down RPCSEC GSS daemon # -# chkconfig: - 19 69 +# chkconfig: - 31 69 # description: Starts user-level daemon that manages RPCSEC GSS contexts \ # for the NFS server. @@ -10,7 +10,6 @@ # Provides: rpcsvcgssd # Required-Start: $network $syslog # Required-Stop: $network $syslog -# Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Starts the RPCSEC GSS server daemon # Description: NFS is a popular protocol for file sharing across \ From tmraz at fedoraproject.org Mon Nov 2 22:29:14 2009 From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=) Date: Mon, 2 Nov 2009 22:29:14 +0000 (UTC) Subject: rpms/gnutls/F-12 .cvsignore, 1.25, 1.26 gnutls.spec, 1.48, 1.49 sources, 1.25, 1.26 Message-ID: <20091102222915.42DD711C0086@cvs1.fedora.phx.redhat.com> Author: tmraz Update of /cvs/pkgs/rpms/gnutls/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7103 Modified Files: .cvsignore gnutls.spec sources Log Message: * Mon Nov 2 2009 Tomas Mraz 2.8.5-1 - upgrade to a new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/F-12/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- .cvsignore 23 Sep 2009 18:53:50 -0000 1.25 +++ .cvsignore 2 Nov 2009 22:29:13 -0000 1.26 @@ -1 +1 @@ -gnutls-2.8.4-nosrp.tar.bz2 +gnutls-2.8.5-nosrp.tar.bz2 Index: gnutls.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/F-12/gnutls.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -r1.48 -r1.49 --- gnutls.spec 23 Sep 2009 18:53:50 -0000 1.48 +++ gnutls.spec 2 Nov 2009 22:29:13 -0000 1.49 @@ -1,6 +1,6 @@ Summary: A TLS protocol implementation Name: gnutls -Version: 2.8.4 +Version: 2.8.5 Release: 1%{?dist} # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ License: GPLv3+ and LGPLv2+ @@ -147,6 +147,9 @@ fi %{_datadir}/guile/site/gnutls.scm %changelog +* Mon Nov 2 2009 Tomas Mraz 2.8.5-1 +- upgrade to a new upstream version + * Wed Sep 23 2009 Tomas Mraz 2.8.4-1 - upgrade to a new upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/gnutls/F-12/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- sources 23 Sep 2009 18:53:50 -0000 1.25 +++ sources 2 Nov 2009 22:29:13 -0000 1.26 @@ -1 +1 @@ -b4fe7ddd702a55d719ba5940b004ed3a gnutls-2.8.4-nosrp.tar.bz2 +21b5caa451af00f9a9dd680a0430c00b gnutls-2.8.5-nosrp.tar.bz2 From mclasen at fedoraproject.org Mon Nov 2 22:32:09 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 22:32:09 +0000 (UTC) Subject: rpms/gnome-panel/F-12 panel-padding.patch,1.3,1.4 Message-ID: <20091102223209.2F04311C02A4@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-panel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7720 Modified Files: panel-padding.patch Log Message: fix patch panel-padding.patch: panel-profile.c | 3 ++ panel-profile.h | 5 +++- panel-toplevel.c | 44 +++++++++++++++++++++++++++++++++++ panel-toplevel.h | 3 ++ panel-toplevel.schemas.in | 13 ++++++++++ panel-widget.c | 57 +++++++++++++++++++++++++++++++++++----------- 6 files changed, 111 insertions(+), 14 deletions(-) Index: panel-padding.patch =================================================================== RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/panel-padding.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- panel-padding.patch 2 Nov 2009 18:39:09 -0000 1.3 +++ panel-padding.patch 2 Nov 2009 22:32:08 -0000 1.4 @@ -1,7 +1,355 @@ - panel-profile.c | 3 ++ - panel-profile.h | 5 +++- - panel-toplevel.c | 44 +++++++++++++++++++++++++++++++++++ - panel-toplevel.h | 3 ++ - panel-toplevel.schemas.in | 13 ++++++++++ - panel-widget.c | 57 +++++++++++++++++++++++++++++++++++----------- - 6 files changed, 111 insertions(+), 14 deletions(-) +diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.c +--- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding 2009-09-21 12:29:33.000000000 -0400 ++++ gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-11-02 11:24:47.453564521 -0500 +@@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation" + + TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size, int) + TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand, gboolean) ++TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding, int) + TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide, gboolean) + TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool, enable_buttons, gboolean) + TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows, gboolean) +@@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC + else UPDATE_INT ("monitor", monitor) + else UPDATE_STRING ("name", name) + else UPDATE_BOOL ("expand", expand) ++ else UPDATE_INT ("padding", padding) + else UPDATE_STRING ("orientation", orientation) + else UPDATE_INT ("size", size) + else UPDATE_POS ("x", x, x_right) +@@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient + GET_STRING ("name", name); + GET_INT ("monitor", monitor); + GET_BOOL ("expand", expand); ++ GET_INT ("padding", padding); + GET_STRING ("orientation", orientation); + GET_INT ("size", size); + GET_BOOL ("auto_hide", auto_hide); +diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.h +--- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding 2009-04-19 13:45:09.000000000 -0400 ++++ gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-11-02 11:24:47.454552356 -0500 +@@ -92,7 +92,10 @@ void panel_profile_set_toplevel_e + gboolean expand); + gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel); + gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel); +- ++void panel_profile_set_toplevel_padding (PanelToplevel *toplevel, ++ int padding); ++int panel_profile_get_toplevel_padding (PanelToplevel *padding); ++gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel); + void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel, + gboolean auto_hide); + gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel); +diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.c +--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding 2009-08-21 06:31:49.000000000 -0400 ++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-11-02 11:24:47.455802306 -0500 +@@ -79,6 +79,7 @@ struct _PanelToplevelPrivate { + gboolean expand; + PanelOrientation orientation; + int size; ++ int padding; + + /* relative to the monitor origin */ + int x; +@@ -213,6 +214,7 @@ enum { + PROP_0, + PROP_NAME, + PROP_EXPAND, ++ PROP_PADDING, + PROP_ORIENTATION, + PROP_SIZE, + PROP_X, +@@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject + case PROP_EXPAND: + panel_toplevel_set_expand (toplevel, g_value_get_boolean (value)); + break; ++ case PROP_PADDING: ++ panel_toplevel_set_padding (toplevel, g_value_get_int (value)); ++ break; + case PROP_ORIENTATION: + panel_toplevel_set_orientation (toplevel, g_value_get_enum (value)); + break; +@@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject + case PROP_EXPAND: + g_value_set_boolean (value, toplevel->priv->expand); + break; ++ case PROP_PADDING: ++ g_value_set_int (value, toplevel->priv->padding); ++ break; + case PROP_ORIENTATION: + g_value_set_enum (value, toplevel->priv->orientation); + break; +@@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel + + g_object_class_install_property ( + gobject_class, ++ PROP_PADDING, ++ g_param_spec_int ( ++ "padding", ++ "Padding", ++ "Padding that is inserted between objects", ++ 0, ++ G_MAXINT, ++ 0, ++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); ++ ++ g_object_class_install_property ( ++ gobject_class, + PROP_ORIENTATION, + g_param_spec_enum ( + "orientation", +@@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel + return toplevel->priv->expand; + } + ++void ++panel_toplevel_set_padding (PanelToplevel *toplevel, ++ int padding) ++{ ++ g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel)); ++ ++ if (toplevel->priv->padding == padding) ++ return; ++ ++ toplevel->priv->padding = padding; ++ ++ gtk_widget_queue_resize (GTK_WIDGET (toplevel)); ++ ++ g_object_notify (G_OBJECT (toplevel), "padding"); ++} ++ ++int ++panel_toplevel_get_padding (PanelToplevel *toplevel) ++{ ++ g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0); ++ ++ return toplevel->priv->padding; ++} ++ + gboolean + panel_toplevel_get_is_floating (PanelToplevel *toplevel) + { +diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.h +--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding 2009-08-19 11:28:09.000000000 -0400 ++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-11-02 11:24:47.456802503 -0500 +@@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_ + void panel_toplevel_set_expand (PanelToplevel *toplevel, + gboolean expand); + gboolean panel_toplevel_get_expand (PanelToplevel *toplevel); ++void panel_toplevel_set_padding (PanelToplevel *toplevel, ++ int padding); ++int panel_toplevel_get_padding (PanelToplevel *toplevel); + void panel_toplevel_set_orientation (PanelToplevel *toplevel, + PanelOrientation orientation); + PanelOrientation panel_toplevel_get_orientation (PanelToplevel *toplevel); +diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in +--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding 2009-07-01 09:06:23.000000000 -0400 ++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-11-02 11:24:47.456802503 -0500 +@@ -103,6 +103,19 @@ + + + ++ /schemas/apps/panel/toplevels/padding ++ panel ++ int ++ 0 ++ ++ Padding ++ ++ Padding that will be inserted between objects on this panel. ++ ++ ++ ++ ++ + /schemas/apps/panel/toplevels/x + panel + int +diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-widget.c +--- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding 2009-08-11 07:32:38.000000000 -0400 ++++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-11-02 13:35:15.647553899 -0500 +@@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW + { + AppletData *ad; + AppletData *nad = NULL; +- ++ gint padding; ++ + g_assert (list != NULL); + ++ padding = panel_toplevel_get_padding (panel->toplevel); ++ + ad = list->data; + if (ad->constrained + ad->min_cells >= panel->size) + return; +@@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW + if (list->next) + nad = list->next->data; + +- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) { +- ad->pos = ad->constrained += MOVE_INCREMENT; ++ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) { ++ ad->pos = ad->constrained += MOVE_INCREMENT + padding; + gtk_widget_queue_resize (GTK_WIDGET (panel)); + emit_applet_moved (panel, ad); + return; +@@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi + { + AppletData *ad; + AppletData *pad = NULL; ++ gint padding; ++ ++ padding = panel_toplevel_get_padding (panel->toplevel); + + ad = list->data; + if (ad->constrained <= 0) +@@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi + if (list->prev) + pad = list->prev->data; + +- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) { +- ad->pos = ad->constrained -= MOVE_INCREMENT; ++ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) { ++ ad->pos = ad->constrained -= MOVE_INCREMENT + padding; + gtk_widget_queue_resize (GTK_WIDGET (panel)); + emit_applet_moved (panel, ad); + return; +@@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel + { + AppletData *ad; + AppletData *nad = NULL; ++ gint padding; + + g_assert (list != NULL); + ++ padding = panel_toplevel_get_padding (panel->toplevel); ++ + ad = list->data; + if (list->next) + nad = list->next->data; + +- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) +- return ad->constrained + MOVE_INCREMENT; ++ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) ++ return ad->constrained + MOVE_INCREMENT + padding; + + if (nad->locked) + return panel_widget_get_right_jump_pos (panel, +@@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW + { + AppletData *ad; + AppletData *pad = NULL; ++ gint padding; + + g_assert (list != NULL); + ++ padding = panel_toplevel_get_padding (panel->toplevel); ++ + ad = list->data; + if (list->prev) + pad = list->prev->data; + +- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) +- return ad->constrained - MOVE_INCREMENT; ++ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) ++ return ad->constrained - MOVE_INCREMENT - padding; + + if (pad->locked) + return panel_widget_get_left_jump_pos (panel, +@@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid + GList *list; + GList *ad_with_hints; + gboolean dont_fill; ++ gint padding; + + g_return_if_fail(PANEL_IS_WIDGET(widget)); + g_return_if_fail(requisition!=NULL); + + panel = PANEL_WIDGET(widget); + ++ padding = panel_toplevel_get_padding (panel->toplevel); ++ + if(panel->orient == GTK_ORIENTATION_HORIZONTAL) { + requisition->width = 0; + requisition->height = panel->sz; +@@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid + ad_with_hints = g_list_prepend (ad_with_hints, + ad); + +- else if (panel->packed) ++ else if (panel->packed) { ++ if (list != panel->applet_list) ++ requisition->width += padding; + requisition->width += chreq.width; ++ } + } else { + if (requisition->width < chreq.width && !ad->size_constrained) + requisition->width = chreq.width; +@@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid + ad_with_hints = g_list_prepend (ad_with_hints, + ad); + +- else if (panel->packed) ++ else if (panel->packed) { ++ if (list != panel->applet_list) ++ requisition->height += padding; + requisition->height += chreq.height; ++ } + } + } + +@@ -1329,16 +1350,19 @@ static void + panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation) + { + PanelWidget *panel; +- GList *list; ++ GList *list, *last; + int i; + int old_size; + gboolean ltr; ++ gint padding; + + g_return_if_fail(PANEL_IS_WIDGET(widget)); + g_return_if_fail(allocation!=NULL); + + panel = PANEL_WIDGET(widget); + ++ padding = panel_toplevel_get_padding (panel->toplevel); ++ + old_size = panel->size; + ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR; + +@@ -1405,6 +1429,8 @@ panel_widget_size_allocate(GtkWidget *wi + ad->min_cells = ad->cells; + gtk_widget_size_allocate(ad->applet,&challoc); + i += ad->cells; ++ if (list != panel->applet_list) ++ i += padding; + } + + /* EEEEK, there might be not enough room and we don't handle +@@ -1440,11 +1466,14 @@ panel_widget_size_allocate(GtkWidget *wi + ad->constrained = i; + + i = ad->constrained + ad->cells; ++ if (list != panel->applet_list) ++ i += padding; + } + + /* Now expand from the right */ + i = panel->size; +- for(list = g_list_last(panel->applet_list); ++ last = g_list_last(panel->applet_list); ++ for(list = last; + list!=NULL; + list = g_list_previous(list)) { + AppletData *ad = list->data; +@@ -1465,6 +1494,8 @@ panel_widget_size_allocate(GtkWidget *wi + } + + i = ad->constrained; ++ if (list != last) ++ i -= padding; + } + + /* EEEEK, there's not enough room, so shift applets even From spot at fedoraproject.org Mon Nov 2 22:37:03 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Mon, 2 Nov 2009 22:37:03 +0000 (UTC) Subject: rpms/perl-Class-Trigger/F-10 perl-Class-Trigger.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <20091102223704.03AAA11C0086@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/perl-Class-Trigger/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8870 Modified Files: perl-Class-Trigger.spec sources Log Message: update to 0.13 Index: perl-Class-Trigger.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Trigger/F-10/perl-Class-Trigger.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- perl-Class-Trigger.spec 28 Feb 2008 13:02:53 -0000 1.6 +++ perl-Class-Trigger.spec 2 Nov 2009 22:37:02 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Class-Trigger -Version: 0.12 -Release: 3%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: Mixin to add / call inheritable triggers Group: Development/Libraries License: GPL+ or Artistic @@ -44,6 +44,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 13 2009 Tom "spot" Callaway - 0.13-1 +- update to 0.13 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 27 2008 Tom "spot" Callaway - 0.12-3 - Rebuild for perl 5.10 (again) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Trigger/F-10/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 24 Aug 2007 21:04:26 -0000 1.4 +++ sources 2 Nov 2009 22:37:02 -0000 1.5 @@ -1 +1 @@ -d9e507de9241d8b2b83a6eb11156d276 Class-Trigger-0.12.tar.gz +5e73d9376a5786450088e3384a938794 Class-Trigger-0.13.tar.gz From ausil at fedoraproject.org Mon Nov 2 22:43:07 2009 From: ausil at fedoraproject.org (Dennis Gilmore) Date: Mon, 2 Nov 2009 22:43:07 +0000 (UTC) Subject: rpms/geda-gaf/EL-5 geda-gaf.spec,1.1,1.2 Message-ID: <20091102224307.751A411C0086@cvs1.fedora.phx.redhat.com> Author: ausil Update of /cvs/pkgs/rpms/geda-gaf/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10664 Modified Files: geda-gaf.spec Log Message: rhel5 does not support noarch sub-packages Index: geda-gaf.spec =================================================================== RCS file: /cvs/pkgs/rpms/geda-gaf/EL-5/geda-gaf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- geda-gaf.spec 6 Oct 2009 09:45:53 -0000 1.1 +++ geda-gaf.spec 2 Nov 2009 22:43:05 -0000 1.2 @@ -8,7 +8,7 @@ Name: geda-gaf Epoch: 1 Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Design Automation toolkit for electronic design Group: Applications/Engineering @@ -68,7 +68,9 @@ Development files for libgeda library %package -n geda-symbols Summary: Electronic symbols for gEDA Group: Applications/Engineering +%if 0%{?fedora} > 9 || 0%{?rhel} > 5 BuildArch: noarch +%endif BuildRequires: transfig %description -n geda-symbols @@ -79,7 +81,9 @@ used by gschem, the gEDA project schemat %package -n geda-docs Summary: Documentation and Examples for gEDA Group: Applications/Engineering +%if 0%{?fedora} > 9 || 0%{?rhel} > 5 BuildArch: noarch +%endif Requires: geda-symbols Provides: geda-examples = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: geda-examples < 20090830-2 @@ -453,6 +457,9 @@ update-mime-database %{_datadir}/mime &> %changelog +* Mon Nov 02 2009 Dennis Gilmore - 1.6.0-2 +- RHEL-5 does not support noarch subpackages + * Tue Oct 6 2009 Chitlesh Goorah - 1.6.0-1 - new upstream release From airlied at fedoraproject.org Mon Nov 2 22:43:31 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Mon, 2 Nov 2009 22:43:31 +0000 (UTC) Subject: rpms/kernel/F-12 drm-radeon-fix-ring-rmw-issue.patch, NONE, 1.1 kernel.spec, 1.1895, 1.1896 Message-ID: <20091102224331.323A811C0086@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10832 Modified Files: kernel.spec Added Files: drm-radeon-fix-ring-rmw-issue.patch Log Message: * Tue Nov 03 2009 Dave Airlie 2.6.31.5-110 - r600: fix for ring setup RMW issue. drm-radeon-fix-ring-rmw-issue.patch: r100.c | 12 ++++++------ r600.c | 9 +++------ 2 files changed, 9 insertions(+), 12 deletions(-) --- NEW FILE drm-radeon-fix-ring-rmw-issue.patch --- >From 285b15261833cccb0fd2396f3404b7a7d59a014e Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 2 Nov 2009 16:01:27 -0500 Subject: [PATCH] drm/radeon/kms: Don't RMW CP_RB_CNTL Immediate readback seems faulty on some chips. I suspect it takes a while to get through the fifo to the actual register backbone. There's no need to read it back, so, just write the driver's copy of the register's value directly. Should fix bug 24535 and possibly 24218 Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/r100.c | 12 ++++++------ drivers/gpu/drm/radeon/r600.c | 8 +++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index b438b52..5e821a3 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -578,19 +578,19 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size) indirect1_start = 16; /* cp setup */ WREG32(0x718, pre_write_timer | (pre_write_limit << 28)); - WREG32(RADEON_CP_RB_CNTL, -#ifdef __BIG_ENDIAN - RADEON_BUF_SWAP_32BIT | -#endif - REG_SET(RADEON_RB_BUFSZ, rb_bufsz) | + tmp = (REG_SET(RADEON_RB_BUFSZ, rb_bufsz) | REG_SET(RADEON_RB_BLKSZ, rb_blksz) | REG_SET(RADEON_MAX_FETCH, max_fetch) | RADEON_RB_NO_UPDATE); +#ifdef __BIG_ENDIAN + tmp |= RADEON_BUF_SWAP_32BIT; +#endif + WREG32(RADEON_CP_RB_CNTL, tmp); + /* Set ring address */ DRM_INFO("radeon: ring at 0x%016lX\n", (unsigned long)rdev->cp.gpu_addr); WREG32(RADEON_CP_RB_BASE, rdev->cp.gpu_addr); /* Force read & write ptr to 0 */ - tmp = RREG32(RADEON_CP_RB_CNTL); WREG32(RADEON_CP_RB_CNTL, tmp | RADEON_RB_RPTR_WR_ENA); WREG32(RADEON_CP_RB_RPTR_WR, 0); WREG32(RADEON_CP_RB_WPTR, 0); diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index e87475c..60fbb23 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1272,19 +1272,17 @@ int r600_cp_resume(struct radeon_device *rdev) /* Set ring buffer size */ rb_bufsz = drm_order(rdev->cp.ring_size / 8); + tmp = RB_NO_UPDATE | (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz; #ifdef __BIG_ENDIAN - WREG32(CP_RB_CNTL, BUF_SWAP_32BIT | RB_NO_UPDATE | - (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz); -#else - WREG32(CP_RB_CNTL, RB_NO_UPDATE | (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz); + tmp |= BUF_SWAP_32BIT; #endif + WREG32(CP_RB_CNTL, tmp); WREG32(CP_SEM_WAIT_TIMER, 0x4); /* Set the write pointer delay */ WREG32(CP_RB_WPTR_DELAY, 0); /* Initialize the ring buffer's read and write pointers */ - tmp = RREG32(CP_RB_CNTL); WREG32(CP_RB_CNTL, tmp | RB_RPTR_WR_ENA); WREG32(CP_RB_RPTR_WR, 0); WREG32(CP_RB_WPTR, 0); -- 1.5.6.3 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v retrieving revision 1.1895 retrieving revision 1.1896 diff -u -p -r1.1895 -r1.1896 --- kernel.spec 2 Nov 2009 19:22:22 -0000 1.1895 +++ kernel.spec 2 Nov 2009 22:43:30 -0000 1.1896 @@ -698,6 +698,7 @@ Patch1825: drm-intel-pm.patch Patch1826: drm-intel-no-tv-hotplug.patch Patch1827: drm-disable-r600-aspm.patch Patch1828: drm-radeon-agp-font-fix.patch +Patch1829: drm-radeon-fix-ring-rmw-issue.patch # vga arb Patch1900: linux-2.6-vga-arb.patch @@ -1386,6 +1387,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch ApplyPatch kms-offb-handoff.patch ApplyPatch drm-next-ea1495a6.patch ApplyPatch drm-radeon-agp-font-fix.patch +ApplyPatch drm-radeon-fix-ring-rmw-issue.patch ApplyPatch drm-nouveau.patch # pm broken on my thinkpad t60p - airlied @@ -2108,6 +2110,9 @@ fi # and build. %changelog +* Tue Nov 03 2009 Dave Airlie 2.6.31.5-110 +- r600: fix for ring setup RMW issue. + * Mon Nov 02 2009 John W. Linville 2.6.31.5-109 - prism54: remove pci modinfo device table (#447047) From mclasen at fedoraproject.org Mon Nov 2 23:10:43 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Mon, 2 Nov 2009 23:10:43 +0000 (UTC) Subject: rpms/gnome-screensaver/F-12 remove-session-inhibits.patch, NONE, 1.1 gnome-screensaver.spec, 1.232, 1.233 Message-ID: <20091102231043.4435711C0419@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/gnome-screensaver/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16969 Modified Files: gnome-screensaver.spec Added Files: remove-session-inhibits.patch Log Message: Remove session inhibits if the owner falls off the bus remove-session-inhibits.patch: gs-listener-dbus.c | 53 +++++++++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 30 deletions(-) --- NEW FILE remove-session-inhibits.patch --- diff -up gnome-screensaver-2.28.0/src/gs-listener-dbus.c.remove-session-inhibits gnome-screensaver-2.28.0/src/gs-listener-dbus.c --- gnome-screensaver-2.28.0/src/gs-listener-dbus.c.remove-session-inhibits 2009-08-19 19:19:14.000000000 -0400 +++ gnome-screensaver-2.28.0/src/gs-listener-dbus.c 2009-11-02 18:07:57.129864647 -0500 @@ -985,47 +985,40 @@ listener_dbus_remove_ref_entry (GSListen } static gboolean -listener_ref_entry_has_connection (gpointer key, - gpointer value, - gpointer user_data) -{ - GSListenerRefEntry *entry; - const char *connection; - gboolean matches; - - entry = (GSListenerRefEntry *)value; - connection = (const char *) user_data; - - matches = FALSE; - if (connection != NULL && entry->connection != NULL) { - matches = (strcmp (connection, entry->connection) == 0); - if (matches) { - gs_debug ("removing %s from %s for reason '%s' on connection %s", - get_name_for_entry_type (entry->entry_type), - entry->application, - entry->reason, - entry->connection); - } - } - - return matches; -} - -static gboolean listener_ref_entry_remove_for_connection (GSListener *listener, int entry_type, const char *connection) { gboolean removed; - guint n_removed; GHashTable *hash; + GHashTableIter iter; + GSListenerRefEntry *entry; + + if (connection == NULL) + return FALSE; hash = get_hash_for_entry_type (listener, entry_type); removed = FALSE; - n_removed = g_hash_table_foreach_remove (hash, listener_ref_entry_has_connection, (gpointer)connection); + g_hash_table_iter_init (&iter, hash); + while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&entry)) { + if (entry->connection != NULL && + strcmp (connection, entry->connection) == 0) { + gs_debug ("removing %s from %s for reason '%s' on connection %s", + get_name_for_entry_type (entry->entry_type), + entry->application, + entry->reason, + entry->connection); + + if (entry->entry_type == REF_ENTRY_TYPE_INHIBIT) { + /* remove inhibit from gnome session */ + remove_session_inhibit (listener, entry); + } - removed = (n_removed > 0); + g_hash_table_iter_remove (&iter); + removed = TRUE; + } + } return removed; } Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-12/gnome-screensaver.spec,v retrieving revision 1.232 retrieving revision 1.233 diff -u -p -r1.232 -r1.233 --- gnome-screensaver.spec 24 Oct 2009 03:54:05 -0000 1.232 +++ gnome-screensaver.spec 2 Nov 2009 23:10:39 -0000 1.233 @@ -14,7 +14,7 @@ Summary: GNOME Screensaver Name: gnome-screensaver Version: 2.28.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Amusements/Graphics Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2 @@ -28,6 +28,7 @@ Patch8: gnome-screensaver-2.20.0-selinux Patch9: xrandr-gamma.patch Patch10: multihead-issues.patch Patch11: ask-to-die.patch +Patch12: remove-session-inhibits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org @@ -83,6 +84,7 @@ simple, sane, secure defaults and be wel %patch9 -p1 -b .xrandr-gamma %patch10 -p1 -b .multihead-issues %patch11 -p1 -b .ask-to-die +%patch12 -p1 -b .remove-session-inhibits libtoolize --force --copy @@ -157,6 +159,9 @@ fi %doc %{_mandir}/man1/*.1.gz %changelog +* Mon Nov 2 2009 Matthias Clasen 2.28.0-6 +- Clean up session inhibitors if the owner falls off the bus + * Fri Oct 23 2009 Matthias Clasen 2.28.0-5 - Make the dialog ask to be killed after 5 attempts From sailer at fedoraproject.org Mon Nov 2 23:11:21 2009 From: sailer at fedoraproject.org (sailer) Date: Mon, 2 Nov 2009 23:11:21 +0000 (UTC) Subject: rpms/mingw32-qt-qmake/devel mingw32-qt-qmake.spec,1.7,1.8 Message-ID: <20091102231121.D16D511C0419@cvs1.fedora.phx.redhat.com> Author: sailer Update of /cvs/extras/rpms/mingw32-qt-qmake/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17260 Modified Files: mingw32-qt-qmake.spec Log Message: update to match mingw32-qt Index: mingw32-qt-qmake.spec =================================================================== RCS file: /cvs/extras/rpms/mingw32-qt-qmake/devel/mingw32-qt-qmake.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- mingw32-qt-qmake.spec 25 Jul 2009 14:30:35 -0000 1.7 +++ mingw32-qt-qmake.spec 2 Nov 2009 23:11:21 -0000 1.8 @@ -7,8 +7,8 @@ %global debug_package %{nil} Name: mingw32-qt-qmake -Version: 4.5.2 -Release: 2%{?dist} +Version: 4.5.3 +Release: 1%{?dist} Summary: Qt for Windows Build Environment License: GPLv3 with exceptions or LGPLv2 with exceptions @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 3 2009 Thomas Sailer - 4.5.3-1 +- update to 4.5.3 to match mingw32-qt version + * Sat Jul 25 2009 Fedora Release Engineering - 4.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rishi at fedoraproject.org Mon Nov 2 23:24:54 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Mon, 2 Nov 2009 23:24:54 +0000 (UTC) Subject: rpms/osmo/devel osmo-0.2.8-configure.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 osmo.spec, 1.14, 1.15 sources, 1.6, 1.7 osmo-0.2.4-configure.patch, 1.1, NONE osmo-0.2.4-crash.patch, 1.1, NONE Message-ID: <20091102232454.9B0A011C0086@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/osmo/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21444 Modified Files: .cvsignore osmo.spec sources Added Files: osmo-0.2.8-configure.patch Removed Files: osmo-0.2.4-configure.patch osmo-0.2.4-crash.patch Log Message: * Tue Nov 03 2009 Debarshi Ray - 0.2.8-1 - Version bump to 0.2.8. (Red Hat Bugzilla #512626) * Encrypted data backup. * Exporting tasks to iCal file. * Text attributes are handled now in day notes editor. * Default alarm sound for task reminder. * Option to ignore weekend days in date calculator. * Added new calendar marker for birthdays. * Locale settings are used by default. * Slightly improved iCal support. * Unencrypted notes implemented. * Calendar printing improvements. * Spell checker support. * Showing map location of selected contact using Google Maps. * The order and width of columns is configurable. * System tray support improvements. * Many small improvements and fixes. * Translation updates: ca, cs, de, el, es, fi, fr, it, jp, nl, pl, ru, sv, tr and uk. * http://clayo.org/osmo/ChangeLog - Fix for crash due to SIGABRT merged upstream. - Added 'Requires: xdg-utils' and 'BuildRequires: gtkspell-devel'. osmo-0.2.8-configure.patch: configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE osmo-0.2.8-configure.patch --- diff -uNp osmo-0.2.8.orig/configure osmo-0.2.8/configure --- osmo-0.2.8.orig/configure 2009-11-03 00:21:01.676065790 +0200 +++ osmo-0.2.8/configure 2009-11-03 00:22:32.546061565 +0200 @@ -6773,9 +6773,9 @@ else fi -CFLAGS=${CFLAGS:="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"} -CXXFLAGS=${CXXFLAGS:="$CFLAGS"} -CPPFLAGS="" +CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS" +CXXFLAGS="$CFLAGS $CXXFLAGS" +CPPFLAGS="-D_GNU_SOURCE" LIBS="$tar_LIBS $gringotts_LIBS" ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile data/pixmaps/Makefile data/sounds/Makefile" Common subdirectories: osmo-0.2.8.orig/data and osmo-0.2.8/data Common subdirectories: osmo-0.2.8.orig/m4 and osmo-0.2.8/m4 Common subdirectories: osmo-0.2.8.orig/po and osmo-0.2.8/po Common subdirectories: osmo-0.2.8.orig/src and osmo-0.2.8/src Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/osmo/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 25 Nov 2008 09:56:34 -0000 1.6 +++ .cvsignore 2 Nov 2009 23:24:50 -0000 1.7 @@ -1 +1 @@ -osmo-0.2.4.tar.gz +osmo-0.2.8.tar.gz Index: osmo.spec =================================================================== RCS file: /cvs/pkgs/rpms/osmo/devel/osmo.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- osmo.spec 25 Jul 2009 21:00:41 -0000 1.14 +++ osmo.spec 2 Nov 2009 23:24:51 -0000 1.15 @@ -1,24 +1,25 @@ Summary: Personal organizer Summary(pl): Osobisty organizer Name: osmo -Version: 0.2.4 -Release: 7%{?dist} +Version: 0.2.8 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity -URL: http://clay.ll.pl/osmo/ +URL: http://clayo.org/osmo/ Source0: http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-configure.patch -Patch1: %{name}-%{version}-crash.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: hicolor-icon-theme -Requires: tzdata +Requires: tzdata +Requires: xdg-utils BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gtk2-devel +BuildRequires: gtkspell-devel BuildRequires: libical-devel BuildRequires: libgringotts-devel BuildRequires: libnotify-devel @@ -43,10 +44,10 @@ kt?re u?ytkownik mo?e zmieni?, by pr %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -%configure --with-gringrotts --with-libical --with-libsyncml +%configure --enable-backup=yes --enable-printing=yes \ + --with-gringrotts --with-libical --with-libsyncml make %{?_smp_mflags} %install @@ -59,8 +60,6 @@ make install INSTALL="%{__install} -p" D # icon mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps # Remove empty directory. rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/ @@ -96,13 +95,43 @@ fi %doc TRANSLATORS %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +%{_datadir}/icons/hicolor/22x22/apps/%{name}.png +%{_datadir}/icons/hicolor/24x24/apps/%{name}.png +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_mandir}/man1/%{name}.1* +%dir %{_datadir}/sounds/osmo +%{_datadir}/sounds/osmo/alarm.wav + %changelog -* Sat Jul 25 2009 Fedora Release Engineering - 0.2.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Tue Nov 03 2009 Debarshi Ray - 0.2.8-1 +- Version bump to 0.2.8. (Red Hat Bugzilla #512626) + * Encrypted data backup. + * Exporting tasks to iCal file. + * Text attributes are handled now in day notes editor. + * Default alarm sound for task reminder. + * Option to ignore weekend days in date calculator. + * Added new calendar marker for birthdays. + * Locale settings are used by default. + * Slightly improved iCal support. + * Unencrypted notes implemented. + * Calendar printing improvements. + * Spell checker support. + * Showing map location of selected contact using Google Maps. + * The order and width of columns is configurable. + * System tray support improvements. + * Many small improvements and fixes. + * Translation updates: ca, cs, de, el, es, fi, fr, it, jp, nl, pl, ru, sv, + tr and uk. + * http://clayo.org/osmo/ChangeLog +- Fix for crash due to SIGABRT merged upstream. +- Added 'Requires: xdg-utils' and 'BuildRequires: gtkspell-devel'. + +* Sat Jul 25 2009 Release Engineering - 0.2.4-7 +- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Sun Apr 19 2009 Debarshi Ray - 0.2.4-6 - Fixed configure to ensure correct usage of CFLAGS and CPPFLAGS, and respect @@ -124,6 +153,16 @@ fi * Mon Nov 24 2008 Debarshi Ray - 0.2.4-1 - Version bump to 0.2.4. (Red Hat Bugzilla #464484) + * Exporting calendar events to iCal file. + * Preliminary calendar and tasks list printing. + * Improved birthdays browser. + * Option to save data after every modification. + * Global notification command for tasks. + * Added --tinygui commandline option. + * Many bug fixes and enhancements. + * A temporary birthday logo. + * Translation updates: cs, de, es, fr, ja, nl, pl and tr. + * http://clayo.org/osmo/ChangeLog - Timezone information fix accepted by upstream. * Sun Jul 27 2008 Debarshi Ray - 0.2.2-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/osmo/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 25 Nov 2008 09:56:34 -0000 1.6 +++ sources 2 Nov 2009 23:24:51 -0000 1.7 @@ -1 +1 @@ -eca981d57e99fb18d55919d49a5dce9b osmo-0.2.4.tar.gz +7fa83efd27cd3ecc54e73f0ec4e91d81 osmo-0.2.8.tar.gz --- osmo-0.2.4-configure.patch DELETED --- --- osmo-0.2.4-crash.patch DELETED --- From rishi at fedoraproject.org Mon Nov 2 23:27:50 2009 From: rishi at fedoraproject.org (Debarshi Ray) Date: Mon, 2 Nov 2009 23:27:50 +0000 (UTC) Subject: rpms/osmo/F-12 osmo-0.2.8-configure.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 osmo.spec, 1.14, 1.15 sources, 1.6, 1.7 osmo-0.2.4-configure.patch, 1.1, NONE osmo-0.2.4-crash.patch, 1.1, NONE Message-ID: <20091102232751.77A9B11C0086@cvs1.fedora.phx.redhat.com> Author: rishi Update of /cvs/pkgs/rpms/osmo/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22104 Modified Files: .cvsignore osmo.spec sources Added Files: osmo-0.2.8-configure.patch Removed Files: osmo-0.2.4-configure.patch osmo-0.2.4-crash.patch Log Message: * Tue Nov 03 2009 Debarshi Ray - 0.2.8-1 - Version bump to 0.2.8. (Red Hat Bugzilla #512626) * Encrypted data backup. * Exporting tasks to iCal file. * Text attributes are handled now in day notes editor. * Default alarm sound for task reminder. * Option to ignore weekend days in date calculator. * Added new calendar marker for birthdays. * Locale settings are used by default. * Slightly improved iCal support. * Unencrypted notes implemented. * Calendar printing improvements. * Spell checker support. * Showing map location of selected contact using Google Maps. * The order and width of columns is configurable. * System tray support improvements. * Many small improvements and fixes. * Translation updates: ca, cs, de, el, es, fi, fr, it, jp, nl, pl, ru, sv, tr and uk. * http://clayo.org/osmo/ChangeLog - Fix for crash due to SIGABRT merged upstream. - Added 'Requires: xdg-utils' and 'BuildRequires: gtkspell-devel'. osmo-0.2.8-configure.patch: configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE osmo-0.2.8-configure.patch --- diff -uNp osmo-0.2.8.orig/configure osmo-0.2.8/configure --- osmo-0.2.8.orig/configure 2009-11-03 00:21:01.676065790 +0200 +++ osmo-0.2.8/configure 2009-11-03 00:22:32.546061565 +0200 @@ -6773,9 +6773,9 @@ else fi -CFLAGS=${CFLAGS:="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"} -CXXFLAGS=${CXXFLAGS:="$CFLAGS"} -CPPFLAGS="" +CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS" +CXXFLAGS="$CFLAGS $CXXFLAGS" +CPPFLAGS="-D_GNU_SOURCE" LIBS="$tar_LIBS $gringotts_LIBS" ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile data/pixmaps/Makefile data/sounds/Makefile" Common subdirectories: osmo-0.2.8.orig/data and osmo-0.2.8/data Common subdirectories: osmo-0.2.8.orig/m4 and osmo-0.2.8/m4 Common subdirectories: osmo-0.2.8.orig/po and osmo-0.2.8/po Common subdirectories: osmo-0.2.8.orig/src and osmo-0.2.8/src Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-12/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 25 Nov 2008 09:56:34 -0000 1.6 +++ .cvsignore 2 Nov 2009 23:27:48 -0000 1.7 @@ -1 +1 @@ -osmo-0.2.4.tar.gz +osmo-0.2.8.tar.gz Index: osmo.spec =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-12/osmo.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- osmo.spec 25 Jul 2009 21:00:41 -0000 1.14 +++ osmo.spec 2 Nov 2009 23:27:49 -0000 1.15 @@ -1,24 +1,25 @@ Summary: Personal organizer Summary(pl): Osobisty organizer Name: osmo -Version: 0.2.4 -Release: 7%{?dist} +Version: 0.2.8 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity -URL: http://clay.ll.pl/osmo/ +URL: http://clayo.org/osmo/ Source0: http://downloads.sourceforge.net/%{name}-pim/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-configure.patch -Patch1: %{name}-%{version}-crash.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: hicolor-icon-theme -Requires: tzdata +Requires: tzdata +Requires: xdg-utils BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gtk2-devel +BuildRequires: gtkspell-devel BuildRequires: libical-devel BuildRequires: libgringotts-devel BuildRequires: libnotify-devel @@ -43,10 +44,10 @@ kt?re u?ytkownik mo?e zmieni?, by pr %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -%configure --with-gringrotts --with-libical --with-libsyncml +%configure --enable-backup=yes --enable-printing=yes \ + --with-gringrotts --with-libical --with-libsyncml make %{?_smp_mflags} %install @@ -59,8 +60,6 @@ make install INSTALL="%{__install} -p" D # icon mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps # Remove empty directory. rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/ @@ -96,13 +95,43 @@ fi %doc TRANSLATORS %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +%{_datadir}/icons/hicolor/22x22/apps/%{name}.png +%{_datadir}/icons/hicolor/24x24/apps/%{name}.png +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_mandir}/man1/%{name}.1* +%dir %{_datadir}/sounds/osmo +%{_datadir}/sounds/osmo/alarm.wav + %changelog -* Sat Jul 25 2009 Fedora Release Engineering - 0.2.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Tue Nov 03 2009 Debarshi Ray - 0.2.8-1 +- Version bump to 0.2.8. (Red Hat Bugzilla #512626) + * Encrypted data backup. + * Exporting tasks to iCal file. + * Text attributes are handled now in day notes editor. + * Default alarm sound for task reminder. + * Option to ignore weekend days in date calculator. + * Added new calendar marker for birthdays. + * Locale settings are used by default. + * Slightly improved iCal support. + * Unencrypted notes implemented. + * Calendar printing improvements. + * Spell checker support. + * Showing map location of selected contact using Google Maps. + * The order and width of columns is configurable. + * System tray support improvements. + * Many small improvements and fixes. + * Translation updates: ca, cs, de, el, es, fi, fr, it, jp, nl, pl, ru, sv, + tr and uk. + * http://clayo.org/osmo/ChangeLog +- Fix for crash due to SIGABRT merged upstream. +- Added 'Requires: xdg-utils' and 'BuildRequires: gtkspell-devel'. + +* Sat Jul 25 2009 Release Engineering - 0.2.4-7 +- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Sun Apr 19 2009 Debarshi Ray - 0.2.4-6 - Fixed configure to ensure correct usage of CFLAGS and CPPFLAGS, and respect @@ -124,6 +153,16 @@ fi * Mon Nov 24 2008 Debarshi Ray - 0.2.4-1 - Version bump to 0.2.4. (Red Hat Bugzilla #464484) + * Exporting calendar events to iCal file. + * Preliminary calendar and tasks list printing. + * Improved birthdays browser. + * Option to save data after every modification. + * Global notification command for tasks. + * Added --tinygui commandline option. + * Many bug fixes and enhancements. + * A temporary birthday logo. + * Translation updates: cs, de, es, fr, ja, nl, pl and tr. + * http://clayo.org/osmo/ChangeLog - Timezone information fix accepted by upstream. * Sun Jul 27 2008 Debarshi Ray - 0.2.2-2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/osmo/F-12/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 25 Nov 2008 09:56:34 -0000 1.6 +++ sources 2 Nov 2009 23:27:49 -0000 1.7 @@ -1 +1 @@ -eca981d57e99fb18d55919d49a5dce9b osmo-0.2.4.tar.gz +7fa83efd27cd3ecc54e73f0ec4e91d81 osmo-0.2.8.tar.gz --- osmo-0.2.4-configure.patch DELETED --- --- osmo-0.2.4-crash.patch DELETED --- From nucleo at fedoraproject.org Mon Nov 2 23:53:27 2009 From: nucleo at fedoraproject.org (nucleo) Date: Mon, 2 Nov 2009 23:53:27 +0000 (UTC) Subject: rpms/kvirc/devel kvirc-cryptopp.patch, NONE, 1.1 kvirc.spec, 1.13, 1.14 Message-ID: <20091102235327.9EC0611C0086@cvs1.fedora.phx.redhat.com> Author: nucleo Update of /cvs/pkgs/rpms/kvirc/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29243 Modified Files: kvirc.spec Added Files: kvirc-cryptopp.patch Log Message: don't use embeded cryptopp kvirc-cryptopp.patch: CMakeLists.txt | 2 ++ src/modules/str/libkvistr.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) --- NEW FILE kvirc-cryptopp.patch --- --- kvirc-4.0rc1/CMakeLists.txt 2009-09-09 21:57:09.000000000 +0300 +++ kvirc-4.0rc1/CMakeLists.txt 2009-10-29 01:56:49.000000000 +0200 @@ -811,6 +811,8 @@ # needed for Rijndael/AES replacement and friends pkg_check_modules(CRYPTOPP libcrypto++>=5.0.0) + # for Fedora, per nucleo + pkg_check_modules(CRYPTOPP cryptopp>=5.0.0) IF(CRYPTOPP_FOUND) LIST(APPEND LIBS "-l${CRYPTOPP_LIBRARIES}") ELSE() --- kvirc-4.0rc1/src/modules/str/libkvistr.cpp 2009-09-09 21:57:01.000000000 +0300 +++ kvirc-4.0rc1/src/modules/str/libkvistr.cpp 2009-10-29 01:57:15.000000000 +0200 @@ -47,14 +47,14 @@ // but we can ignore that and therefore silence the warnings. #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 // Hashes (should cover most cases) - #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include + #include // Encoding - #include + #include // additional #include // template function Index: kvirc.spec =================================================================== RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- kvirc.spec 9 Sep 2009 21:05:26 -0000 1.13 +++ kvirc.spec 2 Nov 2009 23:53:25 -0000 1.14 @@ -3,16 +3,18 @@ Name: kvirc Version: 4.0.0 -Release: 0.17.%{pre}%{?dist} +Release: 0.18.%{pre}%{?dist} Summary: Free portable IRC client Group: Applications/Internet License: GPLv2+ with exceptions URL: http://kvirc.net/ Source0: ftp://ftp.kvirc.de/pub/kvirc/snapshots/source/%{name}-4.0%{pre}.tar.bz2 +Patch0: kvirc-cryptopp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs4-devel audiofile-devel esound-devel glib2-devel BuildRequires: perl-ExtUtils-Embed dbus-devel BuildRequires: cmake desktop-file-utils gettext doxygen graphviz +BuildRequires: cryptopp-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -24,13 +26,14 @@ many IRC addicted developers around the %prep %setup -q -n %{name}-4.0%{pre} +%patch0 -p1 %build %{cmake} \ %ifarch %{ix86} -DWITH_ix86_ASM=ON \ %endif --DWANT_NO_EMBEDDED_CODE=OFF \ +-DWANT_NO_EMBEDDED_CODE=ON \ -DWITHOUT_ESD=OFF \ -DWITHOUT_OSS=OFF \ -DWANT_COEXISTENCE=OFF \ @@ -126,6 +129,10 @@ gtk-update-icon-cache %{_datadir}/icons/ %exclude %{_mandir}/*.ISO8859-1/man1/%{name}.1.gz %changelog +* Tue Nov 3 2009 Alexey Kurov - 4.0.0-0.18.rc1 +- patch for using cryptopp includepath and pkgconfig file (rhbz#512761) +- added BR cryptopp-devel and -DWANT_NO_EMBEDDED_CODE=ON + * Wed Sep 9 2009 Alexey Kurov - 4.0.0-0.17.rc1 - disabled pyhton module, added -DWITHOUT_PYTHON=ON - removed BR python-devel From chkr at fedoraproject.org Tue Nov 3 00:22:45 2009 From: chkr at fedoraproject.org (chkr) Date: Tue, 3 Nov 2009 00:22:45 +0000 (UTC) Subject: rpms/monodevelop/F-12 monodevelop.spec,1.44,1.45 Message-ID: <20091103002245.5AD8111C0086@cvs1.fedora.phx.redhat.com> Author: chkr Update of /cvs/pkgs/rpms/monodevelop/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5708 Modified Files: monodevelop.spec Log Message: * Tue Nov 03 2009 Christian Krause - 2.1.0-3 - Fix monodevelop and mdtool wrapper scripts for x86_64 (BZ #528514) Index: monodevelop.spec =================================================================== RCS file: /cvs/pkgs/rpms/monodevelop/F-12/monodevelop.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- monodevelop.spec 21 Sep 2009 08:11:48 -0000 1.44 +++ monodevelop.spec 3 Nov 2009 00:22:44 -0000 1.45 @@ -6,7 +6,7 @@ Name: monodevelop Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A full-featured IDE for Mono and Gtk# Group: Development/Tools @@ -58,8 +58,8 @@ Development files for %{name}. sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' \ -e 's!${exec_prefix}/lib!%{_libdir}!' configure -sed -i -e 's!/lib/monodevelop!/%{_lib}/monodevelop!' monodevelop -sed -i -e 's!$PREFIX/lib/!%{_libdir}/!' mdtool.in +sed -i -e 's!mdtool}/lib/!mdtool}/%{_lib}/!' mdtool.in +sed -i -e 's!monodevelop}/lib/!monodevelop}/%{_lib}/!' monodevelop.in find . -name Makefile.in -or -name \*.pc.in \ @@ -140,6 +140,9 @@ update-desktop-database &> /dev/null || %{_libdir}/pkgconfig/monodevelop*.pc %changelog +* Tue Nov 03 2009 Christian Krause - 2.1.0-3 +- Fix monodevelop and mdtool wrapper scripts for x86_64 (BZ #528514) + * Mon Sep 21 2009 Michel Salim - 2.1.0-2 - Properly disable bundled Mono.Cecil and NUnit - Readjust launcher script (bz #523695) From deji at fedoraproject.org Tue Nov 3 00:49:22 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Tue, 3 Nov 2009 00:49:22 +0000 (UTC) Subject: rpms/xcompmgr/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xcompmgr.spec, 1.9, 1.10 Message-ID: <20091103004922.D9EEF11C0086@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/xcompmgr/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14367 Modified Files: .cvsignore sources xcompmgr.spec Log Message: * Mon Nov 02 2009 Deji Akingunola - 1.1.5-1 - New release 1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/xcompmgr/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 7 Mar 2008 04:35:10 -0000 1.3 +++ .cvsignore 3 Nov 2009 00:49:21 -0000 1.4 @@ -1 +1 @@ -xcompmgr-1.1.4.tar.bz2 +xcompmgr-1.1.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xcompmgr/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 7 Mar 2008 04:35:10 -0000 1.3 +++ sources 3 Nov 2009 00:49:21 -0000 1.4 @@ -1 +1 @@ -3eb1c2b7a6ceaec4ee872cb06d202d91 xcompmgr-1.1.4.tar.bz2 +bf8faa8c540bfdcd0252801d8f16d868 xcompmgr-1.1.5.tar.bz2 Index: xcompmgr.spec =================================================================== RCS file: /cvs/pkgs/rpms/xcompmgr/devel/xcompmgr.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- xcompmgr.spec 27 Jul 2009 07:41:29 -0000 1.9 +++ xcompmgr.spec 3 Nov 2009 00:49:21 -0000 1.10 @@ -1,7 +1,7 @@ Summary: X11 composite manager Name: xcompmgr -Version: 1.1.4 -Release: 3%{?dist} +Version: 1.1.5 +Release: 1%{?dist} License: Copyright only Group: User Interface/X URL: http://xapps.freedesktop.org @@ -35,11 +35,14 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog +%doc ChangeLog COPYING README %{_bindir}/xcompmgr %{_mandir}/man1/xcompmgr.1.gz %changelog +* Mon Nov 02 2009 Deji Akingunola - 1.1.5-1 +- New release 1.1.5 + * Mon Jul 27 2009 Fedora Release Engineering - 1.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From deji at fedoraproject.org Tue Nov 3 01:03:37 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Tue, 3 Nov 2009 01:03:37 +0000 (UTC) Subject: rpms/xcompmgr/F-12 sources,1.3,1.4 xcompmgr.spec,1.9,1.10 Message-ID: <20091103010337.51B6711C0086@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/xcompmgr/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17943 Modified Files: sources xcompmgr.spec Log Message: * Mon Nov 02 2009 Deji Akingunola - 1.1.5-1 - New release 1.1.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xcompmgr/F-12/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 7 Mar 2008 04:35:10 -0000 1.3 +++ sources 3 Nov 2009 01:03:35 -0000 1.4 @@ -1 +1 @@ -3eb1c2b7a6ceaec4ee872cb06d202d91 xcompmgr-1.1.4.tar.bz2 +bf8faa8c540bfdcd0252801d8f16d868 xcompmgr-1.1.5.tar.bz2 Index: xcompmgr.spec =================================================================== RCS file: /cvs/pkgs/rpms/xcompmgr/F-12/xcompmgr.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- xcompmgr.spec 27 Jul 2009 07:41:29 -0000 1.9 +++ xcompmgr.spec 3 Nov 2009 01:03:35 -0000 1.10 @@ -1,7 +1,7 @@ Summary: X11 composite manager Name: xcompmgr -Version: 1.1.4 -Release: 3%{?dist} +Version: 1.1.5 +Release: 1%{?dist} License: Copyright only Group: User Interface/X URL: http://xapps.freedesktop.org @@ -35,11 +35,14 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog +%doc ChangeLog COPYING README %{_bindir}/xcompmgr %{_mandir}/man1/xcompmgr.1.gz %changelog +* Mon Nov 02 2009 Deji Akingunola - 1.1.5-1 +- New release 1.1.5 + * Mon Jul 27 2009 Fedora Release Engineering - 1.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From deji at fedoraproject.org Tue Nov 3 01:04:20 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Tue, 3 Nov 2009 01:04:20 +0000 (UTC) Subject: rpms/xcompmgr/F-11 sources,1.3,1.4 xcompmgr.spec,1.8,1.9 Message-ID: <20091103010420.C85C511C0086@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/xcompmgr/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18205 Modified Files: sources xcompmgr.spec Log Message: * Mon Nov 02 2009 Deji Akingunola - 1.1.5-1 - New release 1.1.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xcompmgr/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 7 Mar 2008 04:35:10 -0000 1.3 +++ sources 3 Nov 2009 01:04:19 -0000 1.4 @@ -1 +1 @@ -3eb1c2b7a6ceaec4ee872cb06d202d91 xcompmgr-1.1.4.tar.bz2 +bf8faa8c540bfdcd0252801d8f16d868 xcompmgr-1.1.5.tar.bz2 Index: xcompmgr.spec =================================================================== RCS file: /cvs/pkgs/rpms/xcompmgr/F-11/xcompmgr.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- xcompmgr.spec 26 Feb 2009 08:09:13 -0000 1.8 +++ xcompmgr.spec 3 Nov 2009 01:04:20 -0000 1.9 @@ -1,7 +1,7 @@ Summary: X11 composite manager Name: xcompmgr -Version: 1.1.4 -Release: 2%{?dist} +Version: 1.1.5 +Release: 1%{?dist} License: Copyright only Group: User Interface/X URL: http://xapps.freedesktop.org @@ -35,11 +35,14 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog +%doc ChangeLog COPYING README %{_bindir}/xcompmgr %{_mandir}/man1/xcompmgr.1.gz %changelog +* Mon Nov 02 2009 Deji Akingunola - 1.1.5-1 +- New release 1.1.5 + * Thu Feb 26 2009 Fedora Release Engineering - 1.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From deji at fedoraproject.org Tue Nov 3 01:06:18 2009 From: deji at fedoraproject.org (Deji Akingunola) Date: Tue, 3 Nov 2009 01:06:18 +0000 (UTC) Subject: rpms/xcompmgr/F-10 sources,1.3,1.4 xcompmgr.spec,1.7,1.8 Message-ID: <20091103010618.630C511C0086@cvs1.fedora.phx.redhat.com> Author: deji Update of /cvs/pkgs/rpms/xcompmgr/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18704 Modified Files: sources xcompmgr.spec Log Message: * Mon Nov 02 2009 Deji Akingunola - 1.1.5-1 - New release 1.1.5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/xcompmgr/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 7 Mar 2008 04:35:10 -0000 1.3 +++ sources 3 Nov 2009 01:06:16 -0000 1.4 @@ -1 +1 @@ -3eb1c2b7a6ceaec4ee872cb06d202d91 xcompmgr-1.1.4.tar.bz2 +bf8faa8c540bfdcd0252801d8f16d868 xcompmgr-1.1.5.tar.bz2 Index: xcompmgr.spec =================================================================== RCS file: /cvs/pkgs/rpms/xcompmgr/F-10/xcompmgr.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- xcompmgr.spec 7 Mar 2008 04:35:10 -0000 1.7 +++ xcompmgr.spec 3 Nov 2009 01:06:17 -0000 1.8 @@ -1,6 +1,6 @@ Summary: X11 composite manager Name: xcompmgr -Version: 1.1.4 +Version: 1.1.5 Release: 1%{?dist} License: Copyright only Group: User Interface/X @@ -35,11 +35,14 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog +%doc ChangeLog COPYING README %{_bindir}/xcompmgr %{_mandir}/man1/xcompmgr.1.gz %changelog +* Mon Nov 02 2009 Deji Akingunola - 1.1.5-1 +- New release 1.1.5 + * Thu Mar 06 2008 Deji Akingunola - 1.1.4-1 - New release 1.1.4 From iankent at fedoraproject.org Tue Nov 3 01:23:47 2009 From: iankent at fedoraproject.org (Ian Kent) Date: Tue, 3 Nov 2009 01:23:47 +0000 (UTC) Subject: rpms/autofs/F-12 autofs-5.0.4-add-mount-wait-parameter.patch, NONE, 1.1 autofs-5.0.5-fix-backwards-ifndef-INET6.patch, NONE, 1.1 autofs-5.0.5-fix-included-map-read-fail-handling.patch, NONE, 1.1 autofs-5.0.5-fix-libxml2-workaround-configure.patch, NONE, 1.1 autofs-5.0.5-fix-stale-init-for-file-map-instance.patch, NONE, 1.1 autofs-5.0.5-more-code-analysis-corrections.patch, NONE, 1.1 autofs-5.0.5-refactor-ldap-sasl-bind.patch, NONE, 1.1 autofs-5.0.5-special-case-cifs-escapes.patch, NONE, 1.1 autofs.spec, 1.288, 1.289 Message-ID: <20091103012347.3EC7211C0086@cvs1.fedora.phx.redhat.com> Author: iankent Update of /cvs/pkgs/rpms/autofs/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25201 Modified Files: autofs.spec Added Files: autofs-5.0.4-add-mount-wait-parameter.patch autofs-5.0.5-fix-backwards-ifndef-INET6.patch autofs-5.0.5-fix-included-map-read-fail-handling.patch autofs-5.0.5-fix-libxml2-workaround-configure.patch autofs-5.0.5-fix-stale-init-for-file-map-instance.patch autofs-5.0.5-more-code-analysis-corrections.patch autofs-5.0.5-refactor-ldap-sasl-bind.patch autofs-5.0.5-special-case-cifs-escapes.patch Log Message: * Tue Nov 3 2009 Ian Kent - 1:5.0.5-4 - fix included map read fail handling. - refactor ldap sasl authentication bind to eliminate extra connect causing some servers to reject the request. - add mount wait parameter to allow timeout of mount requests to unresponsive servers. - special case cifs escape handling. - fix libxml2 workaround configure. - more code analysis corrections (and fix a typo in an init script). - fix backwards #ifndef INET6. - fix stale initialization for file map instance. autofs-5.0.4-add-mount-wait-parameter.patch: CHANGELOG | 1 + daemon/spawn.c | 3 ++- include/defaults.h | 2 ++ lib/defaults.c | 13 +++++++++++++ man/auto.master.5.in | 7 +++++++ redhat/autofs.sysconfig.in | 9 +++++++++ samples/autofs.conf.default.in | 9 +++++++++ 7 files changed, 43 insertions(+), 1 deletion(-) --- NEW FILE autofs-5.0.4-add-mount-wait-parameter.patch --- autofs-5.0.4 - add mount wait parameter From: Ian Kent Often delays when trying to mount from a server that is not reponding for some reason are undesirable. To try and prevent these delays we provide a configuration setting to limit the time that we wait for our spawned mount(8) process to complete before sending it a SIGTERM signal. This patch adds a configuration parameter to allow us to request we limit the time we wait for mount(8) to complete before send it a TERM signal. --- CHANGELOG | 1 + daemon/spawn.c | 3 ++- include/defaults.h | 2 ++ lib/defaults.c | 13 +++++++++++++ man/auto.master.5.in | 7 +++++++ redhat/autofs.sysconfig.in | 9 +++++++++ samples/autofs.conf.default.in | 9 +++++++++ 7 files changed, 43 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5adcca5..fadb229 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ ----------------------- - fix included map read fail handling. - refactor ldap sasl bind handling. +- add mount wait timeout parameter. 03/09/2009 autofs-5.0.5 ----------------------- diff --git a/daemon/spawn.c b/daemon/spawn.c index e02d926..db356d4 100644 --- a/daemon/spawn.c +++ b/daemon/spawn.c @@ -305,6 +305,7 @@ int spawn_mount(unsigned logopt, ...) unsigned int options; unsigned int retries = MTAB_LOCK_RETRIES; int update_mtab = 1, ret, printed = 0; + unsigned int wait = defaults_get_mount_wait(); char buf[PATH_MAX]; /* If we use mount locking we can't validate the location */ @@ -355,7 +356,7 @@ int spawn_mount(unsigned logopt, ...) va_end(arg); while (retries--) { - ret = do_spawn(logopt, -1, options, prog, (const char **) argv); + ret = do_spawn(logopt, wait, options, prog, (const char **) argv); if (ret & MTAB_NOTUPDATED) { struct timespec tm = {3, 0}; diff --git a/include/defaults.h b/include/defaults.h index 9bf16e5..cda2174 100644 --- a/include/defaults.h +++ b/include/defaults.h @@ -24,6 +24,7 @@ #define DEFAULT_TIMEOUT 600 #define DEFAULT_NEGATIVE_TIMEOUT 60 +#define DEFAULT_MOUNT_WAIT -1 #define DEFAULT_UMOUNT_WAIT 12 #define DEFAULT_BROWSE_MODE 1 #define DEFAULT_LOGGING 0 @@ -64,6 +65,7 @@ struct ldap_searchdn *defaults_get_searchdns(void); void defaults_free_searchdns(struct ldap_searchdn *); unsigned int defaults_get_mount_nfs_default_proto(void); unsigned int defaults_get_append_options(void); +unsigned int defaults_get_mount_wait(void); unsigned int defaults_get_umount_wait(void); const char *defaults_get_auth_conf_file(void); unsigned int defaults_get_map_hash_table_size(void); diff --git a/lib/defaults.c b/lib/defaults.c index 17164bd..2204b18 100644 --- a/lib/defaults.c +++ b/lib/defaults.c @@ -47,6 +47,7 @@ #define ENV_MOUNT_NFS_DEFAULT_PROTOCOL "MOUNT_NFS_DEFAULT_PROTOCOL" #define ENV_APPEND_OPTIONS "APPEND_OPTIONS" +#define ENV_MOUNT_WAIT "MOUNT_WAIT" #define ENV_UMOUNT_WAIT "UMOUNT_WAIT" #define ENV_AUTH_CONF_FILE "AUTH_CONF_FILE" @@ -325,6 +326,7 @@ unsigned int defaults_read_config(unsigned int to_syslog) check_set_config_value(key, ENV_NAME_ENTRY_ATTR, value, to_syslog) || check_set_config_value(key, ENV_NAME_VALUE_ATTR, value, to_syslog) || check_set_config_value(key, ENV_APPEND_OPTIONS, value, to_syslog) || + check_set_config_value(key, ENV_MOUNT_WAIT, value, to_syslog) || check_set_config_value(key, ENV_UMOUNT_WAIT, value, to_syslog) || check_set_config_value(key, ENV_AUTH_CONF_FILE, value, to_syslog) || check_set_config_value(key, ENV_MAP_HASH_TABLE_SIZE, value, to_syslog) || @@ -667,6 +669,17 @@ unsigned int defaults_get_append_options(void) return res; } +unsigned int defaults_get_mount_wait(void) +{ + long wait; + + wait = get_env_number(ENV_MOUNT_WAIT); + if (wait < 0) + wait = DEFAULT_MOUNT_WAIT; + + return (unsigned int) wait; +} + unsigned int defaults_get_umount_wait(void) { long wait; diff --git a/man/auto.master.5.in b/man/auto.master.5.in index 71c4402..792035f 100644 --- a/man/auto.master.5.in +++ b/man/auto.master.5.in @@ -174,6 +174,13 @@ Set the default timeout for caching failed key lookups (program default 60). If the equivalent command line option is given it will override this setting. .TP +.B MOUNT_WAIT +Set the default time to wait for a response from a spawned mount(8) +before sending it a SIGTERM. Note that we still need to wait for the +RPC layer to timeout before the sub-process exits so this isn't ideal +but it is the best we can do. The default is to wait until mount(8) +returns without intervention. +.TP .B UMOUNT_WAIT Set the default time to wait for a response from a spawned umount(8) before sending it a SIGTERM. Note that we still need to wait for the diff --git a/redhat/autofs.sysconfig.in b/redhat/autofs.sysconfig.in index 37448ea..c72cd2b 100644 --- a/redhat/autofs.sysconfig.in +++ b/redhat/autofs.sysconfig.in @@ -14,6 +14,15 @@ TIMEOUT=300 # #NEGATIVE_TIMEOUT=60 # +# MOUNT_WAIT - time to wait for a response from umount(8). +# Setting this timeout can cause problems when +# mount would otherwise wait for a server that +# is temporarily unavailable, such as when it's +# restarting. The defailt of waiting for mount(8) +# usually results in a wait of around 3 minutes. +# +#MOUNT_WAIT=-1 +# # UMOUNT_WAIT - time to wait for a response from umount(8). # #UMOUNT_WAIT=12 diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in index 7dee5fd..b87c4d0 100644 --- a/samples/autofs.conf.default.in +++ b/samples/autofs.conf.default.in @@ -14,6 +14,15 @@ TIMEOUT=300 # #NEGATIVE_TIMEOUT=60 # +# MOUNT_WAIT - time to wait for a response from umount(8). +# Setting this timeout can cause problems when +# mount would otherwise wait for a server that +# is temporarily unavailable, such as when it's +# restarting. The defailt of waiting for mount(8) +# usually results in a wait of around 3 minutes. +# +#MOUNT_WAIT=-1 +# # UMOUNT_WAIT - time to wait for a response from umount(8). # #UMOUNT_WAIT=12 autofs-5.0.5-fix-backwards-ifndef-INET6.patch: CHANGELOG | 1 + modules/replicated.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE autofs-5.0.5-fix-backwards-ifndef-INET6.patch --- autofs-5.0.5 - fix backwards #ifndef INET6 From: Jeff Moyer Fix reversed macro checks for INET6 in get_proximity(). Signed-off-by: Jeff Moyer --- CHANGELOG | 1 + modules/replicated.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b9b1602..7997d1d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ - special case cifs escapes. - fix compile fail with when LDAP is excluded. - more code analysis corrections (and fix a typo in an init script). +- fix backwards #ifndef INET6. 03/09/2009 autofs-5.0.5 ----------------------- diff --git a/modules/replicated.c b/modules/replicated.c index a66de9f..4cd3eb4 100644 --- a/modules/replicated.c +++ b/modules/replicated.c @@ -231,7 +231,7 @@ static unsigned int get_proximity(struct sockaddr *host_addr) break; case AF_INET6: -#ifndef INET6 +#ifdef INET6 if (host_addr->sa_family == AF_INET) break; @@ -313,7 +313,7 @@ static unsigned int get_proximity(struct sockaddr *host_addr) break; case AF_INET6: -#ifndef INET6 +#ifdef INET6 if (host_addr->sa_family == AF_INET) break; autofs-5.0.5-fix-included-map-read-fail-handling.patch: CHANGELOG | 4 ++++ modules/lookup_file.c | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) --- NEW FILE autofs-5.0.5-fix-included-map-read-fail-handling.patch --- autofs-5.0.5 - fix included map read fail handling From: Ian Kent If an included map read fails an error is returned and subsequent master map entries are not read. We should report the failure but we shouldn't stop reading the master map. --- CHANGELOG | 4 ++++ modules/lookup_file.c | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e734cb3..674a48b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +??/??/20?? autofs-5.0.6 +----------------------- +- fix included map read fail handling. + 03/09/2009 autofs-5.0.5 ----------------------- - fix dumb libxml2 check diff --git a/modules/lookup_file.c b/modules/lookup_file.c index a4ca39d..e43ab2f 100644 --- a/modules/lookup_file.c +++ b/modules/lookup_file.c @@ -438,13 +438,6 @@ int lookup_read_master(struct master *master, time_t age, void *context) MODPREFIX "failed to read included master map %s", master->name); - if (!master->recurse) { - master->name = save_name; - master->depth--; - master->recurse = 0; - fclose(f); - return NSS_STATUS_UNAVAIL; - } } master->depth--; master->recurse = 0; autofs-5.0.5-fix-libxml2-workaround-configure.patch: CHANGELOG | 1 + daemon/Makefile | 2 -- daemon/automount.c | 8 +++++--- 3 files changed, 6 insertions(+), 5 deletions(-) --- NEW FILE autofs-5.0.5-fix-libxml2-workaround-configure.patch --- autofs-5.0.5 - fix libxml2 workaround configure From: Ian Kent The configure logic related to work around the libxml2 library reload issues is not quite right. The xml code is needed if ldap is used so it is sufficient to require inclusion of the workaround code if autofs is being built with LDAP support. --- CHANGELOG | 1 + daemon/Makefile | 2 -- daemon/automount.c | 8 +++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 671c979..23351c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ - refactor ldap sasl bind handling. - add mount wait timeout parameter. - special case cifs escapes. +- fix compile fail with when LDAP is excluded. 03/09/2009 autofs-5.0.5 ----------------------- diff --git a/daemon/Makefile b/daemon/Makefile index 371ec72..9e9d635 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -23,10 +23,8 @@ LDFLAGS += -rdynamic LIBS = -ldl ifeq ($(LDAP), 1) - ifeq ($(SASL), 1) CFLAGS += $(XML_FLAGS) LIBS += $(XML_LIBS) - endif endif all: automount diff --git a/daemon/automount.c b/daemon/automount.c index 979ecd6..7c44d4b 100644 --- a/daemon/automount.c +++ b/daemon/automount.c @@ -38,10 +38,12 @@ #include #include "automount.h" -#ifdef LIBXML2_WORKAROUND +#if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND) #include +#ifdef WITH_LDAP #include #endif +#endif const char *program; /* Initialized with argv[0] */ const char *version = VERSION_STRING; /* Program version */ @@ -2110,7 +2112,7 @@ int main(int argc, char *argv[]) exit(1); } -#ifdef LIBXML2_WORKAROUND +#if defined(WITH_LDAP) && defined(LIBXML2_WORKAROUND) void *dh_xml2 = dlopen("libxml2.so", RTLD_NOW); if (!dh_xml2) dh_xml2 = dlopen("libxml2.so.2", RTLD_NOW); @@ -2158,7 +2160,7 @@ int main(int argc, char *argv[]) if (dh_tirpc) dlclose(dh_tirpc); #endif -#ifdef LIBXML2_WORKAROUND +#if defined(WITH_LDAP) && defined( LIBXML2_WORKAROUND) if (dh_xml2) { xmlCleanupParser(); dlclose(dh_xml2); autofs-5.0.5-fix-stale-init-for-file-map-instance.patch: CHANGELOG | 1 + daemon/lookup.c | 1 + 2 files changed, 2 insertions(+) --- NEW FILE autofs-5.0.5-fix-stale-init-for-file-map-instance.patch --- autofs-5.0.5 - fix stale initialization for file map instance From: Ian Kent Somehow, during the changes to minimize reading of file maps, an error of not initializing a field of the map source instance structure got through undetected. This has the effect of preventing all file map lookups, following the first one, to fail. --- CHANGELOG | 1 + daemon/lookup.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7997d1d..8b62370 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ - fix compile fail with when LDAP is excluded. - more code analysis corrections (and fix a typo in an init script). - fix backwards #ifndef INET6. +- fix stale initialization for file map instance. 03/09/2009 autofs-5.0.5 ----------------------- diff --git a/daemon/lookup.c b/daemon/lookup.c index 9d5a5c8..665ada0 100644 --- a/daemon/lookup.c +++ b/daemon/lookup.c @@ -398,6 +398,7 @@ static enum nsswitch_status read_map_source(struct nss_source *this, tmap.instance = map->instance; tmap.recurse = map->recurse; tmap.depth = map->depth; + tmap.stale = map->stale; tmap.argc = 0; tmap.argv = NULL; autofs-5.0.5-more-code-analysis-corrections.patch: CHANGELOG | 1 + daemon/direct.c | 2 +- daemon/state.c | 5 +++-- lib/alarm.c | 3 ++- lib/defaults.c | 1 - lib/master.c | 6 +----- modules/cyrus-sasl.c | 2 +- modules/lookup_ldap.c | 13 +++++++++++-- modules/mount_autofs.c | 2 +- modules/parse_sun.c | 3 +-- redhat/autofs.init.in | 2 +- 11 files changed, 23 insertions(+), 17 deletions(-) --- NEW FILE autofs-5.0.5-more-code-analysis-corrections.patch --- autofs-5.0.5 - more code analysis corrections (and fix a typo in an init script) From: Jeff Moyer - fix an obvious type in Redhat init script. - don't call ldap_msgfree when result pointer is null. - check return of ldap_parse_result as pointers will be invalid on fail. - get rid of a bogus assignment in defaults_free_searchdns. - get rid of unused optlen variable in parse_sun.c. - check return status of stat(2) in do_mount_direct(). - get rid of unused name variable in master_add_map_source(). - check return from ops->askumount() in expire_cleanup(). - in mount_autofs.c:mount_mount(), don't increment val since we never look at it again. - in autofs_sasl_dispose() ctxt must always be valid or we would have a much bigger problem. - in st_start_handler() and alarm_start_handler() it is possible for pthread_attr_destroy() to be called with a NULL pointer. - we could end up with a non-null result pointer after a failed call to ldap_search_s(), well maybe, so check for it anyway. Signed-off-by: Jeff Moyer --- CHANGELOG | 1 + daemon/direct.c | 2 +- daemon/state.c | 5 +++-- lib/alarm.c | 3 ++- lib/defaults.c | 1 - lib/master.c | 6 +----- modules/cyrus-sasl.c | 2 +- modules/lookup_ldap.c | 13 +++++++++++-- modules/mount_autofs.c | 2 +- modules/parse_sun.c | 3 +-- redhat/autofs.init.in | 2 +- 11 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 23351c8..b9b1602 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ - add mount wait timeout parameter. - special case cifs escapes. - fix compile fail with when LDAP is excluded. +- more code analysis corrections (and fix a typo in an init script). 03/09/2009 autofs-5.0.5 ----------------------- diff --git a/daemon/direct.c b/daemon/direct.c index 0c78627..9b4e57b 100644 --- a/daemon/direct.c +++ b/daemon/direct.c @@ -1245,7 +1245,7 @@ static void *do_mount_direct(void *arg) } status = stat(mt.name, &st); - if (!S_ISDIR(st.st_mode) || st.st_dev != mt.dev) { + if (status != 0 || !S_ISDIR(st.st_mode) || st.st_dev != mt.dev) { error(ap->logopt, "direct trigger not valid or already mounted %s", mt.name); diff --git a/daemon/state.c b/daemon/state.c index 71af46a..27bc6de 100644 --- a/daemon/state.c +++ b/daemon/state.c @@ -160,7 +160,7 @@ void expire_cleanup(void *arg) * been signaled to shutdown. */ rv = ops->askumount(ap->logopt, ap->ioctlfd, &idle); - if (!idle && !ap->shutdown) { + if (!rv && !idle && !ap->shutdown) { next = ST_READY; if (!ap->submount) alarm_add(ap, ap->exp_runfreq); @@ -1198,7 +1198,8 @@ int st_start_handler(void) status = pthread_create(&thid, pattrs, st_queue_handler, NULL); - pthread_attr_destroy(pattrs); + if (pattrs) + pthread_attr_destroy(pattrs); return !status; } diff --git a/lib/alarm.c b/lib/alarm.c index 46df38a..f403d8f 100755 --- a/lib/alarm.c +++ b/lib/alarm.c @@ -239,7 +239,8 @@ int alarm_start_handler(void) status = pthread_create(&thid, pattrs, alarm_handler, NULL); - pthread_attr_destroy(pattrs); + if (pattrs) + pthread_attr_destroy(pattrs); return !status; } diff --git a/lib/defaults.c b/lib/defaults.c index 2204b18..cb8354d 100644 --- a/lib/defaults.c +++ b/lib/defaults.c @@ -534,7 +534,6 @@ void defaults_free_searchdns(struct ldap_searchdn *sdn) struct ldap_searchdn *this = sdn; struct ldap_searchdn *next; - next = this; while (this) { next = this->next; free(this->basedn); diff --git a/lib/master.c b/lib/master.c index e43f835..8455f40 100644 --- a/lib/master.c +++ b/lib/master.c @@ -152,7 +152,7 @@ master_add_map_source(struct master_mapent *entry, { struct map_source *source; char *ntype, *nformat; - const char **tmpargv, *name = NULL; + const char **tmpargv; source = malloc(sizeof(struct map_source)); if (!source) @@ -188,10 +188,6 @@ master_add_map_source(struct master_mapent *entry, source->argc = argc; source->argv = tmpargv; - /* Can be NULL for "hosts" map */ - if (argv) - name = argv[0]; - master_source_writelock(entry); if (!entry->maps) diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c index 828143e..92e2226 100644 --- a/modules/cyrus-sasl.c +++ b/modules/cyrus-sasl.c @@ -911,7 +911,7 @@ void autofs_sasl_dispose(struct lookup_context *ctxt) { int status, ret; - if (ctxt && ctxt->sasl_conn) { + if (ctxt->sasl_conn) { sasl_dispose(&ctxt->sasl_conn); ctxt->sasl_conn = NULL; } diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c index f1fb9ce..d8bd169 100644 --- a/modules/lookup_ldap.c +++ b/modules/lookup_ldap.c @@ -389,13 +389,16 @@ static int get_query_dn(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt error(logopt, MODPREFIX "query failed for search dn %s: %s", this->basedn, ldap_err2string(rv)); + if (result) { + ldap_msgfree(result); + result = NULL; + } } this = this->next; } if (!result) { - ldap_msgfree(result); error(logopt, MODPREFIX "failed to find query dn under search base dns"); free(query); @@ -1954,6 +1957,12 @@ do_paged: sp->cookie = NULL; } + if (rv != LDAP_SUCCESS) { + debug(ap->logopt, + MODPREFIX "ldap_parse_result failed with %d", rv); + goto out_free; + } + /* * Parse the page control returned to get the cookie and * determine whether there are more pages. @@ -1970,8 +1979,8 @@ do_paged: if (returnedControls) ldap_controls_free(returnedControls); +out_free: ldap_control_free(pageControl); - return rv; } diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c index afb1859..2a5d860 100644 --- a/modules/mount_autofs.c +++ b/modules/mount_autofs.c @@ -119,7 +119,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, else if (strncmp(cp, "timeout=", 8) == 0) { char *val = strchr(cp, '='); unsigned tout; - if (val++) { + if (val) { int ret = sscanf(cp, "timeout=%u", &tout); if (ret) timeout = tout; diff --git a/modules/parse_sun.c b/modules/parse_sun.c index db36ae2..921daf4 100644 --- a/modules/parse_sun.c +++ b/modules/parse_sun.c @@ -1334,7 +1334,7 @@ int parse_mount(struct autofs_point *ap, const char *name, char *pmapent, *options; const char *p; int mapent_len, rv = 0; - int optlen, cur_state; + int cur_state; int slashify = ctxt->slashify_colons; unsigned int append_options; @@ -1389,7 +1389,6 @@ int parse_mount(struct autofs_point *ap, const char *name, logerr(MODPREFIX "strdup: %s", estr); return 1; } - optlen = strlen(options); p = skipspace(pmapent); diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in index fded1d8..806302b 100644 --- a/redhat/autofs.init.in +++ b/redhat/autofs.init.in @@ -172,7 +172,7 @@ case "$1" in fi ;; *) - echo $"Usage: $0 {start|forcestart|stop|status|restart|orcerestart|reload|condrestart}" + echo $"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|condrestart}" exit 1; ;; esac autofs-5.0.5-refactor-ldap-sasl-bind.patch: CHANGELOG | 1 modules/cyrus-sasl.c | 55 ++++++++++++++++++--------------------------- modules/lookup_ldap.c | 60 -------------------------------------------------- 3 files changed, 23 insertions(+), 93 deletions(-) --- NEW FILE autofs-5.0.5-refactor-ldap-sasl-bind.patch --- autofs-5.0.5 - refactor ldap sasl bind From: Ian Kent During the sasl authentication (and possible authentication method selection) we establish a connection and then dispose of it and then authenticate again. This is a little inefficient but some servers don't like a second authentication using the same LDAP handle and authentication fails when it should succeed. We should use the authentication connection once we get it and not perform another later. Also fixed with this patch. If a server returns a set of authentication mechanisms that all require authentication, then the connection pointer is returned to the caller uninitialized (reported and fix provided by Jeff Moyer). --- CHANGELOG | 1 + modules/cyrus-sasl.c | 55 ++++++++++++++++++--------------------------- modules/lookup_ldap.c | 60 ------------------------------------------------- 3 files changed, 23 insertions(+), 93 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 674a48b..5adcca5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ ??/??/20?? autofs-5.0.6 ----------------------- - fix included map read fail handling. +- refactor ldap sasl bind handling. 03/09/2009 autofs-5.0.5 ----------------------- diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c index 04001d0..828143e 100644 --- a/modules/cyrus-sasl.c +++ b/modules/cyrus-sasl.c @@ -87,8 +87,8 @@ static sasl_callback_t callbacks[] = { { SASL_CB_LIST_END, NULL, NULL }, }; -static char *sasl_auth_id, *sasl_auth_secret; -sasl_secret_t *sasl_secret; +static char *sasl_auth_id = NULL; +static char *sasl_auth_secret = NULL; static int sasl_log_func(void *context, int level, const char *message) @@ -798,7 +798,7 @@ sasl_bind_mech(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt, const c sasl_conn_t * sasl_choose_mech(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt) { - sasl_conn_t *conn; + sasl_conn_t *conn = NULL; int authenticated; int i; char **mechanisms; @@ -845,22 +845,6 @@ sasl_choose_mech(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt) return conn; } -int -autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt) -{ - sasl_conn_t *conn; - - if (!ctxt->sasl_mech) - return -1; - - conn = sasl_bind_mech(logopt, ldap, ctxt, ctxt->sasl_mech); - if (!conn) - return -1; - - ctxt->sasl_conn = conn; - return 0; -} - /* * Routine called when unbinding an ldap connection. */ @@ -883,35 +867,40 @@ autofs_sasl_unbind(struct lookup_context *ctxt) * -1 - Failure */ int -autofs_sasl_init(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt) +autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt) { - sasl_conn_t *conn; + sasl_conn_t *conn = NULL; + + /* If we already have a connection use it */ + if (ctxt->sasl_conn) + return 0; sasl_auth_id = ctxt->user; sasl_auth_secret = ctxt->secret; + if (ctxt->auth_required & LDAP_AUTH_AUTODETECT) { + if (ctxt->sasl_mech) { + free(ctxt->sasl_mech); + ctxt->sasl_mech = NULL; + } + } + /* * If LDAP_AUTH_AUTODETECT is set, it means that there was no * mechanism specified in the configuration file or auto * selection has been requested, so try to auto-select an * auth mechanism. */ - if (!(ctxt->auth_required & LDAP_AUTH_AUTODETECT)) + if (ctxt->sasl_mech) conn = sasl_bind_mech(logopt, ldap, ctxt, ctxt->sasl_mech); - else { - if (ctxt->sasl_mech) { - free(ctxt->sasl_mech); - ctxt->sasl_mech = NULL; - } + else conn = sasl_choose_mech(logopt, ldap, ctxt); - } - if (conn) { - sasl_dispose(&conn); - return 0; - } + if (!conn) + return -1; - return -1; + ctxt->sasl_conn = conn; + return 0; } /* diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c index 2ecf5fe..f1fb9ce 100644 --- a/modules/lookup_ldap.c +++ b/modules/lookup_ldap.c @@ -59,7 +59,6 @@ struct ldap_search_params { time_t age; }; -static LDAP *auth_init(unsigned logopt, const char *, struct lookup_context *); static int decode_percent_hack(const char *, char **); #ifndef HAVE_LDAP_CREATE_PAGE_CONTROL @@ -600,33 +599,6 @@ static LDAP *connect_to_server(unsigned logopt, const char *uri, struct lookup_c { LDAP *ldap; -#ifdef WITH_SASL - /* - * Determine which authentication mechanism to use if we require - * authentication. - */ - if (ctxt->auth_required & (LDAP_AUTH_REQUIRED|LDAP_AUTH_AUTODETECT)) { - ldap = auth_init(logopt, uri, ctxt); - if (!ldap && ctxt->auth_required & LDAP_AUTH_AUTODETECT) - info(logopt, - "no authentication mechanisms auto detected."); - if (!ldap) { - error(logopt, MODPREFIX - "cannot initialize authentication setup"); - return NULL; - } - - if (!do_bind(logopt, ldap, uri, ctxt)) { - unbind_ldap_connection(logopt, ldap, ctxt); - autofs_sasl_dispose(ctxt); - error(logopt, MODPREFIX "cannot bind to server"); - return NULL; - } - - return ldap; - } -#endif - ldap = do_connect(logopt, uri, ctxt); if (!ldap) { warn(logopt, @@ -1074,38 +1046,6 @@ out: return ret; } - -/* - * Reads in the xml configuration file and parses out the relevant - * information. If there is no configuration file, then we fall back to - * trying all supported authentication mechanisms until one works. - * - * Returns ldap connection on success, with authtype, user and secret - * filled in as appropriate. Returns NULL on failre. - */ -static LDAP *auth_init(unsigned logopt, const char *uri, struct lookup_context *ctxt) -{ - int ret; - LDAP *ldap; - - ldap = init_ldap_connection(logopt, uri, ctxt); - if (!ldap) - return NULL; - - /* - * Initialize the sasl library. It is okay if user and secret - * are NULL, here. - * - * The autofs_sasl_init routine will figure out which mechamism - * to use. If kerberos is used, it will also take care to initialize - * the credential cache and the client and service principals. - */ - ret = autofs_sasl_init(logopt, ldap, ctxt); - if (ret) - return NULL; - - return ldap; -} #endif /* autofs-5.0.5-special-case-cifs-escapes.patch: CHANGELOG | 1 + modules/mount_generic.c | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) --- NEW FILE autofs-5.0.5-special-case-cifs-escapes.patch --- autofs-5.0.5 - special case cifs escapes From: Ian Kent Since "\" is a valid seperator for cifs shares it can't be used to escape characters in the share name passed to mount.cifs. So we have no choice but to require that the seperator we use is "/" and de-quote the string before sending it to mount.cifs. --- CHANGELOG | 1 + modules/mount_generic.c | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fadb229..671c979 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ - fix included map read fail handling. - refactor ldap sasl bind handling. - add mount wait timeout parameter. +- special case cifs escapes. 03/09/2009 autofs-5.0.5 ----------------------- diff --git a/modules/mount_generic.c b/modules/mount_generic.c index 8edad8b..da85d1a 100644 --- a/modules/mount_generic.c +++ b/modules/mount_generic.c @@ -39,6 +39,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int { char fullpath[PATH_MAX]; char buf[MAX_ERR_BUF]; + char *loc; int err; int len, status, existed = 1; @@ -74,22 +75,44 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int if (!status) existed = 0; + /* + * Special case quoting for cifs share names. + * + * Since "\" is a valid seperator for cifs shares it can't be + * used to escape characters in the share name passed to + * mount.cifs. So we have no choice but to require that the + * seperator we use is "/" and de-quote the string before + * sending it to mount.cifs. + */ + loc = NULL; + if (strcmp(fstype, "cifs")) + loc = strdup(what); + else + loc = dequote(what, strlen(what), ap->logopt); + if (!loc) { + error(ap->logopt, + MODPREFIX "failed to alloc buffer for mount location"); + return 1; + } + if (options && options[0]) { debug(ap->logopt, MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", - fstype, options, what, fullpath); + fstype, options, loc, fullpath); err = spawn_mount(ap->logopt, "-t", fstype, - SLOPPYOPT "-o", options, what, fullpath, NULL); + SLOPPYOPT "-o", options, loc, fullpath, NULL); } else { debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s", - fstype, what, fullpath); - err = spawn_mount(ap->logopt, "-t", fstype, what, fullpath, NULL); + fstype, loc, fullpath); + err = spawn_mount(ap->logopt, "-t", fstype, loc, fullpath, NULL); } if (err) { info(ap->logopt, MODPREFIX "failed to mount %s (type %s) on %s", - what, fstype, fullpath); + loc, fstype, fullpath); + + free(loc); if (ap->type != LKP_INDIRECT) return 1; @@ -100,7 +123,8 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int return 1; } else { info(ap->logopt, MODPREFIX "mounted %s type %s on %s", - what, fstype, fullpath); + loc, fstype, fullpath); + free(loc); return 0; } } Index: autofs.spec =================================================================== RCS file: /cvs/pkgs/rpms/autofs/F-12/autofs.spec,v retrieving revision 1.288 retrieving revision 1.289 diff -u -p -r1.288 -r1.289 --- autofs.spec 4 Sep 2009 04:53:05 -0000 1.288 +++ autofs.spec 3 Nov 2009 01:23:45 -0000 1.289 @@ -4,12 +4,20 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.5 -Release: 1%{?dist} +Release: 4%{?dist} Epoch: 1 License: GPLv2+ Group: System Environment/Daemons URL: http://wiki.autofs.net/ Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2 +Patch1: autofs-5.0.5-fix-included-map-read-fail-handling.patch +Patch2: autofs-5.0.5-refactor-ldap-sasl-bind.patch +Patch3: autofs-5.0.4-add-mount-wait-parameter.patch +Patch4: autofs-5.0.5-special-case-cifs-escapes.patch +Patch5: autofs-5.0.5-fix-libxml2-workaround-configure.patch +Patch6: autofs-5.0.5-more-code-analysis-corrections.patch +Patch7: autofs-5.0.5-fix-backwards-ifndef-INET6.patch +Patch8: autofs-5.0.5-fix-stale-init-for-file-map-instance.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel Requires: kernel >= 2.6.17 @@ -51,6 +59,14 @@ inkludera n?tfilsystem, CD-ROM, floppyd %prep %setup -q echo %{version}-%{release} > .version +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -103,6 +119,18 @@ fi %{_libdir}/autofs/ %changelog +* Tue Nov 3 2009 Ian Kent - 1:5.0.5-4 +- fix included map read fail handling. +- refactor ldap sasl authentication bind to eliminate extra connect + causing some servers to reject the request. +- add mount wait parameter to allow timeout of mount requests to + unresponsive servers. +- special case cifs escape handling. +- fix libxml2 workaround configure. +- more code analysis corrections (and fix a typo in an init script). +- fix backwards #ifndef INET6. +- fix stale initialization for file map instance. + * Fri Sep 4 2009 Ian Kent - 1:5.0.5-1 - update source to latest upstream version. - this is essentially a consolidation of the patches already in this rpm. From iankent at fedoraproject.org Tue Nov 3 01:26:33 2009 From: iankent at fedoraproject.org (Ian Kent) Date: Tue, 3 Nov 2009 01:26:33 +0000 (UTC) Subject: rpms/autofs/devel autofs-5.0.5-fix-stale-init-for-file-map-instance.patch, NONE, 1.1 autofs.spec, 1.289, 1.290 Message-ID: <20091103012633.B600611C0086@cvs1.fedora.phx.redhat.com> Author: iankent Update of /cvs/pkgs/rpms/autofs/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25976 Modified Files: autofs.spec Added Files: autofs-5.0.5-fix-stale-init-for-file-map-instance.patch Log Message: * Tue Nov 3 2009 Ian Kent - 1:5.0.5-3 - fix stale initialization for file map instance. autofs-5.0.5-fix-stale-init-for-file-map-instance.patch: CHANGELOG | 1 + daemon/lookup.c | 1 + 2 files changed, 2 insertions(+) --- NEW FILE autofs-5.0.5-fix-stale-init-for-file-map-instance.patch --- autofs-5.0.5 - fix stale initialization for file map instance From: Ian Kent Somehow, during the changes to minimize reading of file maps, an error of not initializing a field of the map source instance structure got through undetected. This has the effect of preventing all file map lookups, following the first one, to fail. --- CHANGELOG | 1 + daemon/lookup.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7997d1d..8b62370 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ - fix compile fail with when LDAP is excluded. - more code analysis corrections (and fix a typo in an init script). - fix backwards #ifndef INET6. +- fix stale initialization for file map instance. 03/09/2009 autofs-5.0.5 ----------------------- diff --git a/daemon/lookup.c b/daemon/lookup.c index 9d5a5c8..665ada0 100644 --- a/daemon/lookup.c +++ b/daemon/lookup.c @@ -398,6 +398,7 @@ static enum nsswitch_status read_map_source(struct nss_source *this, tmap.instance = map->instance; tmap.recurse = map->recurse; tmap.depth = map->depth; + tmap.stale = map->stale; tmap.argc = 0; tmap.argv = NULL; Index: autofs.spec =================================================================== RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v retrieving revision 1.289 retrieving revision 1.290 diff -u -p -r1.289 -r1.290 --- autofs.spec 6 Oct 2009 05:23:13 -0000 1.289 +++ autofs.spec 3 Nov 2009 01:26:33 -0000 1.290 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -117,6 +117,9 @@ fi %{_libdir}/autofs/ %changelog +* Tue Nov 3 2009 Ian Kent - 1:5.0.5-3 +- fix stale initialization for file map instance. + * Tue Oct 6 2009 Ian Kent - 1:5.0.5-2 - fix included map read fail handling. - refactor ldap sasl authentication bind to eliminate extra connect From hadess at fedoraproject.org Tue Nov 3 01:59:39 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Nov 2009 01:59:39 +0000 (UTC) Subject: rpms/gnome-user-share/F-12 0001-Use-same-directories-in-nautilus-bar-and-app.patch, NONE, 1.1 gnome-user-share.spec, 1.65, 1.66 Message-ID: <20091103015940.0855D11C0086@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-user-share/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5742 Modified Files: gnome-user-share.spec Added Files: 0001-Use-same-directories-in-nautilus-bar-and-app.patch Log Message: * Tue Nov 03 2009 Bastien Nocera 2.28.1-2 - Update share bar code to use the same directories as the sharing code itself 0001-Use-same-directories-in-nautilus-bar-and-app.patch: Makefile.am | 16 +++++---- http.c | 2 - obexftp.c | 2 - share-extension.c | 18 ++++------ user_share-common.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ user_share-common.h | 30 +++++++++++++++++ user_share.c | 36 --------------------- 7 files changed, 139 insertions(+), 54 deletions(-) --- NEW FILE 0001-Use-same-directories-in-nautilus-bar-and-app.patch --- >From 814a647dece14962f878231970cf020f35f382e3 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 3 Nov 2009 01:54:12 +0000 Subject: [PATCH] Use same directories in nautilus bar and app We were using different ways to get the public and downloads dir. Whereas the main user-share had fallbacks to avoid sharing $HOME, the nautilus bar was using the special dirs without any fallbacks. This moves the common code to user_share-common.[ch] and makes sure that fallbacks are used in both cases. --- src/Makefile.am | 16 +++++--- src/http.c | 2 +- src/obexftp.c | 2 +- src/share-extension.c | 18 ++++------ src/user_share-common.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ src/user_share-common.h | 30 ++++++++++++++++ src/user_share.c | 35 +------------------ 7 files changed, 139 insertions(+), 53 deletions(-) create mode 100644 src/user_share-common.c create mode 100644 src/user_share-common.h diff --git a/src/Makefile.am b/src/Makefile.am index fa7aa0a..09e82e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,6 +14,9 @@ bin_PROGRAMS= \ libexec_PROGRAMS= \ gnome-user-share +noinst_LTLIBRARIES = libuser-share-common.la +libuser_share_common_la_SOURCES = user_share-common.c user_share-common.h + INCLUDES= \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ @@ -44,7 +47,8 @@ gnome_user_share_SOURCES = \ obexpush.h \ $(MARSHALFILES) -gnome_user_share_LDADD = \ +gnome_user_share_LDADD = \ + libuser-share-common.la \ $(USER_SHARE_LIBS) \ $(SELINUX_LIBS) \ $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) @@ -60,13 +64,13 @@ gnome_file_share_properties_LDADD = \ nautilus_extensiondir = $(NAUTILUSDIR) nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la -libnautilus_share_extension_la_SOURCES = \ - nautilus-share-bar.c \ - nautilus-share-bar.h \ - share-extension.c \ +libnautilus_share_extension_la_SOURCES = \ + nautilus-share-bar.c \ + nautilus-share-bar.h \ + share-extension.c \ $(NULL) -libnautilus_share_extension_la_LIBADD = $(EXTENSION_LIBS) +libnautilus_share_extension_la_LIBADD = libuser-share-common.la $(EXTENSION_LIBS) libnautilus_share_extension_la_LDFLAGS = -avoid-version -module -no-undefined EXTRA_DIST = marshal.list diff --git a/src/http.c b/src/http.c index 164b291..367394a 100644 --- a/src/http.c +++ b/src/http.c @@ -48,7 +48,7 @@ #include #endif -#include "user_share.h" +#include "user_share-common.h" #include "user_share-private.h" #include "http.h" diff --git a/src/obexftp.c b/src/obexftp.c index 89a98ce..02e8956 100644 --- a/src/obexftp.c +++ b/src/obexftp.c @@ -30,7 +30,7 @@ #include #include "obexftp.h" -#include "user_share.h" +#include "user_share-common.h" #include "user_share-private.h" static DBusGConnection *connection = NULL; diff --git a/src/share-extension.c b/src/share-extension.c index 2446d3f..0448414 100644 --- a/src/share-extension.c +++ b/src/share-extension.c @@ -31,6 +31,7 @@ #include #include "nautilus-share-bar.h" +#include "user_share-common.h" #define NAUTILUS_TYPE_SHARE (nautilus_share_get_type ()) #define NAUTILUS_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SHARE, NautilusShare)) @@ -154,18 +155,13 @@ nautilus_share_get_location_widget (NautilusLocationWidgetProvider *iface, g_object_unref (home); for (i = 0; i < G_N_ELEMENTS (special_dirs); i++) { - const char *path; - - path = g_get_user_special_dir (special_dirs[i]); - if (path != NULL) { - GFile *dir; - dir = g_file_new_for_path (path); - if (g_file_equal (dir, file)) { - enable = TRUE; - is_dir[i] = TRUE; - } - g_object_unref (dir); + GFile *dir; + dir = lookup_dir_with_fallback (special_dirs[i]); + if (g_file_equal (dir, file)) { + enable = TRUE; + is_dir[i] = TRUE; } + g_object_unref (dir); } if (enable == FALSE) diff --git a/src/user_share-common.c b/src/user_share-common.c new file mode 100644 index 0000000..31389eb --- /dev/null +++ b/src/user_share-common.c @@ -0,0 +1,89 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * Copyright (C) 2004-2009 Red Hat, Inc. + * + * Nautilus is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * Nautilus is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors: Alexander Larsson + * Bastien Nocera + * + */ + +#include "user_share-common.h" + +static char * +lookup_special_dir (GUserDirectory directory, + const char *name, + gboolean create_dir) +{ + const char *special_dir; + char *dir; + + special_dir = g_get_user_special_dir (directory); + if (special_dir != NULL && strcmp (special_dir, g_get_home_dir ()) != 0) { + if (create_dir != FALSE) + g_mkdir_with_parents (special_dir, 0755); + return g_strdup (special_dir); + } + + dir = g_build_filename (g_get_home_dir (), name, NULL); + if (create_dir != FALSE) + g_mkdir_with_parents (dir, 0755); + return dir; +} + +char * +lookup_public_dir (void) +{ + return lookup_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE, + "Public", + TRUE); +} + +char * +lookup_download_dir (void) +{ + return lookup_special_dir (G_USER_DIRECTORY_DOWNLOAD, + "Downloads", + TRUE); +} + +GFile * +lookup_dir_with_fallback (GUserDirectory directory) +{ + GFile *file; + char *path; + const char *name; + + if (directory == G_USER_DIRECTORY_PUBLIC_SHARE) + name = "Public"; + else if (directory == G_USER_DIRECTORY_DOWNLOAD) + name = "Downloads"; + else + g_assert_not_reached (); + + path = lookup_special_dir (directory, + name, + FALSE); + + if (path == NULL) + return NULL; + + file = g_file_new_for_path (path); + g_free (path); + + return file; +} diff --git a/src/user_share-common.h b/src/user_share-common.h new file mode 100644 index 0000000..1b87c7c --- /dev/null +++ b/src/user_share-common.h @@ -0,0 +1,30 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * Copyright (C) 2004-2009 Red Hat, Inc. + * + * Nautilus is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * Nautilus is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors: Alexander Larsson + * Bastien Nocera + * + */ + +#include +#include + +char *lookup_public_dir (void); +char *lookup_download_dir (void); +GFile *lookup_dir_with_fallback (GUserDirectory directory); diff --git a/src/user_share.c b/src/user_share.c index ab6a7ca..1976424 100644 --- a/src/user_share.c +++ b/src/user_share.c @@ -31,6 +31,7 @@ #include "user_share.h" #include "user_share-private.h" +#include "user_share-common.h" #include "http.h" #include "obexftp.h" #include "obexpush.h" @@ -262,40 +263,6 @@ bluez_init (void) G_CALLBACK (default_adapter_changed), NULL); } -char * -lookup_public_dir (void) -{ - const char *public_dir; - char *dir; - - public_dir = g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE); - if (public_dir != NULL && strcmp (public_dir, g_get_home_dir ()) != 0) { - g_mkdir_with_parents (public_dir, 0755); - return g_strdup (public_dir); - } - - dir = g_build_filename (g_get_home_dir (), "Public", NULL); - g_mkdir_with_parents (dir, 0755); - return dir; -} - -char * -lookup_download_dir (void) -{ - const char *download_dir; - char *dir; - - download_dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD); - if (download_dir != NULL && strcmp (download_dir, g_get_home_dir ()) != 0) { - g_mkdir_with_parents (download_dir, 0755); - return g_strdup (download_dir); - } - - dir = g_build_filename (g_get_home_dir (), "Download", NULL); - g_mkdir_with_parents (dir, 0755); - return dir; -} - static void migrate_old_configuration (void) { -- 1.6.5.1 Index: gnome-user-share.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-share/F-12/gnome-user-share.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -p -r1.65 -r1.66 --- gnome-user-share.spec 26 Oct 2009 11:01:47 -0000 1.65 +++ gnome-user-share.spec 3 Nov 2009 01:59:38 -0000 1.66 @@ -1,7 +1,7 @@ Summary: Gnome user file sharing Name: gnome-user-share Version: 2.28.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.gnome.org @@ -9,9 +9,12 @@ Source0: http://download.gnome.org/sourc # http://bugzilla.gnome.org/show_bug.cgi?id=578090 Patch0: menu-path.patch # http://bugzilla.gnome.org/show_bug.cgi?id=558244 +# https://bugzilla.gnome.org/show_bug.cgi?id=600499 Patch1: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch +Patch2: 0001-Use-same-directories-in-nautilus-bar-and-app.patch BuildRequires: intltool automake autoconf libtool + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.2.0 Requires: obex-data-server >= 0.3 @@ -135,6 +138,10 @@ fi %{_libdir}/nautilus/extensions-2.0/*.so %changelog +* Tue Nov 03 2009 Bastien Nocera 2.28.1-2 +- Update share bar code to use the same directories as + the sharing code itself + * Mon Oct 26 2009 Bastien Nocera 2.28.1-1 - Update to 2.28.1 From hadess at fedoraproject.org Tue Nov 3 02:03:31 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Nov 2009 02:03:31 +0000 (UTC) Subject: rpms/gnome-user-share/F-12 gnome-user-share.spec,1.66,1.67 Message-ID: <20091103020331.9569211C0086@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-user-share/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6903 Modified Files: gnome-user-share.spec Log Message: Add patch application... Index: gnome-user-share.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-share/F-12/gnome-user-share.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- gnome-user-share.spec 3 Nov 2009 01:59:38 -0000 1.66 +++ gnome-user-share.spec 3 Nov 2009 02:03:30 -0000 1.67 @@ -11,6 +11,7 @@ Patch0: menu-path.patch # http://bugzilla.gnome.org/show_bug.cgi?id=558244 # https://bugzilla.gnome.org/show_bug.cgi?id=600499 Patch1: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch +%define _default_patch_fuzz 2 Patch2: 0001-Use-same-directories-in-nautilus-bar-and-app.patch BuildRequires: intltool automake autoconf libtool @@ -56,6 +57,7 @@ The program also allows to share files u %setup -q %patch0 -p1 -b .menu-path %patch1 -p1 -b .cluebar +%patch2 -p1 -b .dirs autoreconf -f -i From cwickert at fedoraproject.org Tue Nov 3 02:15:58 2009 From: cwickert at fedoraproject.org (Christoph Wickert) Date: Tue, 3 Nov 2009 02:15:58 +0000 (UTC) Subject: rpms/desktop-backgrounds/F-12 desktop-backgrounds.spec,1.67,1.68 Message-ID: <20091103021558.4451811C0086@cvs1.fedora.phx.redhat.com> Author: cwickert Update of /cvs/pkgs/rpms/desktop-backgrounds/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10334 Modified Files: desktop-backgrounds.spec Log Message: * Tue Nov 03 2009 Christoph Wickert - 9.0.0-11 - Bump release for RC Index: desktop-backgrounds.spec =================================================================== RCS file: /cvs/pkgs/rpms/desktop-backgrounds/F-12/desktop-backgrounds.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -p -r1.67 -r1.68 --- desktop-backgrounds.spec 1 Nov 2009 04:31:28 -0000 1.67 +++ desktop-backgrounds.spec 3 Nov 2009 02:15:57 -0000 1.68 @@ -4,7 +4,7 @@ Summary: Desktop backgrounds Name: desktop-backgrounds Version: 9.0.0 -Release: 10 +Release: 11 License: LGPLv2 Group: User Interface/Desktops Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2 @@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/backgrounds/default* %changelog +* Tue Nov 03 2009 Christoph Wickert - 9.0.0-11 +- Bump release for RC + * Sun Nov 01 2009 Christoph Wickert - 9.0.0-10 - Update for F12 constantine artwork From spot at fedoraproject.org Tue Nov 3 03:08:48 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Nov 2009 03:08:48 +0000 (UTC) Subject: rpms/alienarena-data/F-11 alienarena-data.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <20091103030848.EA7B311C02A2@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25802/F-11 Modified Files: alienarena-data.spec sources Log Message: update to 7.32 Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-11/alienarena-data.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- alienarena-data.spec 31 Jul 2009 16:26:14 -0000 1.8 +++ alienarena-data.spec 3 Nov 2009 03:08:47 -0000 1.9 @@ -1,18 +1,18 @@ Name: alienarena-data Summary: Data files for Alien Arena 2009 -Version: 20090730 +Version: 20091102 Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games URL: http://icculus.org/alienarena/ # We need to get this from SVN -# mkdir alienarena-data-20090730 && cd alienarena-data-20090730 -# svn co svn://svn.icculus.org/alienarena/tags/7.30/arena -# svn co svn://svn.icculus.org/alienarena/tags/7.30/botinfo -# svn co svn://svn.icculus.org/alienarena/tags/7.30/data1 +# mkdir alienarena-data-20091102 && cd alienarena-data-20091102 +# svn co svn://svn.icculus.org/alienarena/tags/7.32/arena +# svn co svn://svn.icculus.org/alienarena/tags/7.32/botinfo +# svn co svn://svn.icculus.org/alienarena/tags/7.32/data1 # cd ../ -# find alienarena-data-20090730 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-data-20090730.tar.bz2 alienarena-data-20090730 +# find alienarena-data-20091102 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-data-20091102.tar.bz2 alienarena-data-20091102 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ rm -rf %{buildroot} %{_datadir}/alienarena/ %changelog +* Mon Nov 2 2009 Tom "spot" Callaway 20091102-1 +- update to 20091102 (7.32) + * Thu Jul 30 2009 Tom "spot" Callaway 20090730-1 - update to 20090730 (7.30) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 31 Jul 2009 16:26:14 -0000 1.6 +++ sources 3 Nov 2009 03:08:47 -0000 1.7 @@ -1 +1 @@ -db441b9856f8fb51eac472232f54e0ad alienarena-data-20090730.tar.bz2 +979225387d1dce5cd900e21b402dc88c alienarena-data-20091102.tar.bz2 From spot at fedoraproject.org Tue Nov 3 03:08:48 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Nov 2009 03:08:48 +0000 (UTC) Subject: rpms/alienarena-data/F-12 alienarena-data.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <20091103030848.E6FAE11C0297@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25802/F-12 Modified Files: alienarena-data.spec sources Log Message: update to 7.32 Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-12/alienarena-data.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- alienarena-data.spec 31 Jul 2009 16:26:14 -0000 1.9 +++ alienarena-data.spec 3 Nov 2009 03:08:48 -0000 1.10 @@ -1,18 +1,18 @@ Name: alienarena-data Summary: Data files for Alien Arena 2009 -Version: 20090730 +Version: 20091102 Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games URL: http://icculus.org/alienarena/ # We need to get this from SVN -# mkdir alienarena-data-20090730 && cd alienarena-data-20090730 -# svn co svn://svn.icculus.org/alienarena/tags/7.30/arena -# svn co svn://svn.icculus.org/alienarena/tags/7.30/botinfo -# svn co svn://svn.icculus.org/alienarena/tags/7.30/data1 +# mkdir alienarena-data-20091102 && cd alienarena-data-20091102 +# svn co svn://svn.icculus.org/alienarena/tags/7.32/arena +# svn co svn://svn.icculus.org/alienarena/tags/7.32/botinfo +# svn co svn://svn.icculus.org/alienarena/tags/7.32/data1 # cd ../ -# find alienarena-data-20090730 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-data-20090730.tar.bz2 alienarena-data-20090730 +# find alienarena-data-20091102 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-data-20091102.tar.bz2 alienarena-data-20091102 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ rm -rf %{buildroot} %{_datadir}/alienarena/ %changelog +* Mon Nov 2 2009 Tom "spot" Callaway 20091102-1 +- update to 20091102 (7.32) + * Thu Jul 30 2009 Tom "spot" Callaway 20090730-1 - update to 20090730 (7.30) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-12/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 31 Jul 2009 16:26:14 -0000 1.6 +++ sources 3 Nov 2009 03:08:48 -0000 1.7 @@ -1 +1 @@ -db441b9856f8fb51eac472232f54e0ad alienarena-data-20090730.tar.bz2 +979225387d1dce5cd900e21b402dc88c alienarena-data-20091102.tar.bz2 From spot at fedoraproject.org Tue Nov 3 03:08:48 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Nov 2009 03:08:48 +0000 (UTC) Subject: rpms/alienarena-data/F-10 alienarena-data.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <20091103030848.E37EC11C0086@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25802/F-10 Modified Files: alienarena-data.spec sources Log Message: update to 7.32 Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-10/alienarena-data.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- alienarena-data.spec 31 Jul 2009 16:26:14 -0000 1.7 +++ alienarena-data.spec 3 Nov 2009 03:08:47 -0000 1.8 @@ -1,18 +1,18 @@ Name: alienarena-data Summary: Data files for Alien Arena 2009 -Version: 20090730 +Version: 20091102 Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games URL: http://icculus.org/alienarena/ # We need to get this from SVN -# mkdir alienarena-data-20090730 && cd alienarena-data-20090730 -# svn co svn://svn.icculus.org/alienarena/tags/7.30/arena -# svn co svn://svn.icculus.org/alienarena/tags/7.30/botinfo -# svn co svn://svn.icculus.org/alienarena/tags/7.30/data1 +# mkdir alienarena-data-20091102 && cd alienarena-data-20091102 +# svn co svn://svn.icculus.org/alienarena/tags/7.32/arena +# svn co svn://svn.icculus.org/alienarena/tags/7.32/botinfo +# svn co svn://svn.icculus.org/alienarena/tags/7.32/data1 # cd ../ -# find alienarena-data-20090730 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-data-20090730.tar.bz2 alienarena-data-20090730 +# find alienarena-data-20091102 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-data-20091102.tar.bz2 alienarena-data-20091102 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ rm -rf %{buildroot} %{_datadir}/alienarena/ %changelog +* Mon Nov 2 2009 Tom "spot" Callaway 20091102-1 +- update to 20091102 (7.32) + * Thu Jul 30 2009 Tom "spot" Callaway 20090730-1 - update to 20090730 (7.30) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 31 Jul 2009 16:26:14 -0000 1.6 +++ sources 3 Nov 2009 03:08:47 -0000 1.7 @@ -1 +1 @@ -db441b9856f8fb51eac472232f54e0ad alienarena-data-20090730.tar.bz2 +979225387d1dce5cd900e21b402dc88c alienarena-data-20091102.tar.bz2 From spot at fedoraproject.org Tue Nov 3 03:08:48 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Nov 2009 03:08:48 +0000 (UTC) Subject: rpms/alienarena-data/devel .cvsignore, 1.6, 1.7 alienarena-data.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <20091103030848.F155A11C02C9@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena-data/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25802/devel Modified Files: .cvsignore alienarena-data.spec sources Log Message: update to 7.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 31 Jul 2009 16:26:14 -0000 1.6 +++ .cvsignore 3 Nov 2009 03:08:48 -0000 1.7 @@ -1 +1 @@ -alienarena-data-20090730.tar.bz2 +alienarena-data-20091102.tar.bz2 Index: alienarena-data.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/devel/alienarena-data.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- alienarena-data.spec 31 Jul 2009 16:26:14 -0000 1.9 +++ alienarena-data.spec 3 Nov 2009 03:08:48 -0000 1.10 @@ -1,18 +1,18 @@ Name: alienarena-data Summary: Data files for Alien Arena 2009 -Version: 20090730 +Version: 20091102 Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games URL: http://icculus.org/alienarena/ # We need to get this from SVN -# mkdir alienarena-data-20090730 && cd alienarena-data-20090730 -# svn co svn://svn.icculus.org/alienarena/tags/7.30/arena -# svn co svn://svn.icculus.org/alienarena/tags/7.30/botinfo -# svn co svn://svn.icculus.org/alienarena/tags/7.30/data1 +# mkdir alienarena-data-20091102 && cd alienarena-data-20091102 +# svn co svn://svn.icculus.org/alienarena/tags/7.32/arena +# svn co svn://svn.icculus.org/alienarena/tags/7.32/botinfo +# svn co svn://svn.icculus.org/alienarena/tags/7.32/data1 # cd ../ -# find alienarena-data-20090730 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-data-20090730.tar.bz2 alienarena-data-20090730 +# find alienarena-data-20091102 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-data-20091102.tar.bz2 alienarena-data-20091102 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ rm -rf %{buildroot} %{_datadir}/alienarena/ %changelog +* Mon Nov 2 2009 Tom "spot" Callaway 20091102-1 +- update to 20091102 (7.32) + * Thu Jul 30 2009 Tom "spot" Callaway 20090730-1 - update to 20090730 (7.30) Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena-data/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 31 Jul 2009 16:26:14 -0000 1.6 +++ sources 3 Nov 2009 03:08:48 -0000 1.7 @@ -1 +1 @@ -db441b9856f8fb51eac472232f54e0ad alienarena-data-20090730.tar.bz2 +979225387d1dce5cd900e21b402dc88c alienarena-data-20091102.tar.bz2 From hadess at fedoraproject.org Tue Nov 3 03:13:27 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Nov 2009 03:13:27 +0000 (UTC) Subject: rpms/gnome-user-share/devel 0001-Use-same-directories-in-nautilus-bar-and-app.patch, NONE, 1.1 gnome-user-share.spec, 1.66, 1.67 Message-ID: <20091103031327.C6BE611C0086@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/gnome-user-share/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27382 Modified Files: gnome-user-share.spec Added Files: 0001-Use-same-directories-in-nautilus-bar-and-app.patch Log Message: * Tue Nov 03 2009 Bastien Nocera 2.28.1-2 - Update share bar code to use the same directories as the sharing code itself 0001-Use-same-directories-in-nautilus-bar-and-app.patch: Makefile.am | 16 +++++---- http.c | 2 - obexftp.c | 2 - share-extension.c | 18 ++++------ user_share-common.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ user_share-common.h | 30 +++++++++++++++++ user_share.c | 36 --------------------- 7 files changed, 139 insertions(+), 54 deletions(-) --- NEW FILE 0001-Use-same-directories-in-nautilus-bar-and-app.patch --- >From 814a647dece14962f878231970cf020f35f382e3 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 3 Nov 2009 01:54:12 +0000 Subject: [PATCH] Use same directories in nautilus bar and app We were using different ways to get the public and downloads dir. Whereas the main user-share had fallbacks to avoid sharing $HOME, the nautilus bar was using the special dirs without any fallbacks. This moves the common code to user_share-common.[ch] and makes sure that fallbacks are used in both cases. --- src/Makefile.am | 16 +++++--- src/http.c | 2 +- src/obexftp.c | 2 +- src/share-extension.c | 18 ++++------ src/user_share-common.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ src/user_share-common.h | 30 ++++++++++++++++ src/user_share.c | 35 +------------------ 7 files changed, 139 insertions(+), 53 deletions(-) create mode 100644 src/user_share-common.c create mode 100644 src/user_share-common.h diff --git a/src/Makefile.am b/src/Makefile.am index fa7aa0a..09e82e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,6 +14,9 @@ bin_PROGRAMS= \ libexec_PROGRAMS= \ gnome-user-share +noinst_LTLIBRARIES = libuser-share-common.la +libuser_share_common_la_SOURCES = user_share-common.c user_share-common.h + INCLUDES= \ -DPREFIX=\""$(prefix)"\" \ -DBINDIR=\""$(bindir)"\" \ @@ -44,7 +47,8 @@ gnome_user_share_SOURCES = \ obexpush.h \ $(MARSHALFILES) -gnome_user_share_LDADD = \ +gnome_user_share_LDADD = \ + libuser-share-common.la \ $(USER_SHARE_LIBS) \ $(SELINUX_LIBS) \ $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) @@ -60,13 +64,13 @@ gnome_file_share_properties_LDADD = \ nautilus_extensiondir = $(NAUTILUSDIR) nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la -libnautilus_share_extension_la_SOURCES = \ - nautilus-share-bar.c \ - nautilus-share-bar.h \ - share-extension.c \ +libnautilus_share_extension_la_SOURCES = \ + nautilus-share-bar.c \ + nautilus-share-bar.h \ + share-extension.c \ $(NULL) -libnautilus_share_extension_la_LIBADD = $(EXTENSION_LIBS) +libnautilus_share_extension_la_LIBADD = libuser-share-common.la $(EXTENSION_LIBS) libnautilus_share_extension_la_LDFLAGS = -avoid-version -module -no-undefined EXTRA_DIST = marshal.list diff --git a/src/http.c b/src/http.c index 164b291..367394a 100644 --- a/src/http.c +++ b/src/http.c @@ -48,7 +48,7 @@ #include #endif -#include "user_share.h" +#include "user_share-common.h" #include "user_share-private.h" #include "http.h" diff --git a/src/obexftp.c b/src/obexftp.c index 89a98ce..02e8956 100644 --- a/src/obexftp.c +++ b/src/obexftp.c @@ -30,7 +30,7 @@ #include #include "obexftp.h" -#include "user_share.h" +#include "user_share-common.h" #include "user_share-private.h" static DBusGConnection *connection = NULL; diff --git a/src/share-extension.c b/src/share-extension.c index 2446d3f..0448414 100644 --- a/src/share-extension.c +++ b/src/share-extension.c @@ -31,6 +31,7 @@ #include #include "nautilus-share-bar.h" +#include "user_share-common.h" #define NAUTILUS_TYPE_SHARE (nautilus_share_get_type ()) #define NAUTILUS_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SHARE, NautilusShare)) @@ -154,18 +155,13 @@ nautilus_share_get_location_widget (NautilusLocationWidgetProvider *iface, g_object_unref (home); for (i = 0; i < G_N_ELEMENTS (special_dirs); i++) { - const char *path; - - path = g_get_user_special_dir (special_dirs[i]); - if (path != NULL) { - GFile *dir; - dir = g_file_new_for_path (path); - if (g_file_equal (dir, file)) { - enable = TRUE; - is_dir[i] = TRUE; - } - g_object_unref (dir); + GFile *dir; + dir = lookup_dir_with_fallback (special_dirs[i]); + if (g_file_equal (dir, file)) { + enable = TRUE; + is_dir[i] = TRUE; } + g_object_unref (dir); } if (enable == FALSE) diff --git a/src/user_share-common.c b/src/user_share-common.c new file mode 100644 index 0000000..31389eb --- /dev/null +++ b/src/user_share-common.c @@ -0,0 +1,89 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * Copyright (C) 2004-2009 Red Hat, Inc. + * + * Nautilus is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * Nautilus is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors: Alexander Larsson + * Bastien Nocera + * + */ + +#include "user_share-common.h" + +static char * +lookup_special_dir (GUserDirectory directory, + const char *name, + gboolean create_dir) +{ + const char *special_dir; + char *dir; + + special_dir = g_get_user_special_dir (directory); + if (special_dir != NULL && strcmp (special_dir, g_get_home_dir ()) != 0) { + if (create_dir != FALSE) + g_mkdir_with_parents (special_dir, 0755); + return g_strdup (special_dir); + } + + dir = g_build_filename (g_get_home_dir (), name, NULL); + if (create_dir != FALSE) + g_mkdir_with_parents (dir, 0755); + return dir; +} + +char * +lookup_public_dir (void) +{ + return lookup_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE, + "Public", + TRUE); +} + +char * +lookup_download_dir (void) +{ + return lookup_special_dir (G_USER_DIRECTORY_DOWNLOAD, + "Downloads", + TRUE); +} + +GFile * +lookup_dir_with_fallback (GUserDirectory directory) +{ + GFile *file; + char *path; + const char *name; + + if (directory == G_USER_DIRECTORY_PUBLIC_SHARE) + name = "Public"; + else if (directory == G_USER_DIRECTORY_DOWNLOAD) + name = "Downloads"; + else + g_assert_not_reached (); + + path = lookup_special_dir (directory, + name, + FALSE); + + if (path == NULL) + return NULL; + + file = g_file_new_for_path (path); + g_free (path); + + return file; +} diff --git a/src/user_share-common.h b/src/user_share-common.h new file mode 100644 index 0000000..1b87c7c --- /dev/null +++ b/src/user_share-common.h @@ -0,0 +1,30 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * Copyright (C) 2004-2009 Red Hat, Inc. + * + * Nautilus is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * Nautilus is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors: Alexander Larsson + * Bastien Nocera + * + */ + +#include +#include + +char *lookup_public_dir (void); +char *lookup_download_dir (void); +GFile *lookup_dir_with_fallback (GUserDirectory directory); diff --git a/src/user_share.c b/src/user_share.c index ab6a7ca..1976424 100644 --- a/src/user_share.c +++ b/src/user_share.c @@ -31,6 +31,7 @@ #include "user_share.h" #include "user_share-private.h" +#include "user_share-common.h" #include "http.h" #include "obexftp.h" #include "obexpush.h" @@ -262,40 +263,6 @@ bluez_init (void) G_CALLBACK (default_adapter_changed), NULL); } -char * -lookup_public_dir (void) -{ - const char *public_dir; - char *dir; - - public_dir = g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE); - if (public_dir != NULL && strcmp (public_dir, g_get_home_dir ()) != 0) { - g_mkdir_with_parents (public_dir, 0755); - return g_strdup (public_dir); - } - - dir = g_build_filename (g_get_home_dir (), "Public", NULL); - g_mkdir_with_parents (dir, 0755); - return dir; -} - -char * -lookup_download_dir (void) -{ - const char *download_dir; - char *dir; - - download_dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD); - if (download_dir != NULL && strcmp (download_dir, g_get_home_dir ()) != 0) { - g_mkdir_with_parents (download_dir, 0755); - return g_strdup (download_dir); - } - - dir = g_build_filename (g_get_home_dir (), "Download", NULL); - g_mkdir_with_parents (dir, 0755); - return dir; -} - static void migrate_old_configuration (void) { -- 1.6.5.1 Index: gnome-user-share.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- gnome-user-share.spec 26 Oct 2009 10:39:09 -0000 1.66 +++ gnome-user-share.spec 3 Nov 2009 03:13:27 -0000 1.67 @@ -1,7 +1,7 @@ Summary: Gnome user file sharing Name: gnome-user-share Version: 2.28.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.gnome.org @@ -9,9 +9,13 @@ Source0: http://download.gnome.org/sourc # http://bugzilla.gnome.org/show_bug.cgi?id=578090 Patch0: menu-path.patch # http://bugzilla.gnome.org/show_bug.cgi?id=558244 +# https://bugzilla.gnome.org/show_bug.cgi?id=600499 Patch1: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch +%define _default_patch_fuzz 2 +Patch2: 0001-Use-same-directories-in-nautilus-bar-and-app.patch BuildRequires: intltool automake autoconf libtool + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.2.0 Requires: obex-data-server >= 0.3 @@ -20,12 +24,12 @@ BuildRequires: GConf2-devel pkgconfig BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: httpd >= 2.2.0 mod_dnssd >= 0.6 BuildRequires: gnome-bluetooth-libs-devel +BuildRequires: libcanberra-devel BuildRequires: desktop-file-utils BuildRequires: gnome-doc-utils BuildRequires: libselinux-devel BuildRequires: dbus-glib-devel BuildRequires: libnotify-devel -BuildRequires: libcanberra-devel BuildRequires: nautilus-devel BuildRequires: gettext BuildRequires: perl(XML::Parser) intltool @@ -53,6 +57,7 @@ The program also allows to share files u %setup -q %patch0 -p1 -b .menu-path %patch1 -p1 -b .cluebar +%patch2 -p1 -b .dirs autoreconf -f -i @@ -135,6 +140,10 @@ fi %{_libdir}/nautilus/extensions-2.0/*.so %changelog +* Tue Nov 03 2009 Bastien Nocera 2.28.1-2 +- Update share bar code to use the same directories as + the sharing code itself + * Mon Oct 26 2009 Bastien Nocera 2.28.1-1 - Update to 2.28.1 From spot at fedoraproject.org Tue Nov 3 03:15:14 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Nov 2009 03:15:14 +0000 (UTC) Subject: rpms/alienarena/F-10 alienarena.spec,1.12,1.13 sources,1.6,1.7 Message-ID: <20091103031514.44B0D11C0086@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28363/F-10 Modified Files: alienarena.spec sources Log Message: update to 7.32 Index: alienarena.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-10/alienarena.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- alienarena.spec 16 Aug 2009 19:06:33 -0000 1.12 +++ alienarena.spec 3 Nov 2009 03:15:13 -0000 1.13 @@ -1,19 +1,19 @@ Name: alienarena Summary: Multiplayer retro sci-fi deathmatch game -Version: 7.30 -Release: 2%{?dist} +Version: 7.32 +Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games # Subversion: https://svn.icculus.org/alienarena/trunk/?sortby=date # Upstream seems too inept to provide a simple source only tarball, so we use svn. # Trunk contains the huge data also, so for the exe just get the source dir. -# mkdir alienarena-7.30 && cd alienarena-7.30/ -# svn co svn://svn.icculus.org/alienarena/tags/7.30/source -# svn co svn://svn.icculus.org/alienarena/tags/7.30/docs +# mkdir alienarena-7.32 && cd alienarena-7.32/ +# svn co svn://svn.icculus.org/alienarena/tags/7.32/source +# svn co svn://svn.icculus.org/alienarena/tags/7.32/docs # cd ../ -# find alienarena-7.30 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-7.30.tar.bz2 alienarena-7.30 -Source0: alienarena-7.30.tar.bz2 +# find alienarena-7.32 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-7.32.tar.bz2 alienarena-7.32 +Source0: alienarena-%{version}.tar.bz2 Source1: alienarena.desktop Source2: GPL.acebot.txt Source3: alienarena.png @@ -26,7 +26,7 @@ BuildRequires: libX11-devel, libXext-dev BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel BuildRequires: libvorbis-devel, openal-soft-devel BuildRequires: desktop-file-utils -Requires: alienarena-data = 20090730 +Requires: alienarena-data = 20091102 Requires: desktop-file-utils >= 0.9, opengl-games-utils %description @@ -38,7 +38,7 @@ of play, loads of mutators, built-in bot %package server Group: Amusements/Games Summary: Dedicated server for alienarena, the FPS game -Requires: alienarena-data = 20090730 +Requires: alienarena-data = 20091102 %description server @@ -151,6 +151,10 @@ gtk-update-icon-cache -qf %{_datadir}/ic %changelog +* Mon Nov 2 2009 Tom "spot" Callaway - 7.32-1 +- update to 7.32 +- fix CVE-2009-3637 (bugzilla 530514) + * Wed Aug 12 2009 Tom "spot" Callaway - 7.30-2 - fix dlopen code to find proper openal library - use openal-soft instead of old openal Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-10/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 31 Jul 2009 16:13:50 -0000 1.6 +++ sources 3 Nov 2009 03:15:13 -0000 1.7 @@ -1 +1 @@ -f947f8b4234daad11bef6e23620e0d59 alienarena-7.30.tar.bz2 +e3fa65cdd975cef2dbd6393517abad4b alienarena-7.32.tar.bz2 From spot at fedoraproject.org Tue Nov 3 03:15:14 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Nov 2009 03:15:14 +0000 (UTC) Subject: rpms/alienarena/F-11 alienarena.spec,1.13,1.14 sources,1.6,1.7 Message-ID: <20091103031514.D6F7511C0086@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28363/F-11 Modified Files: alienarena.spec sources Log Message: update to 7.32 Index: alienarena.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-11/alienarena.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- alienarena.spec 16 Aug 2009 19:06:33 -0000 1.13 +++ alienarena.spec 3 Nov 2009 03:15:13 -0000 1.14 @@ -1,19 +1,19 @@ Name: alienarena Summary: Multiplayer retro sci-fi deathmatch game -Version: 7.30 -Release: 2%{?dist} +Version: 7.32 +Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games # Subversion: https://svn.icculus.org/alienarena/trunk/?sortby=date # Upstream seems too inept to provide a simple source only tarball, so we use svn. # Trunk contains the huge data also, so for the exe just get the source dir. -# mkdir alienarena-7.30 && cd alienarena-7.30/ -# svn co svn://svn.icculus.org/alienarena/tags/7.30/source -# svn co svn://svn.icculus.org/alienarena/tags/7.30/docs +# mkdir alienarena-7.32 && cd alienarena-7.32/ +# svn co svn://svn.icculus.org/alienarena/tags/7.32/source +# svn co svn://svn.icculus.org/alienarena/tags/7.32/docs # cd ../ -# find alienarena-7.30 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-7.30.tar.bz2 alienarena-7.30 -Source0: alienarena-7.30.tar.bz2 +# find alienarena-7.32 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-7.32.tar.bz2 alienarena-7.32 +Source0: alienarena-%{version}.tar.bz2 Source1: alienarena.desktop Source2: GPL.acebot.txt Source3: alienarena.png @@ -26,7 +26,7 @@ BuildRequires: libX11-devel, libXext-dev BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel BuildRequires: libvorbis-devel, openal-soft-devel BuildRequires: desktop-file-utils -Requires: alienarena-data = 20090730 +Requires: alienarena-data = 20091102 Requires: desktop-file-utils >= 0.9, opengl-games-utils %description @@ -38,7 +38,7 @@ of play, loads of mutators, built-in bot %package server Group: Amusements/Games Summary: Dedicated server for alienarena, the FPS game -Requires: alienarena-data = 20090730 +Requires: alienarena-data = 20091102 %description server @@ -151,6 +151,10 @@ gtk-update-icon-cache -qf %{_datadir}/ic %changelog +* Mon Nov 2 2009 Tom "spot" Callaway - 7.32-1 +- update to 7.32 +- fix CVE-2009-3637 (bugzilla 530514) + * Wed Aug 12 2009 Tom "spot" Callaway - 7.30-2 - fix dlopen code to find proper openal library - use openal-soft instead of old openal Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-11/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 31 Jul 2009 16:13:50 -0000 1.6 +++ sources 3 Nov 2009 03:15:14 -0000 1.7 @@ -1 +1 @@ -f947f8b4234daad11bef6e23620e0d59 alienarena-7.30.tar.bz2 +e3fa65cdd975cef2dbd6393517abad4b alienarena-7.32.tar.bz2 From spot at fedoraproject.org Tue Nov 3 03:15:15 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Nov 2009 03:15:15 +0000 (UTC) Subject: rpms/alienarena/F-12 alienarena.spec,1.14,1.15 sources,1.6,1.7 Message-ID: <20091103031515.8A0E511C0086@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28363/F-12 Modified Files: alienarena.spec sources Log Message: update to 7.32 Index: alienarena.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-12/alienarena.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- alienarena.spec 16 Aug 2009 19:06:34 -0000 1.14 +++ alienarena.spec 3 Nov 2009 03:15:14 -0000 1.15 @@ -1,19 +1,19 @@ Name: alienarena Summary: Multiplayer retro sci-fi deathmatch game -Version: 7.30 -Release: 2%{?dist} +Version: 7.32 +Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games # Subversion: https://svn.icculus.org/alienarena/trunk/?sortby=date # Upstream seems too inept to provide a simple source only tarball, so we use svn. # Trunk contains the huge data also, so for the exe just get the source dir. -# mkdir alienarena-7.30 && cd alienarena-7.30/ -# svn co svn://svn.icculus.org/alienarena/tags/7.30/source -# svn co svn://svn.icculus.org/alienarena/tags/7.30/docs +# mkdir alienarena-7.32 && cd alienarena-7.32/ +# svn co svn://svn.icculus.org/alienarena/tags/7.32/source +# svn co svn://svn.icculus.org/alienarena/tags/7.32/docs # cd ../ -# find alienarena-7.30 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-7.30.tar.bz2 alienarena-7.30 -Source0: alienarena-7.30.tar.bz2 +# find alienarena-7.32 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-7.32.tar.bz2 alienarena-7.32 +Source0: alienarena-%{version}.tar.bz2 Source1: alienarena.desktop Source2: GPL.acebot.txt Source3: alienarena.png @@ -26,7 +26,7 @@ BuildRequires: libX11-devel, libXext-dev BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel BuildRequires: libvorbis-devel, openal-soft-devel BuildRequires: desktop-file-utils -Requires: alienarena-data = 20090730 +Requires: alienarena-data = 20091102 Requires: desktop-file-utils >= 0.9, opengl-games-utils %description @@ -38,7 +38,7 @@ of play, loads of mutators, built-in bot %package server Group: Amusements/Games Summary: Dedicated server for alienarena, the FPS game -Requires: alienarena-data = 20090730 +Requires: alienarena-data = 20091102 %description server @@ -151,6 +151,10 @@ gtk-update-icon-cache -qf %{_datadir}/ic %changelog +* Mon Nov 2 2009 Tom "spot" Callaway - 7.32-1 +- update to 7.32 +- fix CVE-2009-3637 (bugzilla 530514) + * Wed Aug 12 2009 Tom "spot" Callaway - 7.30-2 - fix dlopen code to find proper openal library - use openal-soft instead of old openal Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/F-12/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 31 Jul 2009 16:13:50 -0000 1.6 +++ sources 3 Nov 2009 03:15:15 -0000 1.7 @@ -1 +1 @@ -f947f8b4234daad11bef6e23620e0d59 alienarena-7.30.tar.bz2 +e3fa65cdd975cef2dbd6393517abad4b alienarena-7.32.tar.bz2 From spot at fedoraproject.org Tue Nov 3 03:15:16 2009 From: spot at fedoraproject.org (Tom Callaway) Date: Tue, 3 Nov 2009 03:15:16 +0000 (UTC) Subject: rpms/alienarena/devel .cvsignore, 1.6, 1.7 alienarena.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <20091103031516.D17FF11C02C9@cvs1.fedora.phx.redhat.com> Author: spot Update of /cvs/pkgs/rpms/alienarena/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28363/devel Modified Files: .cvsignore alienarena.spec sources Log Message: update to 7.32 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 31 Jul 2009 16:13:50 -0000 1.6 +++ .cvsignore 3 Nov 2009 03:15:15 -0000 1.7 @@ -1 +1 @@ -alienarena-7.30.tar.bz2 +alienarena-7.32.tar.bz2 Index: alienarena.spec =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/devel/alienarena.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- alienarena.spec 16 Aug 2009 19:06:34 -0000 1.14 +++ alienarena.spec 3 Nov 2009 03:15:15 -0000 1.15 @@ -1,19 +1,19 @@ Name: alienarena Summary: Multiplayer retro sci-fi deathmatch game -Version: 7.30 -Release: 2%{?dist} +Version: 7.32 +Release: 1%{?dist} License: GPLv2+ Group: Amusements/Games # Subversion: https://svn.icculus.org/alienarena/trunk/?sortby=date # Upstream seems too inept to provide a simple source only tarball, so we use svn. # Trunk contains the huge data also, so for the exe just get the source dir. -# mkdir alienarena-7.30 && cd alienarena-7.30/ -# svn co svn://svn.icculus.org/alienarena/tags/7.30/source -# svn co svn://svn.icculus.org/alienarena/tags/7.30/docs +# mkdir alienarena-7.32 && cd alienarena-7.32/ +# svn co svn://svn.icculus.org/alienarena/tags/7.32/source +# svn co svn://svn.icculus.org/alienarena/tags/7.32/docs # cd ../ -# find alienarena-7.30 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-7.30.tar.bz2 alienarena-7.30 -Source0: alienarena-7.30.tar.bz2 +# find alienarena-7.32 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-7.32.tar.bz2 alienarena-7.32 +Source0: alienarena-%{version}.tar.bz2 Source1: alienarena.desktop Source2: GPL.acebot.txt Source3: alienarena.png @@ -26,7 +26,7 @@ BuildRequires: libX11-devel, libXext-dev BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel BuildRequires: libvorbis-devel, openal-soft-devel BuildRequires: desktop-file-utils -Requires: alienarena-data = 20090730 +Requires: alienarena-data = 20091102 Requires: desktop-file-utils >= 0.9, opengl-games-utils %description @@ -38,7 +38,7 @@ of play, loads of mutators, built-in bot %package server Group: Amusements/Games Summary: Dedicated server for alienarena, the FPS game -Requires: alienarena-data = 20090730 +Requires: alienarena-data = 20091102 %description server @@ -151,6 +151,10 @@ gtk-update-icon-cache -qf %{_datadir}/ic %changelog +* Mon Nov 2 2009 Tom "spot" Callaway - 7.32-1 +- update to 7.32 +- fix CVE-2009-3637 (bugzilla 530514) + * Wed Aug 12 2009 Tom "spot" Callaway - 7.30-2 - fix dlopen code to find proper openal library - use openal-soft instead of old openal Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/alienarena/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 31 Jul 2009 16:13:50 -0000 1.6 +++ sources 3 Nov 2009 03:15:15 -0000 1.7 @@ -1 +1 @@ -f947f8b4234daad11bef6e23620e0d59 alienarena-7.30.tar.bz2 +e3fa65cdd975cef2dbd6393517abad4b alienarena-7.32.tar.bz2 From airlied at fedoraproject.org Tue Nov 3 03:38:40 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 3 Nov 2009 03:38:40 +0000 (UTC) Subject: rpms/kernel/F-12 drm-r600-lenovo-w500-fix.patch, NONE, 1.1 kernel.spec, 1.1896, 1.1897 Message-ID: <20091103033840.7400311C0086@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3542 Modified Files: kernel.spec Added Files: drm-r600-lenovo-w500-fix.patch Log Message: * Tue Nov 03 2009 Dave Airlie 2.6.31.5-111 - drm-r600-lenovo-w500-fix.patch: fix lenovo w500 acpi video kill laptop dead - drop aspm r600 patch as correct fix should be in 110 drm-r600-lenovo-w500-fix.patch: rv515.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- NEW FILE drm-r600-lenovo-w500-fix.patch --- >From fb8dde81cd2090bc6b0f30bd95067b15a96ed695 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 3 Nov 2009 13:23:15 +1000 Subject: [PATCH] drm/radeon/kms: disable D1VGA and D2VGA if enabled Once kms is enabled we don't need these, and it causes a problem with the Lenovo W500 ACPI brightness implementation, it hangs in a loop inside an SMI. Signed-off-by: Dave Airlie --- drivers/gpu/drm/radeon/rv515.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index 41a34c2..03c052d 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c @@ -137,6 +137,8 @@ int rv515_mc_wait_for_idle(struct radeon_device *rdev) void rv515_vga_render_disable(struct radeon_device *rdev) { + WREG32(R_000330_D1VGA_CONTROL, 0); + WREG32(R_000338_D2VGA_CONTROL, 0); WREG32(R_000300_VGA_RENDER_CONTROL, RREG32(R_000300_VGA_RENDER_CONTROL) & C_000300_VGA_VSTATUS_CNTL); } -- 1.6.5.1 Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v retrieving revision 1.1896 retrieving revision 1.1897 diff -u -p -r1.1896 -r1.1897 --- kernel.spec 2 Nov 2009 22:43:30 -0000 1.1896 +++ kernel.spec 3 Nov 2009 03:38:39 -0000 1.1897 @@ -699,6 +699,7 @@ Patch1826: drm-intel-no-tv-hotplug.patch Patch1827: drm-disable-r600-aspm.patch Patch1828: drm-radeon-agp-font-fix.patch Patch1829: drm-radeon-fix-ring-rmw-issue.patch +Patch1830: drm-r600-lenovo-w500-fix.patch # vga arb Patch1900: linux-2.6-vga-arb.patch @@ -1388,6 +1389,7 @@ ApplyPatch kms-offb-handoff.patch ApplyPatch drm-next-ea1495a6.patch ApplyPatch drm-radeon-agp-font-fix.patch ApplyPatch drm-radeon-fix-ring-rmw-issue.patch +ApplyPatch drm-r600-lenovo-w500-fix.patch ApplyPatch drm-nouveau.patch # pm broken on my thinkpad t60p - airlied @@ -1397,7 +1399,7 @@ ApplyOptionalPatch drm-intel-next.patch #this appears to be upstream - mjg59? #ApplyPatch drm-intel-pm.patch ApplyPatch drm-intel-no-tv-hotplug.patch -ApplyPatch drm-disable-r600-aspm.patch +#ApplyPatch drm-disable-r600-aspm.patch # VGA arb + drm ApplyPatch linux-2.6-vga-arb.patch @@ -2110,6 +2112,10 @@ fi # and build. %changelog +* Tue Nov 03 2009 Dave Airlie 2.6.31.5-111 +- drm-r600-lenovo-w500-fix.patch: fix lenovo w500 acpi video kill laptop dead +- drop aspm r600 patch as correct fix should be in 110 + * Tue Nov 03 2009 Dave Airlie 2.6.31.5-110 - r600: fix for ring setup RMW issue. From pkgdb at fedoraproject.org Tue Nov 3 04:33:42 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:33:42 +0000 Subject: [pkgdb] opensips was added for ivaxer Message-ID: <20091103043342.1C73010F87F@bastion2.fedora.phx.redhat.com> kevin has added Package opensips with summary Open Source SIP Server kevin has approved Package opensips kevin has added a Fedora devel branch for opensips with an owner of ivaxer kevin has approved opensips in Fedora devel kevin has approved Package opensips kevin has set commit to Approved for 107427 on opensips (Fedora devel) kevin has set checkout to Approved for 107427 on opensips (Fedora devel) kevin has set build to Approved for 107427 on opensips (Fedora devel) To make changes to this package see: /pkgdb/packages/name/opensips From pkgdb at fedoraproject.org Tue Nov 3 04:33:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:33:43 +0000 Subject: [pkgdb] opensips summary updated by kevin Message-ID: <20091103043344.0C40610F883@bastion2.fedora.phx.redhat.com> kevin set package opensips summary to Open Source SIP Server To make changes to this package see: /pkgdb/packages/name/opensips From pkgdb at fedoraproject.org Tue Nov 3 04:33:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:33:43 +0000 Subject: [pkgdb] opensips (Fedora, 11) updated by kevin Message-ID: <20091103043344.1D02710F88B@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for opensips kevin has set commit to Approved for 107427 on opensips (Fedora 11) kevin has set checkout to Approved for 107427 on opensips (Fedora 11) kevin has set build to Approved for 107427 on opensips (Fedora 11) To make changes to this package see: /pkgdb/packages/name/opensips From pkgdb at fedoraproject.org Tue Nov 3 04:33:43 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:33:43 +0000 Subject: [pkgdb] opensips (Fedora, 11) updated by kevin Message-ID: <20091103043344.25B4210F88F@bastion2.fedora.phx.redhat.com> kevin added a Fedora 12 branch for opensips kevin has set commit to Approved for 107427 on opensips (Fedora 12) kevin has set checkout to Approved for 107427 on opensips (Fedora 12) kevin has set build to Approved for 107427 on opensips (Fedora 12) To make changes to this package see: /pkgdb/packages/name/opensips From kevin at fedoraproject.org Tue Nov 3 04:34:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:34:00 +0000 (UTC) Subject: rpms/opensips/devel - New directory Message-ID: <20091103043400.94EAF11C02A6@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/opensips/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVb3170/rpms/opensips/devel Log Message: Directory /cvs/pkgs/rpms/opensips/devel added to the repository From kevin at fedoraproject.org Tue Nov 3 04:34:00 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:34:00 +0000 (UTC) Subject: rpms/opensips - New directory Message-ID: <20091103043400.5B02F11C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/opensips In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVb3170/rpms/opensips Log Message: Directory /cvs/pkgs/rpms/opensips added to the repository From kevin at fedoraproject.org Tue Nov 3 04:34:15 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:34:15 +0000 (UTC) Subject: rpms/opensips Makefile,NONE,1.1 Message-ID: <20091103043415.6FE2311C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/opensips In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVb3170/rpms/opensips Added Files: Makefile Log Message: Setup of module opensips --- NEW FILE Makefile --- # Top level Makefile for module opensips all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Nov 3 04:34:17 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:34:17 +0000 (UTC) Subject: rpms/opensips/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20091103043417.0BBDA11C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/opensips/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVb3170/rpms/opensips/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module opensips --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: opensips # $Id: Makefile,v 1.1 2009/11/03 04:34:15 kevin Exp $ NAME := opensips SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Nov 3 04:34:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:34:31 +0000 Subject: [pkgdb] jettison was added for red Message-ID: <20091103043431.8D72510F87D@bastion2.fedora.phx.redhat.com> kevin has added Package jettison with summary A JSON StAX implementation kevin has approved Package jettison kevin has added a Fedora devel branch for jettison with an owner of red kevin has approved jettison in Fedora devel kevin has approved Package jettison kevin has set commit to Approved for 107427 on jettison (Fedora devel) kevin has set checkout to Approved for 107427 on jettison (Fedora devel) kevin has set build to Approved for 107427 on jettison (Fedora devel) To make changes to this package see: /pkgdb/packages/name/jettison From pkgdb at fedoraproject.org Tue Nov 3 04:34:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:34:32 +0000 Subject: [pkgdb] jettison summary updated by kevin Message-ID: <20091103043432.EBF2910F87F@bastion2.fedora.phx.redhat.com> kevin set package jettison summary to A JSON StAX implementation To make changes to this package see: /pkgdb/packages/name/jettison From pkgdb at fedoraproject.org Tue Nov 3 04:34:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:34:32 +0000 Subject: [pkgdb] jettison (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043432.F18D810F887@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for jettison kevin has set commit to Approved for 107427 on jettison (Fedora 11) kevin has set checkout to Approved for 107427 on jettison (Fedora 11) kevin has set build to Approved for 107427 on jettison (Fedora 11) To make changes to this package see: /pkgdb/packages/name/jettison From pkgdb at fedoraproject.org Tue Nov 3 04:34:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:34:32 +0000 Subject: [pkgdb] jettison (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043433.07D0B10F88E@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for jettison kevin has set commit to Approved for 107427 on jettison (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on jettison (Fedora EPEL 4) kevin has set build to Approved for 107427 on jettison (Fedora EPEL 4) To make changes to this package see: /pkgdb/packages/name/jettison From pkgdb at fedoraproject.org Tue Nov 3 04:34:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:34:32 +0000 Subject: [pkgdb] jettison (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043433.0CAFF10F890@bastion2.fedora.phx.redhat.com> kevin added a Fedora 12 branch for jettison kevin has set commit to Approved for 107427 on jettison (Fedora 12) kevin has set checkout to Approved for 107427 on jettison (Fedora 12) kevin has set build to Approved for 107427 on jettison (Fedora 12) To make changes to this package see: /pkgdb/packages/name/jettison From pkgdb at fedoraproject.org Tue Nov 3 04:34:32 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:34:32 +0000 Subject: [pkgdb] jettison (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043433.197E210F899@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for jettison kevin has set commit to Approved for 107427 on jettison (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on jettison (Fedora EPEL 5) kevin has set build to Approved for 107427 on jettison (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/jettison From kevin at fedoraproject.org Tue Nov 3 04:34:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:34:47 +0000 (UTC) Subject: rpms/jettison - New directory Message-ID: <20091103043447.4E13F11C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/jettison In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAN3504/rpms/jettison Log Message: Directory /cvs/pkgs/rpms/jettison added to the repository From kevin at fedoraproject.org Tue Nov 3 04:34:47 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:34:47 +0000 (UTC) Subject: rpms/jettison/devel - New directory Message-ID: <20091103043447.67FF811C02C9@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/jettison/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAN3504/rpms/jettison/devel Log Message: Directory /cvs/pkgs/rpms/jettison/devel added to the repository From kevin at fedoraproject.org Tue Nov 3 04:35:02 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:35:02 +0000 (UTC) Subject: rpms/jettison Makefile,NONE,1.1 Message-ID: <20091103043502.AC6F511C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/jettison In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAN3504/rpms/jettison Added Files: Makefile Log Message: Setup of module jettison --- NEW FILE Makefile --- # Top level Makefile for module jettison all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Nov 3 04:35:03 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:35:03 +0000 (UTC) Subject: rpms/jettison/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20091103043503.B54E811C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/jettison/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsAN3504/rpms/jettison/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jettison --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: jettison # $Id: Makefile,v 1.1 2009/11/03 04:35:03 kevin Exp $ NAME := jettison SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Nov 3 04:35:15 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:35:15 +0000 Subject: [pkgdb] rubygem-hawler was added for kanarip Message-ID: <20091103043515.DF8D810F880@bastion2.fedora.phx.redhat.com> kevin has added Package rubygem-hawler with summary Hawler, the ruby HTTP crawler kevin has approved Package rubygem-hawler kevin has added a Fedora devel branch for rubygem-hawler with an owner of kanarip kevin has approved rubygem-hawler in Fedora devel kevin has approved Package rubygem-hawler kevin has set commit to Approved for 107427 on rubygem-hawler (Fedora devel) kevin has set checkout to Approved for 107427 on rubygem-hawler (Fedora devel) kevin has set build to Approved for 107427 on rubygem-hawler (Fedora devel) To make changes to this package see: /pkgdb/packages/name/rubygem-hawler From pkgdb at fedoraproject.org Tue Nov 3 04:35:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:35:17 +0000 Subject: [pkgdb] rubygem-hawler (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043517.8CF3710F87E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for rubygem-hawler kevin has set commit to Approved for 107427 on rubygem-hawler (Fedora 11) kevin has set checkout to Approved for 107427 on rubygem-hawler (Fedora 11) kevin has set build to Approved for 107427 on rubygem-hawler (Fedora 11) To make changes to this package see: /pkgdb/packages/name/rubygem-hawler From pkgdb at fedoraproject.org Tue Nov 3 04:35:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:35:17 +0000 Subject: [pkgdb] rubygem-hawler summary updated by kevin Message-ID: <20091103043517.6ED4110F89C@bastion2.fedora.phx.redhat.com> kevin set package rubygem-hawler summary to Hawler, the ruby HTTP crawler To make changes to this package see: /pkgdb/packages/name/rubygem-hawler From pkgdb at fedoraproject.org Tue Nov 3 04:35:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:35:17 +0000 Subject: [pkgdb] rubygem-hawler (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043517.7F3DD10F888@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for rubygem-hawler kevin has set commit to Approved for 107427 on rubygem-hawler (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on rubygem-hawler (Fedora EPEL 4) kevin has set build to Approved for 107427 on rubygem-hawler (Fedora EPEL 4) To make changes to this package see: /pkgdb/packages/name/rubygem-hawler From pkgdb at fedoraproject.org Tue Nov 3 04:35:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:35:17 +0000 Subject: [pkgdb] rubygem-hawler (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043517.AF8A210F89A@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for rubygem-hawler kevin has set commit to Approved for 107427 on rubygem-hawler (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on rubygem-hawler (Fedora EPEL 5) kevin has set build to Approved for 107427 on rubygem-hawler (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/rubygem-hawler From pkgdb at fedoraproject.org Tue Nov 3 04:35:17 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:35:17 +0000 Subject: [pkgdb] rubygem-hawler (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043517.98C9A10F89E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 12 branch for rubygem-hawler kevin has set commit to Approved for 107427 on rubygem-hawler (Fedora 12) kevin has set checkout to Approved for 107427 on rubygem-hawler (Fedora 12) kevin has set build to Approved for 107427 on rubygem-hawler (Fedora 12) To make changes to this package see: /pkgdb/packages/name/rubygem-hawler From kevin at fedoraproject.org Tue Nov 3 04:35:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:35:35 +0000 (UTC) Subject: rpms/rubygem-hawler - New directory Message-ID: <20091103043535.547E011C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rubygem-hawler In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWE3952/rpms/rubygem-hawler Log Message: Directory /cvs/pkgs/rpms/rubygem-hawler added to the repository From kevin at fedoraproject.org Tue Nov 3 04:35:35 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:35:35 +0000 (UTC) Subject: rpms/rubygem-hawler/devel - New directory Message-ID: <20091103043535.8171011C02C9@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rubygem-hawler/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWE3952/rpms/rubygem-hawler/devel Log Message: Directory /cvs/pkgs/rpms/rubygem-hawler/devel added to the repository From kevin at fedoraproject.org Tue Nov 3 04:35:51 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:35:51 +0000 (UTC) Subject: rpms/rubygem-hawler Makefile,NONE,1.1 Message-ID: <20091103043551.92E2C11C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rubygem-hawler In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWE3952/rpms/rubygem-hawler Added Files: Makefile Log Message: Setup of module rubygem-hawler --- NEW FILE Makefile --- # Top level Makefile for module rubygem-hawler all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Nov 3 04:35:52 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:35:52 +0000 (UTC) Subject: rpms/rubygem-hawler/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20091103043552.5171511C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/rubygem-hawler/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWE3952/rpms/rubygem-hawler/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rubygem-hawler --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: rubygem-hawler # $Id: Makefile,v 1.1 2009/11/03 04:35:52 kevin Exp $ NAME := rubygem-hawler SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Nov 3 04:36:04 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:36:04 +0000 Subject: [pkgdb] globus-scheduler-event-generator was added for ellert Message-ID: <20091103043604.253FE10F879@bastion2.fedora.phx.redhat.com> kevin has added Package globus-scheduler-event-generator with summary Globus Toolkit - Scheduler Event Generator kevin has approved Package globus-scheduler-event-generator kevin has added a Fedora devel branch for globus-scheduler-event-generator with an owner of ellert kevin has approved globus-scheduler-event-generator in Fedora devel kevin has approved Package globus-scheduler-event-generator kevin has set commit to Approved for 107427 on globus-scheduler-event-generator (Fedora devel) kevin has set checkout to Approved for 107427 on globus-scheduler-event-generator (Fedora devel) kevin has set build to Approved for 107427 on globus-scheduler-event-generator (Fedora devel) To make changes to this package see: /pkgdb/packages/name/globus-scheduler-event-generator From pkgdb at fedoraproject.org Tue Nov 3 04:36:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:36:05 +0000 Subject: [pkgdb] globus-scheduler-event-generator summary updated by kevin Message-ID: <20091103043605.7322210F880@bastion2.fedora.phx.redhat.com> kevin set package globus-scheduler-event-generator summary to Globus Toolkit - Scheduler Event Generator To make changes to this package see: /pkgdb/packages/name/globus-scheduler-event-generator From pkgdb at fedoraproject.org Tue Nov 3 04:36:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:36:05 +0000 Subject: [pkgdb] globus-scheduler-event-generator (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043605.7704A10F883@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for globus-scheduler-event-generator kevin has set commit to Approved for 107427 on globus-scheduler-event-generator (Fedora 11) kevin has set checkout to Approved for 107427 on globus-scheduler-event-generator (Fedora 11) kevin has set build to Approved for 107427 on globus-scheduler-event-generator (Fedora 11) To make changes to this package see: /pkgdb/packages/name/globus-scheduler-event-generator From pkgdb at fedoraproject.org Tue Nov 3 04:36:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:36:05 +0000 Subject: [pkgdb] globus-scheduler-event-generator (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043605.8548110F88B@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for globus-scheduler-event-generator kevin has set commit to Approved for 107427 on globus-scheduler-event-generator (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on globus-scheduler-event-generator (Fedora EPEL 5) kevin has set build to Approved for 107427 on globus-scheduler-event-generator (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/globus-scheduler-event-generator From pkgdb at fedoraproject.org Tue Nov 3 04:36:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:36:05 +0000 Subject: [pkgdb] globus-scheduler-event-generator (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043605.902B310F890@bastion2.fedora.phx.redhat.com> kevin added a Fedora 12 branch for globus-scheduler-event-generator kevin has set commit to Approved for 107427 on globus-scheduler-event-generator (Fedora 12) kevin has set checkout to Approved for 107427 on globus-scheduler-event-generator (Fedora 12) kevin has set build to Approved for 107427 on globus-scheduler-event-generator (Fedora 12) To make changes to this package see: /pkgdb/packages/name/globus-scheduler-event-generator From pkgdb at fedoraproject.org Tue Nov 3 04:36:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:36:05 +0000 Subject: [pkgdb] globus-scheduler-event-generator (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043605.9445710F895@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for globus-scheduler-event-generator kevin has set commit to Approved for 107427 on globus-scheduler-event-generator (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on globus-scheduler-event-generator (Fedora EPEL 4) kevin has set build to Approved for 107427 on globus-scheduler-event-generator (Fedora EPEL 4) To make changes to this package see: /pkgdb/packages/name/globus-scheduler-event-generator From kevin at fedoraproject.org Tue Nov 3 04:36:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:36:19 +0000 (UTC) Subject: rpms/globus-scheduler-event-generator - New directory Message-ID: <20091103043619.2CE9D11C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-scheduler-event-generator In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXX4386/rpms/globus-scheduler-event-generator Log Message: Directory /cvs/pkgs/rpms/globus-scheduler-event-generator added to the repository From kevin at fedoraproject.org Tue Nov 3 04:36:19 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:36:19 +0000 (UTC) Subject: rpms/globus-scheduler-event-generator/devel - New directory Message-ID: <20091103043619.C9A8911C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-scheduler-event-generator/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXX4386/rpms/globus-scheduler-event-generator/devel Log Message: Directory /cvs/pkgs/rpms/globus-scheduler-event-generator/devel added to the repository From kevin at fedoraproject.org Tue Nov 3 04:36:36 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:36:36 +0000 (UTC) Subject: rpms/globus-scheduler-event-generator Makefile,NONE,1.1 Message-ID: <20091103043636.BB49A11C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-scheduler-event-generator In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXX4386/rpms/globus-scheduler-event-generator Added Files: Makefile Log Message: Setup of module globus-scheduler-event-generator --- NEW FILE Makefile --- # Top level Makefile for module globus-scheduler-event-generator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Nov 3 04:36:37 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:36:37 +0000 (UTC) Subject: rpms/globus-scheduler-event-generator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20091103043637.DD26E11C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-scheduler-event-generator/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXX4386/rpms/globus-scheduler-event-generator/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module globus-scheduler-event-generator --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: globus-scheduler-event-generator # $Id: Makefile,v 1.1 2009/11/03 04:36:37 kevin Exp $ NAME := globus-scheduler-event-generator SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Nov 3 04:37:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:37:38 +0000 Subject: [pkgdb] globus-gram-job-manager-callout-error was added for ellert Message-ID: <20091103043738.B9D3810F874@bastion2.fedora.phx.redhat.com> kevin has added Package globus-gram-job-manager-callout-error with summary Globus Toolkit - Globus GRAM Jobmanager Callout Errors kevin has approved Package globus-gram-job-manager-callout-error kevin has added a Fedora devel branch for globus-gram-job-manager-callout-error with an owner of ellert kevin has approved globus-gram-job-manager-callout-error in Fedora devel kevin has approved Package globus-gram-job-manager-callout-error kevin has set commit to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora devel) kevin has set checkout to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora devel) kevin has set build to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora devel) To make changes to this package see: /pkgdb/packages/name/globus-gram-job-manager-callout-error From pkgdb at fedoraproject.org Tue Nov 3 04:37:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:37:40 +0000 Subject: [pkgdb] globus-gram-job-manager-callout-error summary updated by kevin Message-ID: <20091103043740.6F68210F87E@bastion2.fedora.phx.redhat.com> kevin set package globus-gram-job-manager-callout-error summary to Globus Toolkit - Globus GRAM Jobmanager Callout Errors To make changes to this package see: /pkgdb/packages/name/globus-gram-job-manager-callout-error From pkgdb at fedoraproject.org Tue Nov 3 04:37:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:37:40 +0000 Subject: [pkgdb] globus-gram-job-manager-callout-error (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043740.7301510F882@bastion2.fedora.phx.redhat.com> kevin added a Fedora 11 branch for globus-gram-job-manager-callout-error kevin has set commit to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora 11) kevin has set checkout to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora 11) kevin has set build to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora 11) To make changes to this package see: /pkgdb/packages/name/globus-gram-job-manager-callout-error From pkgdb at fedoraproject.org Tue Nov 3 04:37:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:37:40 +0000 Subject: [pkgdb] globus-gram-job-manager-callout-error (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043740.7E16310F888@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for globus-gram-job-manager-callout-error kevin has set commit to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora EPEL 4) kevin has set build to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora EPEL 4) To make changes to this package see: /pkgdb/packages/name/globus-gram-job-manager-callout-error From pkgdb at fedoraproject.org Tue Nov 3 04:37:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:37:40 +0000 Subject: [pkgdb] globus-gram-job-manager-callout-error (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043740.876E310F88E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 12 branch for globus-gram-job-manager-callout-error kevin has set commit to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora 12) kevin has set checkout to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora 12) kevin has set build to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora 12) To make changes to this package see: /pkgdb/packages/name/globus-gram-job-manager-callout-error From pkgdb at fedoraproject.org Tue Nov 3 04:37:40 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:37:40 +0000 Subject: [pkgdb] globus-gram-job-manager-callout-error (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043740.903BB10F894@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for globus-gram-job-manager-callout-error kevin has set commit to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora EPEL 5) kevin has set build to Approved for 107427 on globus-gram-job-manager-callout-error (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/globus-gram-job-manager-callout-error From kevin at fedoraproject.org Tue Nov 3 04:37:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:37:53 +0000 (UTC) Subject: rpms/globus-gram-job-manager-callout-error - New directory Message-ID: <20091103043753.7369111C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-gram-job-manager-callout-error In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTX5018/rpms/globus-gram-job-manager-callout-error Log Message: Directory /cvs/pkgs/rpms/globus-gram-job-manager-callout-error added to the repository From kevin at fedoraproject.org Tue Nov 3 04:37:53 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:37:53 +0000 (UTC) Subject: rpms/globus-gram-job-manager-callout-error/devel - New directory Message-ID: <20091103043753.CE15611C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTX5018/rpms/globus-gram-job-manager-callout-error/devel Log Message: Directory /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/devel added to the repository From kevin at fedoraproject.org Tue Nov 3 04:38:09 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:38:09 +0000 (UTC) Subject: rpms/globus-gram-job-manager-callout-error Makefile,NONE,1.1 Message-ID: <20091103043809.94B0711C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-gram-job-manager-callout-error In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTX5018/rpms/globus-gram-job-manager-callout-error Added Files: Makefile Log Message: Setup of module globus-gram-job-manager-callout-error --- NEW FILE Makefile --- # Top level Makefile for module globus-gram-job-manager-callout-error all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From kevin at fedoraproject.org Tue Nov 3 04:38:10 2009 From: kevin at fedoraproject.org (Kevin Fenzi) Date: Tue, 3 Nov 2009 04:38:10 +0000 (UTC) Subject: rpms/globus-gram-job-manager-callout-error/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <20091103043810.376AB11C00EE@cvs1.fedora.phx.redhat.com> Author: kevin Update of /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/devel In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTX5018/rpms/globus-gram-job-manager-callout-error/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module globus-gram-job-manager-callout-error --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: globus-gram-job-manager-callout-error # $Id: Makefile,v 1.1 2009/11/03 04:38:10 kevin Exp $ NAME := globus-gram-job-manager-callout-error SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources --- From pkgdb at fedoraproject.org Tue Nov 3 04:38:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:38:28 +0000 Subject: [pkgdb] perl-Syntax-Highlight-Engine-Kate (Fedora, 10) updated by kevin Message-ID: <20091103043828.3949E10F87E@bastion2.fedora.phx.redhat.com> kevin added a Fedora 10 branch for perl-Syntax-Highlight-Engine-Kate kevin has set commit to Approved for 107427 on perl-Syntax-Highlight-Engine-Kate (Fedora 10) kevin has set checkout to Approved for 107427 on perl-Syntax-Highlight-Engine-Kate (Fedora 10) kevin has set build to Approved for 107427 on perl-Syntax-Highlight-Engine-Kate (Fedora 10) To make changes to this package see: /pkgdb/packages/name/perl-Syntax-Highlight-Engine-Kate From pkgdb at fedoraproject.org Tue Nov 3 04:39:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:39:21 +0000 Subject: [pkgdb] 389-adminutil (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043921.AADE510F87D@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for 389-adminutil kevin has set commit to Approved for 107427 on 389-adminutil (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on 389-adminutil (Fedora EPEL 4) kevin has set build to Approved for 107427 on 389-adminutil (Fedora EPEL 4) kevin changed owner of 389-adminutil in Fedora EPEL 4 to stahnma To make changes to this package see: /pkgdb/packages/name/389-adminutil From pkgdb at fedoraproject.org Tue Nov 3 04:39:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:39:21 +0000 Subject: [pkgdb] 389-adminutil (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043921.BD96310F7F5@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for 389-adminutil kevin has set commit to Approved for 107427 on 389-adminutil (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on 389-adminutil (Fedora EPEL 5) kevin has set build to Approved for 107427 on 389-adminutil (Fedora EPEL 5) kevin changed owner of 389-adminutil in Fedora EPEL 5 to stahnma To make changes to this package see: /pkgdb/packages/name/389-adminutil From pkgdb at fedoraproject.org Tue Nov 3 04:39:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:39:52 +0000 Subject: [pkgdb] 389-ds-console (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043952.C7ADE10F879@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for 389-ds-console kevin has set commit to Approved for 107427 on 389-ds-console (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on 389-ds-console (Fedora EPEL 4) kevin has set build to Approved for 107427 on 389-ds-console (Fedora EPEL 4) kevin changed owner of 389-ds-console in Fedora EPEL 4 to stahnma To make changes to this package see: /pkgdb/packages/name/389-ds-console From pkgdb at fedoraproject.org Tue Nov 3 04:39:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:39:52 +0000 Subject: [pkgdb] 389-ds-console (Fedora EPEL, 4) updated by kevin Message-ID: <20091103043952.D5C6810F87F@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for 389-ds-console kevin has set commit to Approved for 107427 on 389-ds-console (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on 389-ds-console (Fedora EPEL 5) kevin has set build to Approved for 107427 on 389-ds-console (Fedora EPEL 5) kevin changed owner of 389-ds-console in Fedora EPEL 5 to stahnma To make changes to this package see: /pkgdb/packages/name/389-ds-console From pkgdb at fedoraproject.org Tue Nov 3 04:40:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:40:20 +0000 Subject: [pkgdb] 389-ds (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044020.D5C4310F87E@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for 389-ds kevin has set commit to Approved for 107427 on 389-ds (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on 389-ds (Fedora EPEL 5) kevin has set build to Approved for 107427 on 389-ds (Fedora EPEL 5) kevin changed owner of 389-ds in Fedora EPEL 5 to stahnma To make changes to this package see: /pkgdb/packages/name/389-ds From pkgdb at fedoraproject.org Tue Nov 3 04:40:20 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:40:20 +0000 Subject: [pkgdb] 389-ds (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044020.5AE7F10F874@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for 389-ds kevin has set commit to Approved for 107427 on 389-ds (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on 389-ds (Fedora EPEL 4) kevin has set build to Approved for 107427 on 389-ds (Fedora EPEL 4) kevin changed owner of 389-ds in Fedora EPEL 4 to stahnma To make changes to this package see: /pkgdb/packages/name/389-ds From pkgdb at fedoraproject.org Tue Nov 3 04:40:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:40:50 +0000 Subject: [pkgdb] 389-ds-base (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044050.A56F810F87D@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for 389-ds-base kevin has set commit to Approved for 107427 on 389-ds-base (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on 389-ds-base (Fedora EPEL 4) kevin has set build to Approved for 107427 on 389-ds-base (Fedora EPEL 4) kevin changed owner of 389-ds-base in Fedora EPEL 4 to stahnma To make changes to this package see: /pkgdb/packages/name/389-ds-base From pkgdb at fedoraproject.org Tue Nov 3 04:40:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:40:50 +0000 Subject: [pkgdb] 389-ds-base (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044050.AF2B910F880@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for 389-ds-base kevin has set commit to Approved for 107427 on 389-ds-base (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on 389-ds-base (Fedora EPEL 5) kevin has set build to Approved for 107427 on 389-ds-base (Fedora EPEL 5) kevin changed owner of 389-ds-base in Fedora EPEL 5 to stahnma To make changes to this package see: /pkgdb/packages/name/389-ds-base From pkgdb at fedoraproject.org Tue Nov 3 04:41:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:41:33 +0000 Subject: [pkgdb] 389-admin (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044133.C481E10F879@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for 389-admin kevin has set commit to Approved for 107427 on 389-admin (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on 389-admin (Fedora EPEL 4) kevin has set build to Approved for 107427 on 389-admin (Fedora EPEL 4) kevin changed owner of 389-admin in Fedora EPEL 4 to stahnma To make changes to this package see: /pkgdb/packages/name/389-admin From pkgdb at fedoraproject.org Tue Nov 3 04:41:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:41:33 +0000 Subject: [pkgdb] 389-admin (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044133.E50EA10F87D@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for 389-admin kevin has set commit to Approved for 107427 on 389-admin (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on 389-admin (Fedora EPEL 5) kevin has set build to Approved for 107427 on 389-admin (Fedora EPEL 5) kevin changed owner of 389-admin in Fedora EPEL 5 to stahnma To make changes to this package see: /pkgdb/packages/name/389-admin From pkgdb at fedoraproject.org Tue Nov 3 04:42:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:42:24 +0000 Subject: [pkgdb] 389-admin-console (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044224.CB86210F874@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for 389-admin-console kevin has set commit to Approved for 107427 on 389-admin-console (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on 389-admin-console (Fedora EPEL 4) kevin has set build to Approved for 107427 on 389-admin-console (Fedora EPEL 4) kevin changed owner of 389-admin-console in Fedora EPEL 4 to stahnma To make changes to this package see: /pkgdb/packages/name/389-admin-console From pkgdb at fedoraproject.org Tue Nov 3 04:42:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:42:24 +0000 Subject: [pkgdb] 389-admin-console (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044224.D921410F87E@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for 389-admin-console kevin has set commit to Approved for 107427 on 389-admin-console (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on 389-admin-console (Fedora EPEL 5) kevin has set build to Approved for 107427 on 389-admin-console (Fedora EPEL 5) kevin changed owner of 389-admin-console in Fedora EPEL 5 to stahnma To make changes to this package see: /pkgdb/packages/name/389-admin-console From pkgdb at fedoraproject.org Tue Nov 3 04:42:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:42:54 +0000 Subject: [pkgdb] 389-dsgw (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044254.9970410F87E@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for 389-dsgw kevin has set commit to Approved for 107427 on 389-dsgw (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on 389-dsgw (Fedora EPEL 4) kevin has set build to Approved for 107427 on 389-dsgw (Fedora EPEL 4) kevin changed owner of 389-dsgw in Fedora EPEL 4 to stahnma To make changes to this package see: /pkgdb/packages/name/389-dsgw From pkgdb at fedoraproject.org Tue Nov 3 04:42:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:42:54 +0000 Subject: [pkgdb] 389-dsgw (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044254.A290A10F882@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for 389-dsgw kevin has set commit to Approved for 107427 on 389-dsgw (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on 389-dsgw (Fedora EPEL 5) kevin has set build to Approved for 107427 on 389-dsgw (Fedora EPEL 5) kevin changed owner of 389-dsgw in Fedora EPEL 5 to stahnma To make changes to this package see: /pkgdb/packages/name/389-dsgw From pkgdb at fedoraproject.org Tue Nov 3 04:43:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:43:36 +0000 Subject: [pkgdb] perl-POE (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044336.9912210F879@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for perl-POE kevin has set commit to Approved for 107427 on perl-POE (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on perl-POE (Fedora EPEL 4) kevin has set build to Approved for 107427 on perl-POE (Fedora EPEL 4) kevin changed owner of perl-POE in Fedora EPEL 4 to stevetraylen To make changes to this package see: /pkgdb/packages/name/perl-POE From pkgdb at fedoraproject.org Tue Nov 3 04:43:36 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:43:36 +0000 Subject: [pkgdb] perl-POE (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044336.ABFF610F87F@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for perl-POE kevin has set commit to Approved for 107427 on perl-POE (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on perl-POE (Fedora EPEL 5) kevin has set build to Approved for 107427 on perl-POE (Fedora EPEL 5) kevin changed owner of perl-POE in Fedora EPEL 5 to stevetraylen To make changes to this package see: /pkgdb/packages/name/perl-POE From pkgdb at fedoraproject.org Tue Nov 3 04:45:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:45:31 +0000 Subject: [pkgdb] 389-console (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044531.1495B10F874@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 4 branch for 389-console kevin has set commit to Approved for 107427 on 389-console (Fedora EPEL 4) kevin has set checkout to Approved for 107427 on 389-console (Fedora EPEL 4) kevin has set build to Approved for 107427 on 389-console (Fedora EPEL 4) kevin changed owner of 389-console in Fedora EPEL 4 to stahnma To make changes to this package see: /pkgdb/packages/name/389-console From pkgdb at fedoraproject.org Tue Nov 3 04:45:31 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 04:45:31 +0000 Subject: [pkgdb] 389-console (Fedora EPEL, 4) updated by kevin Message-ID: <20091103044531.29EBD10F87E@bastion2.fedora.phx.redhat.com> kevin added a Fedora EPEL 5 branch for 389-console kevin has set commit to Approved for 107427 on 389-console (Fedora EPEL 5) kevin has set checkout to Approved for 107427 on 389-console (Fedora EPEL 5) kevin has set build to Approved for 107427 on 389-console (Fedora EPEL 5) kevin changed owner of 389-console in Fedora EPEL 5 to stahnma To make changes to this package see: /pkgdb/packages/name/389-console From airlied at fedoraproject.org Tue Nov 3 05:00:38 2009 From: airlied at fedoraproject.org (Dave Airlie) Date: Tue, 3 Nov 2009 05:00:38 +0000 (UTC) Subject: rpms/kernel/F-12 drm-r600-lenovo-w500-fix.patch, 1.1, 1.2 kernel.spec, 1.1897, 1.1898 Message-ID: <20091103050038.9283911C01EA@cvs1.fedora.phx.redhat.com> Author: airlied Update of /cvs/pkgs/rpms/kernel/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3720 Modified Files: drm-r600-lenovo-w500-fix.patch kernel.spec Log Message: * Tue Nov 03 2009 Dave Airlie 2.6.31.5-112 - drm-r600-lenovo-w500-fix.patch: add second patch from upstream fix drm-r600-lenovo-w500-fix.patch: r600.c | 45 +++++++++++++++++++-------------------------- rv515.c | 3 ++- 2 files changed, 21 insertions(+), 27 deletions(-) Index: drm-r600-lenovo-w500-fix.patch =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-r600-lenovo-w500-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- drm-r600-lenovo-w500-fix.patch 3 Nov 2009 03:38:38 -0000 1.1 +++ drm-r600-lenovo-w500-fix.patch 3 Nov 2009 05:00:37 -0000 1.2 @@ -28,3 +28,84 @@ index 41a34c2..03c052d 100644 -- 1.6.5.1 +From dec3349eafc083eaeeae97590ceea6ca569b87aa Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Tue, 3 Nov 2009 14:54:36 +1000 +Subject: [PATCH] drm/radeon/kms: stop putting VRAM at 0 in MC space on r600s. + +The Lenovo W500 laptop hangs inside an SMI on brightness changes, +I thought it just needed the VGA disable but it turned out to require +slightly more work, setting the MC locations up just like the IGP +chip requirements seems to make it all happy again and I can boot +and play with brightness. + +We should probably just do this for all chips and give up the VRAM +at 0x0 idea, it never seems to buy us anything but pain. + +Signed-off-by: Dave Airlie +--- + drivers/gpu/drm/radeon/r600.c | 44 +++++++++++++++++----------------------- + 1 files changed, 19 insertions(+), 25 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c +index e87475c..6bbb3cb 100644 +--- a/drivers/gpu/drm/radeon/r600.c ++++ b/drivers/gpu/drm/radeon/r600.c +@@ -409,35 +409,29 @@ int r600_mc_init(struct radeon_device *rdev) + rdev->mc.gtt_location = rdev->mc.mc_vram_size; + } + } else { +- if (rdev->family == CHIP_RS780 || rdev->family == CHIP_RS880) { +- rdev->mc.vram_location = (RREG32(MC_VM_FB_LOCATION) & +- 0xFFFF) << 24; +- rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024; +- tmp = rdev->mc.vram_location + rdev->mc.mc_vram_size; +- if ((0xFFFFFFFFUL - tmp) >= rdev->mc.gtt_size) { +- /* Enough place after vram */ +- rdev->mc.gtt_location = tmp; +- } else if (rdev->mc.vram_location >= rdev->mc.gtt_size) { +- /* Enough place before vram */ ++ rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024; ++ rdev->mc.vram_location = (RREG32(MC_VM_FB_LOCATION) & ++ 0xFFFF) << 24; ++ tmp = rdev->mc.vram_location + rdev->mc.mc_vram_size; ++ if ((0xFFFFFFFFUL - tmp) >= rdev->mc.gtt_size) { ++ /* Enough place after vram */ ++ rdev->mc.gtt_location = tmp; ++ } else if (rdev->mc.vram_location >= rdev->mc.gtt_size) { ++ /* Enough place before vram */ ++ rdev->mc.gtt_location = 0; ++ } else { ++ /* Not enough place after or before shrink ++ * gart size ++ */ ++ if (rdev->mc.vram_location > (0xFFFFFFFFUL - tmp)) { + rdev->mc.gtt_location = 0; ++ rdev->mc.gtt_size = rdev->mc.vram_location; + } else { +- /* Not enough place after or before shrink +- * gart size +- */ +- if (rdev->mc.vram_location > (0xFFFFFFFFUL - tmp)) { +- rdev->mc.gtt_location = 0; +- rdev->mc.gtt_size = rdev->mc.vram_location; +- } else { +- rdev->mc.gtt_location = tmp; +- rdev->mc.gtt_size = 0xFFFFFFFFUL - tmp; +- } ++ rdev->mc.gtt_location = tmp; ++ rdev->mc.gtt_size = 0xFFFFFFFFUL - tmp; + } +- rdev->mc.gtt_location = rdev->mc.mc_vram_size; +- } else { +- rdev->mc.vram_location = 0x00000000UL; +- rdev->mc.gtt_location = rdev->mc.mc_vram_size; +- rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024; + } ++ rdev->mc.gtt_location = rdev->mc.mc_vram_size; + } + rdev->mc.vram_start = rdev->mc.vram_location; + rdev->mc.vram_end = rdev->mc.vram_location + rdev->mc.mc_vram_size - 1; +-- +1.6.5.1 + Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v retrieving revision 1.1897 retrieving revision 1.1898 diff -u -p -r1.1897 -r1.1898 --- kernel.spec 3 Nov 2009 03:38:39 -0000 1.1897 +++ kernel.spec 3 Nov 2009 05:00:37 -0000 1.1898 @@ -2112,6 +2112,9 @@ fi # and build. %changelog +* Tue Nov 03 2009 Dave Airlie 2.6.31.5-112 +- drm-r600-lenovo-w500-fix.patch: add second patch from upstream fix + * Tue Nov 03 2009 Dave Airlie 2.6.31.5-111 - drm-r600-lenovo-w500-fix.patch: fix lenovo w500 acpi video kill laptop dead - drop aspm r600 patch as correct fix should be in 110 From kyle at fedoraproject.org Tue Nov 3 05:02:46 2009 From: kyle at fedoraproject.org (Kyle McMartin) Date: Tue, 3 Nov 2009 05:02:46 +0000 (UTC) Subject: rpms/kernel/devel patch-2.6.32-rc5-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1139, 1.1140 git-linus.diff, 1.19, 1.20 kernel.spec, 1.1836, 1.1837 sources, 1.1098, 1.1099 upstream, 1.1011, 1.1012 patch-2.6.32-rc5-git5.bz2.sign, 1.1, NONE Message-ID: <20091103050246.8E56611C00EE@cvs1.fedora.phx.redhat.com> Author: kyle Update of /cvs/pkgs/rpms/kernel/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13148 Modified Files: .cvsignore git-linus.diff kernel.spec sources upstream Added Files: patch-2.6.32-rc5-git6.bz2.sign Removed Files: patch-2.6.32-rc5-git5.bz2.sign Log Message: * Mon Nov 02 2009 Kyle McMartin 2.6.32-0.39.rc5.git6 - 2.6.32-rc5-git6 (with sandeen's reversion of "ext4: Remove journal_checksum mount option and enable it by default") --- NEW FILE patch-2.6.32-rc5-git6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBK73TtyGugalF9Dw4RAoMVAJ0VgxGWj4+oaQXOfZk2QFi7T9hRNQCdGHwp xfclvc8IX1KiIO4L7vkAcVk= =ocuf -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v retrieving revision 1.1139 retrieving revision 1.1140 diff -u -p -r1.1139 -r1.1140 --- .cvsignore 2 Nov 2009 10:33:29 -0000 1.1139 +++ .cvsignore 3 Nov 2009 05:02:44 -0000 1.1140 @@ -6,4 +6,4 @@ temp-* kernel-2.6.31 linux-2.6.31.tar.bz2 patch-2.6.32-rc5.bz2 -patch-2.6.32-rc5-git5.bz2 +patch-2.6.32-rc5-git6.bz2 git-linus.diff: 0 files changed Index: git-linus.diff =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- git-linus.diff 15 Oct 2009 02:07:11 -0000 1.19 +++ git-linus.diff 3 Nov 2009 05:02:44 -0000 1.20 @@ -1 +0,0 @@ -empty Index: kernel.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v retrieving revision 1.1836 retrieving revision 1.1837 diff -u -p -r1.1836 -r1.1837 --- kernel.spec 2 Nov 2009 10:33:29 -0000 1.1836 +++ kernel.spec 3 Nov 2009 05:02:45 -0000 1.1837 @@ -61,7 +61,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1971,6 +1971,10 @@ fi # ############################################################## %changelog +* Mon Nov 02 2009 Kyle McMartin 2.6.32-0.39.rc5.git6 +- 2.6.32-rc5-git6 (with sandeen's reversion of "ext4: Remove journal_checksum + mount option and enable it by default") + * Mon Nov 02 2009 Chuck Ebbert - 2.6.32-rc5-git5 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v retrieving revision 1.1098 retrieving revision 1.1099 diff -u -p -r1.1098 -r1.1099 --- sources 2 Nov 2009 10:33:29 -0000 1.1098 +++ sources 3 Nov 2009 05:02:46 -0000 1.1099 @@ -1,3 +1,3 @@ 84c077a37684e4cbfa67b18154390d8a linux-2.6.31.tar.bz2 29cfdb080df74d97e89e27bc855b0160 patch-2.6.32-rc5.bz2 -9ae6d9778c6634c5970973d08b0bcee1 patch-2.6.32-rc5-git5.bz2 +8ac6298e387d8817adc470c33a6bb142 patch-2.6.32-rc5-git6.bz2 Index: upstream =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v retrieving revision 1.1011 retrieving revision 1.1012 diff -u -p -r1.1011 -r1.1012 --- upstream 2 Nov 2009 10:33:29 -0000 1.1011 +++ upstream 3 Nov 2009 05:02:46 -0000 1.1012 @@ -1,4 +1,4 @@ linux-2.6.31.tar.bz2 patch-2.6.32-rc5.bz2 -patch-2.6.32-rc5-git5.bz2 +patch-2.6.32-rc5-git6.bz2 --- patch-2.6.32-rc5-git5.bz2.sign DELETED --- From toshio at fedoraproject.org Tue Nov 3 05:28:45 2009 From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=) Date: Tue, 3 Nov 2009 05:28:45 +0000 (UTC) Subject: rpms/python-setuptools/devel .cvsignore, 1.15, 1.16 python-setuptools.spec, 1.23, 1.24 sources, 1.15, 1.16 Message-ID: <20091103052845.E28FA11C00E8@cvs1.fedora.phx.redhat.com> Author: toshio Update of /cvs/pkgs/rpms/python-setuptools/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28434 Modified Files: .cvsignore python-setuptools.spec sources Log Message: * Tue Nov 3 2009 Toshio Kuratomi - 0.6.7-1 - Move easy_install back into the main package as the needed files have been moved from python-devel to the main python package. - Update to 0.6.7 bugfix. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/python-setuptools/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- .cvsignore 18 Oct 2009 05:32:38 -0000 1.15 +++ .cvsignore 3 Nov 2009 05:28:45 -0000 1.16 @@ -1 +1 @@ -distribute-0.6.6.tar.gz +distribute-0.6.7.tar.gz Index: python-setuptools.spec =================================================================== RCS file: /cvs/pkgs/rpms/python-setuptools/devel/python-setuptools.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- python-setuptools.spec 18 Oct 2009 05:32:38 -0000 1.23 +++ python-setuptools.spec 3 Nov 2009 05:28:45 -0000 1.24 @@ -1,9 +1,9 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %global srcname distribute Name: python-setuptools -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} Summary: Easily build and distribute Python packages @@ -21,6 +21,11 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildArch: noarch BuildRequires: python-devel +# Legacy: We removed this subpackage once easy_install no longer depended on +# python-devel +Provides: python-setuptools-devel = %{version}-%{release} +Obsoletes: python-setuptools-devel < %{version}-%{release} + %description Setuptools is a collection of enhancements to the Python distutils that allow you to more easily build and distribute Python packages, especially ones that @@ -29,21 +34,6 @@ have dependencies on other packages. This package contains the runtime components of setuptools, necessary to execute the software that requires pkg_resources.py. -%package devel -Summary: Download, install, upgrade, and uninstall Python packages -Group: Development/Languages -Requires: python-devel -Requires: %{name} = %{version}-%{release} - -%description devel -setuptools is a collection of enhancements to the Python distutils that allow -you to more easily build and distribute Python packages, especially ones that -have dependencies on other packages. - -This package contains the components necessary to build and install software -requiring setuptools. - - %prep %setup -q -n %{srcname}-%{version} find -name '*.txt' | xargs chmod -x @@ -77,15 +67,16 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc psfl.txt zpl.txt docs %{python_sitelib}/* -%exclude %{python_sitelib}/easy_install* - -%files devel -%defattr(-,root,root,-) %{python_sitelib}/easy_install* %{_bindir}/* %changelog +* Tue Nov 3 2009 Toshio Kuratomi - 0.6.7-1 +- Move easy_install back into the main package as the needed files have been + moved from python-devel to the main python package. +- Update to 0.6.7 bugfix. + * Fri Oct 16 2009 Toshio Kuratomi - 0.6.6-1 - Upstream bugfix release. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/python-setuptools/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- sources 18 Oct 2009 05:32:38 -0000 1.15 +++ sources 3 Nov 2009 05:28:45 -0000 1.16 @@ -1 +1 @@ -a0a7541a8169d73842e4bb88d79cf8d3 distribute-0.6.6.tar.gz +b79b9422b1ea517bf3b43e277e9c813a distribute-0.6.7.tar.gz From mclasen at fedoraproject.org Tue Nov 3 06:17:57 2009 From: mclasen at fedoraproject.org (Matthias Clasen) Date: Tue, 3 Nov 2009 06:17:57 +0000 (UTC) Subject: rpms/xdg-user-dirs/F-12 typo.patch, NONE, 1.1 use-fuzzy.patch, NONE, 1.1 xdg-user-dirs.spec, 1.13, 1.14 Message-ID: <20091103061757.7844811C00E8@cvs1.fedora.phx.redhat.com> Author: mclasen Update of /cvs/pkgs/rpms/xdg-user-dirs/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9931 Modified Files: xdg-user-dirs.spec Added Files: typo.patch use-fuzzy.patch Log Message: Use fuzzy translations for Downloads typo.patch: README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE typo.patch --- diff -up xdg-user-dirs-0.11/README.typo xdg-user-dirs-0.11/README --- xdg-user-dirs-0.11/README.typo 2009-11-03 01:13:00.592863477 -0500 +++ xdg-user-dirs-0.11/README 2009-11-03 01:13:20.565861652 -0500 @@ -1,2 +1,2 @@ See info at: -http://freedesktop.org/wiki/Software_2fxdg_2duser_2ddirs +http://freedesktop.org/wiki/Software/xdg-user-dirs use-fuzzy.patch: Makefile.in.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- NEW FILE use-fuzzy.patch --- diff -up xdg-user-dirs-0.11/po/Makefile.in.in.use-fuzzy xdg-user-dirs-0.11/po/Makefile.in.in --- xdg-user-dirs-0.11/po/Makefile.in.in.use-fuzzy 2008-10-24 04:17:03.000000000 -0400 +++ xdg-user-dirs-0.11/po/Makefile.in.in 2009-11-03 00:57:15.319114230 -0500 @@ -61,14 +61,14 @@ CATALOGS = @CATALOGS@ .SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update .po.mo: - @echo "$(MSGFMT) -c -o $@ $<"; \ - $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ + @echo "$(MSGFMT) -c -f -o $@ $<"; \ + $(MSGFMT) -c -f -o t-$@ $< && mv t-$@ $@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c -f --statistics -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c -f --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ Index: xdg-user-dirs.spec =================================================================== RCS file: /cvs/pkgs/rpms/xdg-user-dirs/F-12/xdg-user-dirs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- xdg-user-dirs.spec 25 Sep 2009 12:54:36 -0000 1.13 +++ xdg-user-dirs.spec 3 Nov 2009 06:17:56 -0000 1.14 @@ -1,6 +1,6 @@ Name: xdg-user-dirs Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Handles user special directories Group: User Interface/Desktops @@ -8,6 +8,13 @@ License: GPLv2+ and MIT URL: http://freedesktop.org/wiki/Software/xdg-user-dirs Source0: http://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz Source1: xdg-user-dirs.sh + +# use fuzzy translations (for Downloads) +# https://bugzilla.redhat.com/show_bug.cgi?id=532399 +Patch0: use-fuzzy.patch +# fix a typo in README +Patch1: typo.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -19,11 +26,17 @@ homedirectory based on the defaults conf %prep %setup -q +%patch0 -p1 -b .use-fuzzy +%patch1 -p1 -b .typo %build %configure make %{?_smp_mflags} +cd po +touch *.po +make update-gmo + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -45,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/X11/xinit/xinitrc.d/* %changelog +* Tue Nov 3 2009 Matthias Clasen - 0.11-2 +- Use fuzzy translations (for Downloads) (#532399) +- Fix a typo in README + * Fri Sep 25 2009 Alexander Larsson - 0.11-1 - Update to 0.11 From kushal at fedoraproject.org Tue Nov 3 06:38:54 2009 From: kushal at fedoraproject.org (Kushal Das) Date: Tue, 3 Nov 2009 06:38:54 +0000 (UTC) Subject: rpms/pony/devel .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 pony.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <20091103063855.04AF311C00E8@cvs1.fedora.phx.redhat.com> Author: kushal Update of /cvs/extras/rpms/pony/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16333/devel Modified Files: .cvsignore import.log pony.spec sources Log Message: Importing the new release of pony Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pony/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 3 Jun 2009 10:25:41 -0000 1.3 +++ .cvsignore 3 Nov 2009 06:38:53 -0000 1.4 @@ -1 +1 @@ -pony-0.2.tar.bz2 +pony-0.4.tar.bz2 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pony/devel/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- import.log 3 Jun 2009 10:25:41 -0000 1.2 +++ import.log 3 Nov 2009 06:38:53 -0000 1.3 @@ -1,2 +1,3 @@ pony-0_1-2_fc11:HEAD:pony-0.1-2.fc11.src.rpm:1243529951 pony-0_2-1_fc11:HEAD:pony-0.2-1.fc11.src.rpm:1244024810 +pony-0_4-1_fc11:HEAD:pony-0.4-1.fc11.src.rpm:1257230065 Index: pony.spec =================================================================== RCS file: /cvs/extras/rpms/pony/devel/pony.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- pony.spec 26 Jul 2009 19:10:29 -0000 1.3 +++ pony.spec 3 Nov 2009 06:38:53 -0000 1.4 @@ -1,6 +1,6 @@ Name: pony -Version: 0.2 -Release: 2%{?dist} +Version: 0.4 +Release: 1%{?dist} Summary: An image manager Group: Applications/Multimedia @@ -34,7 +34,7 @@ Pony is a simple image manager %prep %setup -q - +sed -i -e "s|#!/usr/bin/env python||" gviewUI.py %build mkdir -p %{_target_platform} @@ -97,6 +97,9 @@ gtk-update-icon-cache %{_datadir}/icons/ %changelog +* Fri Aug 14 2009 Kushal Das 0.4-1 +- New release of pony + * Sun Jul 26 2009 Fedora Release Engineering - 0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/pony/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 3 Jun 2009 10:25:41 -0000 1.3 +++ sources 3 Nov 2009 06:38:53 -0000 1.4 @@ -1 +1 @@ -34f6f11419eaeb9f333343a7597a12d5 pony-0.2.tar.bz2 +1ab83cbe353244f14d72e6b07c60c76f pony-0.4.tar.bz2 From red at fedoraproject.org Tue Nov 3 06:46:32 2009 From: red at fedoraproject.org (Sandro Mathys) Date: Tue, 3 Nov 2009 06:46:32 +0000 (UTC) Subject: rpms/jettison/devel import.log, NONE, 1.1 jettison.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103064632.CF24111C00E8@cvs1.fedora.phx.redhat.com> Author: red Update of /cvs/pkgs/rpms/jettison/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18502/devel Modified Files: .cvsignore sources Added Files: import.log jettison.spec Log Message: initial commit --- NEW FILE import.log --- jettison-1_1-1_fc11:HEAD:jettison-1.1-1.fc11.src.rpm:1257230733 --- NEW FILE jettison.spec --- Name: jettison Version: 1.1 Release: 1%{?dist} Summary: A JSON StAX implementation Group: Development/Libraries License: ASL 2.0 URL: http://jettison.codehaus.org/ Source0: http://repository.codehaus.org/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-sources.jar BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils Requires: java >= 1:1.6.0 Requires: jpackage-utils %description Jettison is a collection of Java APIs (like STaX and DOM) which read and write JSON. This allows nearly transparent enablement of JSON based web services in services frameworks like CXF or XML serialization frameworks like XStream. %package javadoc Summary: Javadocs for jettison Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc jettison development documentation. %prep %setup -q -c mkdir target doc %build javac -d target `find -name '*.java'` jar -cf %{name}-%{version}.jar -C target . javadoc -author -version -public -d doc `find . -name '*.java'` %install rm -rf $RPM_BUILD_ROOT # jar install -d $RPM_BUILD_ROOT%{_javadir} install -m644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # javadoc install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc META-INF/LICENSE %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %files javadoc %defattr(-,root,root,-) %dir %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %{_javadocdir}/%{name}-%{version}/* %changelog * Sun Jun 28 2009 Sandro Mathys - 1.1-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jettison/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:35:02 -0000 1.1 +++ .cvsignore 3 Nov 2009 06:46:31 -0000 1.2 @@ -0,0 +1 @@ +jettison-1.1-sources.jar Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jettison/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:35:03 -0000 1.1 +++ sources 3 Nov 2009 06:46:32 -0000 1.2 @@ -0,0 +1 @@ +18fc476a6f53a702abee17d6bfd60eb6 jettison-1.1-sources.jar From red at fedoraproject.org Tue Nov 3 06:48:01 2009 From: red at fedoraproject.org (Sandro Mathys) Date: Tue, 3 Nov 2009 06:48:01 +0000 (UTC) Subject: rpms/jettison/F-11 import.log, NONE, 1.1 jettison.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103064801.9738F11C00E8@cvs1.fedora.phx.redhat.com> Author: red Update of /cvs/pkgs/rpms/jettison/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19128/F-11 Modified Files: .cvsignore sources Added Files: import.log jettison.spec Log Message: inital commit --- NEW FILE import.log --- jettison-1_1-1_fc11:F-11:jettison-1.1-1.fc11.src.rpm:1257230859 --- NEW FILE jettison.spec --- Name: jettison Version: 1.1 Release: 1%{?dist} Summary: A JSON StAX implementation Group: Development/Libraries License: ASL 2.0 URL: http://jettison.codehaus.org/ Source0: http://repository.codehaus.org/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-sources.jar BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils Requires: java >= 1:1.6.0 Requires: jpackage-utils %description Jettison is a collection of Java APIs (like STaX and DOM) which read and write JSON. This allows nearly transparent enablement of JSON based web services in services frameworks like CXF or XML serialization frameworks like XStream. %package javadoc Summary: Javadocs for jettison Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc jettison development documentation. %prep %setup -q -c mkdir target doc %build javac -d target `find -name '*.java'` jar -cf %{name}-%{version}.jar -C target . javadoc -author -version -public -d doc `find . -name '*.java'` %install rm -rf $RPM_BUILD_ROOT # jar install -d $RPM_BUILD_ROOT%{_javadir} install -m644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # javadoc install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc META-INF/LICENSE %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %files javadoc %defattr(-,root,root,-) %dir %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %{_javadocdir}/%{name}-%{version}/* %changelog * Sun Jun 28 2009 Sandro Mathys - 1.1-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jettison/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:35:02 -0000 1.1 +++ .cvsignore 3 Nov 2009 06:48:01 -0000 1.2 @@ -0,0 +1 @@ +jettison-1.1-sources.jar Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jettison/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:35:03 -0000 1.1 +++ sources 3 Nov 2009 06:48:01 -0000 1.2 @@ -0,0 +1 @@ +18fc476a6f53a702abee17d6bfd60eb6 jettison-1.1-sources.jar From red at fedoraproject.org Tue Nov 3 06:49:04 2009 From: red at fedoraproject.org (Sandro Mathys) Date: Tue, 3 Nov 2009 06:49:04 +0000 (UTC) Subject: rpms/jettison/F-12 import.log, NONE, 1.1 jettison.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103064904.8F2A111C00E8@cvs1.fedora.phx.redhat.com> Author: red Update of /cvs/pkgs/rpms/jettison/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19527/F-12 Modified Files: .cvsignore sources Added Files: import.log jettison.spec Log Message: initial commit --- NEW FILE import.log --- jettison-1_1-1_fc11:F-12:jettison-1.1-1.fc11.src.rpm:1257230917 --- NEW FILE jettison.spec --- Name: jettison Version: 1.1 Release: 1%{?dist} Summary: A JSON StAX implementation Group: Development/Libraries License: ASL 2.0 URL: http://jettison.codehaus.org/ Source0: http://repository.codehaus.org/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-sources.jar BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils Requires: java >= 1:1.6.0 Requires: jpackage-utils %description Jettison is a collection of Java APIs (like STaX and DOM) which read and write JSON. This allows nearly transparent enablement of JSON based web services in services frameworks like CXF or XML serialization frameworks like XStream. %package javadoc Summary: Javadocs for jettison Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc jettison development documentation. %prep %setup -q -c mkdir target doc %build javac -d target `find -name '*.java'` jar -cf %{name}-%{version}.jar -C target . javadoc -author -version -public -d doc `find . -name '*.java'` %install rm -rf $RPM_BUILD_ROOT # jar install -d $RPM_BUILD_ROOT%{_javadir} install -m644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # javadoc install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc META-INF/LICENSE %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %files javadoc %defattr(-,root,root,-) %dir %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %{_javadocdir}/%{name}-%{version}/* %changelog * Sun Jun 28 2009 Sandro Mathys - 1.1-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jettison/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:35:02 -0000 1.1 +++ .cvsignore 3 Nov 2009 06:49:04 -0000 1.2 @@ -0,0 +1 @@ +jettison-1.1-sources.jar Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jettison/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:35:03 -0000 1.1 +++ sources 3 Nov 2009 06:49:04 -0000 1.2 @@ -0,0 +1 @@ +18fc476a6f53a702abee17d6bfd60eb6 jettison-1.1-sources.jar From red at fedoraproject.org Tue Nov 3 06:51:09 2009 From: red at fedoraproject.org (Sandro Mathys) Date: Tue, 3 Nov 2009 06:51:09 +0000 (UTC) Subject: rpms/jettison/EL-4 import.log, NONE, 1.1 jettison.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103065109.ABECA11C00E8@cvs1.fedora.phx.redhat.com> Author: red Update of /cvs/pkgs/rpms/jettison/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20060/EL-4 Modified Files: .cvsignore sources Added Files: import.log jettison.spec Log Message: initial commit --- NEW FILE import.log --- jettison-1_1-1_fc11:EL-4:jettison-1.1-1.fc11.src.rpm:1257230979 --- NEW FILE jettison.spec --- Name: jettison Version: 1.1 Release: 1%{?dist} Summary: A JSON StAX implementation Group: Development/Libraries License: ASL 2.0 URL: http://jettison.codehaus.org/ Source0: http://repository.codehaus.org/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-sources.jar BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils Requires: java >= 1:1.6.0 Requires: jpackage-utils %description Jettison is a collection of Java APIs (like STaX and DOM) which read and write JSON. This allows nearly transparent enablement of JSON based web services in services frameworks like CXF or XML serialization frameworks like XStream. %package javadoc Summary: Javadocs for jettison Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc jettison development documentation. %prep %setup -q -c mkdir target doc %build javac -d target `find -name '*.java'` jar -cf %{name}-%{version}.jar -C target . javadoc -author -version -public -d doc `find . -name '*.java'` %install rm -rf $RPM_BUILD_ROOT # jar install -d $RPM_BUILD_ROOT%{_javadir} install -m644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # javadoc install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc META-INF/LICENSE %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %files javadoc %defattr(-,root,root,-) %dir %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %{_javadocdir}/%{name}-%{version}/* %changelog * Sun Jun 28 2009 Sandro Mathys - 1.1-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jettison/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:35:02 -0000 1.1 +++ .cvsignore 3 Nov 2009 06:51:09 -0000 1.2 @@ -0,0 +1 @@ +jettison-1.1-sources.jar Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jettison/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:35:03 -0000 1.1 +++ sources 3 Nov 2009 06:51:09 -0000 1.2 @@ -0,0 +1 @@ +18fc476a6f53a702abee17d6bfd60eb6 jettison-1.1-sources.jar From red at fedoraproject.org Tue Nov 3 06:54:50 2009 From: red at fedoraproject.org (Sandro Mathys) Date: Tue, 3 Nov 2009 06:54:50 +0000 (UTC) Subject: rpms/jettison/EL-5 import.log, NONE, 1.1 jettison.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103065450.AC07C11C00E8@cvs1.fedora.phx.redhat.com> Author: red Update of /cvs/pkgs/rpms/jettison/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20672/EL-5 Modified Files: .cvsignore sources Added Files: import.log jettison.spec Log Message: initial commit --- NEW FILE import.log --- jettison-1_1-1_fc11:EL-5:jettison-1.1-1.fc11.src.rpm:1257231104 --- NEW FILE jettison.spec --- Name: jettison Version: 1.1 Release: 1%{?dist} Summary: A JSON StAX implementation Group: Development/Libraries License: ASL 2.0 URL: http://jettison.codehaus.org/ Source0: http://repository.codehaus.org/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-sources.jar BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils Requires: java >= 1:1.6.0 Requires: jpackage-utils %description Jettison is a collection of Java APIs (like STaX and DOM) which read and write JSON. This allows nearly transparent enablement of JSON based web services in services frameworks like CXF or XML serialization frameworks like XStream. %package javadoc Summary: Javadocs for jettison Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils %description javadoc jettison development documentation. %prep %setup -q -c mkdir target doc %build javac -d target `find -name '*.java'` jar -cf %{name}-%{version}.jar -C target . javadoc -author -version -public -d doc `find . -name '*.java'` %install rm -rf $RPM_BUILD_ROOT # jar install -d $RPM_BUILD_ROOT%{_javadir} install -m644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # javadoc install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc META-INF/LICENSE %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %files javadoc %defattr(-,root,root,-) %dir %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %{_javadocdir}/%{name}-%{version}/* %changelog * Sun Jun 28 2009 Sandro Mathys - 1.1-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/jettison/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:35:02 -0000 1.1 +++ .cvsignore 3 Nov 2009 06:54:49 -0000 1.2 @@ -0,0 +1 @@ +jettison-1.1-sources.jar Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/jettison/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:35:03 -0000 1.1 +++ sources 3 Nov 2009 06:54:50 -0000 1.2 @@ -0,0 +1 @@ +18fc476a6f53a702abee17d6bfd60eb6 jettison-1.1-sources.jar From mkent at fedoraproject.org Tue Nov 3 07:33:55 2009 From: mkent at fedoraproject.org (Matthew Kent) Date: Tue, 3 Nov 2009 07:33:55 +0000 (UTC) Subject: rpms/rubygem-archive-tar-minitar/devel import.log, NONE, 1.1 rubygem-archive-tar-minitar-0.5.2-fix-tests.patch, NONE, 1.1 rubygem-archive-tar-minitar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103073356.2418611C00E8@cvs1.fedora.phx.redhat.com> Author: mkent Update of /cvs/pkgs/rpms/rubygem-archive-tar-minitar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv842/devel Modified Files: .cvsignore sources Added Files: import.log rubygem-archive-tar-minitar-0.5.2-fix-tests.patch rubygem-archive-tar-minitar.spec Log Message: - Initial CVS import --- NEW FILE import.log --- rubygem-archive-tar-minitar-0_5_2-2_magoazul:HEAD:rubygem-archive-tar-minitar-0.5.2-2.magoazul.src.rpm:1257233611 rubygem-archive-tar-minitar-0.5.2-fix-tests.patch: tc_tar.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) --- NEW FILE rubygem-archive-tar-minitar-0.5.2-fix-tests.patch --- --- tests/tc_tar.rb.orig 2009-10-26 22:34:53.054062448 -0700 +++ tests/tc_tar.rb 2009-10-26 22:36:49.222080730 -0700 @@ -463,20 +463,22 @@ include TarTester require 'rbconfig' + require 'time' - TEST_TGZ = "\037\213\010\000\001B1A\000\vKI,I\324+I,\322K\257b\240\0250\000\002sSS\254\342 `dj\306``nnnbndbjd\000\0247336`P0\240\231\213\220 at i1\320\367 at +\351a\327 \004\362\335\034\f\313\034\r\035\031\270\337Ns\344b2\344q\335\375M\304\266QM1W\357\321>\221U\021\005\246\306\367\356\367u3\262;\212\004\265\236\\\334}\351,\377\037;\217\223\301e\247\030\024\\\236\211\277\347\346sii\265\010\330\355\234\240\362\274\371[\202\361\366\302S\316\335o&~m\237r\355\377\303\230\365\352WNW\334\266_\373\273\237\347Q\315t?\263{\377?\006\271\337?\367\207\325\346]\371\376y\307_\234~d\3772\265\346\261}\323\317\373\315\352\377O\376\271/\305\377?X\253\324\303S\373\361\347\277\372^)\267\377\363\03460\331\311\\wW|\031\203\300@\207\325p\004i\2319\251\3064\266\203P\376702B\313\377\246\246\006&\243\371\237\036 $#\263X\001\210@\351@\301XO\201\227k\240]4\nF\301(\030\005\243\200\036\000\000\004\330t\023\000\f\000\000" - FILETIMES = Time.mktime(2004).to_i + # generated with tar 1.22 via tar --format=ustar -czvf + TEST_TGZ = "\037\213\b\000u\000\344J\000\003KI,I\324+I,\322K\257b\240\0250\000\002sSS\020mhnj\200L\203\201\261\2419\203\201\271\271\271\211\271\221\211\251\021P\334\320\330\304\324\214A\301\200f.B\002\245\305@\337\003\235\222\233\235\232W\202G\035!y\250_\340\364\020\001\362\335\034\f\321\fO\274\030\230\337^\273\317\325d r\374c\354w\221\352\246\242\342b\375K\177\005L&\375\213\231\261\267~\366\224\220\200D\003\345?u\002}\v6<\356\263\217\b-{\352\265d*\353\271[\021S7\337\254\335+8\263\370\234E\356\032\276\357^\317\255\304/\251\275[]nW\232*\035e\371\346U\362\367g{\375\317\267\363\357\274f\037x\364g\376\254\332\265\227\326\n~_l\360\354\353\237\257\237\377\034\376\301\255\250~\363\310\314\363\365{s\375\214b>\212O\310\332\371\243\324~\306\265\t\365s\363z\327\177z\177\342\277\210\334\247\365'\377\337\371\362\363\373\276\254\250\367\301s\231\217\317\377\377\351P\344\271z\204\037\f\216\261\n\356\316\351c\320\030\270`\034\262 -3'\325\230\306v\020\312\377\006FFh\371\337\310\330\330d4\3 77\323\003\204dd\026+\000\021(\035(\030\353)\360r\r\264\213F\301(\030\005\243`\024\214\202Q0\nF\301(\030\005\243`\024\214\202Q0\nF\301(\030\005\243`\024\214\202Q0\nF\301(\030\005\243`\024\214\202Q0\nF\001)\000\000\277\313\321J\000(\000\000" + FILETIMES = Time.parse('Thu Jan 01 00:00:00 EST 2004').to_i TEST_CONTENTS = [ - [ "data.tar.gz", 174, 0755 ], + [ "data.tar.gz", 207, 0755 ], [ "file3", 18, 0755 ], ] TEST_DATA_CONTENTS = [ - [ "data", 0, 040755 ], - [ "data/file1", 16, 010644 ], - [ "data/file2", 16, 010644 ], - [ "data/__dir__", 0, 010644 ], + [ "data/", 0, 0755, 040755 ], # both tar and unix permissions + [ "data/file1", 16, 0644, 0100644 ], + [ "data/file2", 16, 0644, 0100644 ], + [ "data/__dir__/", 0, 0755, 040755 ], ] def setup @@ -550,7 +552,7 @@ assert(File.file?(name2)) assert_equal(TEST_DATA_CONTENTS[jj][1], File.stat(name2).size, name2) end - assert_equal(TEST_DATA_CONTENTS[jj][2], File.stat(name2).mode, name2) unless RUBY_PLATFORM =~ /win32/ + assert_equal(TEST_DATA_CONTENTS[jj][3], File.stat(name2).mode, name2) unless RUBY_PLATFORM =~ /win32/ end end ensure --- NEW FILE rubygem-archive-tar-minitar.spec --- # Generated from archive-tar-minitar-0.5.2.gem by gem2rpm -*- rpm-spec -*- %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname archive-tar-minitar %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: Provides POSIX tar archive management from Ruby programs Name: rubygem-%{gemname} Version: 0.5.2 Release: 2%{?dist} Group: Development/Languages License: GPLv2+ or Ruby URL: http://rubyforge.org/projects/ruwiki Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem # Reported upstream via # http://rubyforge.org/tracker/?func=detail&aid=27356&group_id=84&atid=409 Patch0: rubygem-archive-tar-minitar-0.5.2-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} BuildRequires: ruby(rubygems) BuildRequires: ruby(abi) = %{rubyabi} BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects. %package doc Summary: Documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. %prep %setup -q -c -T mkdir -p .%{gemdir} gem install -V \ --local \ --install-dir $(pwd)/%{gemdir} \ --force --rdoc \ %{SOURCE0} pushd .%{geminstdir} %patch0 -p0 %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ mkdir -p %{buildroot}/%{_bindir} mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} rmdir %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x find %{buildroot}%{geminstdir}/{lib,tests} -type f | \ xargs -n 1 sed -i -e '/^#!\/usr\/bin\/env ruby/d' find %{buildroot}%{geminstdir}/bin -type f | \ xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"' # require_gem is deprecated # http://rubyforge.org/tracker/?func=detail&aid=22034&group_id=84&atid=409 sed -i 's^require_gem^gem^' %{buildroot}%{geminstdir}/bin/minitar %clean rm -rf %{buildroot} %check pushd .%{geminstdir} ruby tests/tc_tar.rb %files %defattr(-,root,root,-) %{_bindir}/minitar %doc %{geminstdir}/README %doc %{geminstdir}/ChangeLog %doc %{geminstdir}/Install %dir %{geminstdir} # Rakefile wants to load gemspec which isn't shipped with gem, drop it as it's # broken for now %exclude %{geminstdir}/Rakefile %exclude %{geminstdir}/Install %{geminstdir}/bin %{geminstdir}/lib %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files doc %defattr(-,root,root,-) %{geminstdir}/tests %{gemdir}/doc/%{gemname}-%{version} %changelog * Mon Nov 02 2009 Matthew Kent - 0.5.2-2 - Fix license (#531408). - Exclude Install (#531408). * Mon Oct 26 2009 Matthew Kent - 0.5.2-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-archive-tar-minitar/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:45:50 -0000 1.1 +++ .cvsignore 3 Nov 2009 07:33:53 -0000 1.2 @@ -0,0 +1 @@ +archive-tar-minitar-0.5.2.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-archive-tar-minitar/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:45:51 -0000 1.1 +++ sources 3 Nov 2009 07:33:54 -0000 1.2 @@ -0,0 +1 @@ +c8bf480d64cd6be11c0670870dbd760c archive-tar-minitar-0.5.2.gem From mkent at fedoraproject.org Tue Nov 3 07:35:54 2009 From: mkent at fedoraproject.org (Matthew Kent) Date: Tue, 3 Nov 2009 07:35:54 +0000 (UTC) Subject: rpms/rubygem-archive-tar-minitar/F-11 import.log, NONE, 1.1 rubygem-archive-tar-minitar-0.5.2-fix-tests.patch, NONE, 1.1 rubygem-archive-tar-minitar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103073555.0A53811C00E8@cvs1.fedora.phx.redhat.com> Author: mkent Update of /cvs/pkgs/rpms/rubygem-archive-tar-minitar/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1552/F-11 Modified Files: .cvsignore sources Added Files: import.log rubygem-archive-tar-minitar-0.5.2-fix-tests.patch rubygem-archive-tar-minitar.spec Log Message: - Initial CVS import --- NEW FILE import.log --- rubygem-archive-tar-minitar-0_5_2-2_magoazul:F-11:rubygem-archive-tar-minitar-0.5.2-2.magoazul.src.rpm:1257233735 rubygem-archive-tar-minitar-0.5.2-fix-tests.patch: tc_tar.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) --- NEW FILE rubygem-archive-tar-minitar-0.5.2-fix-tests.patch --- --- tests/tc_tar.rb.orig 2009-10-26 22:34:53.054062448 -0700 +++ tests/tc_tar.rb 2009-10-26 22:36:49.222080730 -0700 @@ -463,20 +463,22 @@ include TarTester require 'rbconfig' + require 'time' - TEST_TGZ = "\037\213\010\000\001B1A\000\vKI,I\324+I,\322K\257b\240\0250\000\002sSS\254\342 `dj\306``nnnbndbjd\000\0247336`P0\240\231\213\220 at i1\320\367 at +\351a\327 \004\362\335\034\f\313\034\r\035\031\270\337Ns\344b2\344q\335\375M\304\266QM1W\357\321>\221U\021\005\246\306\367\356\367u3\262;\212\004\265\236\\\334}\351,\377\037;\217\223\301e\247\030\024\\\236\211\277\347\346sii\265\010\330\355\234\240\362\274\371[\202\361\366\302S\316\335o&~m\237r\355\377\303\230\365\352WNW\334\266_\373\273\237\347Q\315t?\263{\377?\006\271\337?\367\207\325\346]\371\376y\307_\234~d\3772\265\346\261}\323\317\373\315\352\377O\376\271/\305\377?X\253\324\303S\373\361\347\277\372^)\267\377\363\03460\331\311\\wW|\031\203\300@\207\325p\004i\2319\251\3064\266\203P\376702B\313\377\246\246\006&\243\371\237\036 $#\263X\001\210@\351@\301XO\201\227k\240]4\nF\301(\030\005\243\200\036\000\000\004\330t\023\000\f\000\000" - FILETIMES = Time.mktime(2004).to_i + # generated with tar 1.22 via tar --format=ustar -czvf + TEST_TGZ = "\037\213\b\000u\000\344J\000\003KI,I\324+I,\322K\257b\240\0250\000\002sSS\020mhnj\200L\203\201\261\2419\203\201\271\271\271\211\271\221\211\251\021P\334\320\330\304\324\214A\301\200f.B\002\245\305@\337\003\235\222\233\235\232W\202G\035!y\250_\340\364\020\001\362\335\034\f\321\fO\274\030\230\337^\273\317\325d r\374c\354w\221\352\246\242\342b\375K\177\005L&\375\213\231\261\267~\366\224\220\200D\003\345?u\002}\v6<\356\263\217\b-{\352\265d*\353\271[\021S7\337\254\335+8\263\370\234E\356\032\276\357^\317\255\304/\251\275[]nW\232*\035e\371\346U\362\367g{\375\317\267\363\357\274f\037x\364g\376\254\332\265\227\326\n~_l\360\354\353\237\257\237\377\034\376\301\255\250~\363\310\314\363\365{s\375\214b>\212O\310\332\371\243\324~\306\265\t\365s\363z\327\177z\177\342\277\210\334\247\365'\377\337\371\362\363\373\276\254\250\367\301s\231\217\317\377\377\351P\344\271z\204\037\f\216\261\n\356\316\351c\320\030\270`\034\262 -3'\325\230\306v\020\312\377\006FFh\371\337\310\330\330d4\3 77\323\003\204dd\026+\000\021(\035(\030\353)\360r\r\264\213F\301(\030\005\243`\024\214\202Q0\nF\301(\030\005\243`\024\214\202Q0\nF\301(\030\005\243`\024\214\202Q0\nF\301(\030\005\243`\024\214\202Q0\nF\001)\000\000\277\313\321J\000(\000\000" + FILETIMES = Time.parse('Thu Jan 01 00:00:00 EST 2004').to_i TEST_CONTENTS = [ - [ "data.tar.gz", 174, 0755 ], + [ "data.tar.gz", 207, 0755 ], [ "file3", 18, 0755 ], ] TEST_DATA_CONTENTS = [ - [ "data", 0, 040755 ], - [ "data/file1", 16, 010644 ], - [ "data/file2", 16, 010644 ], - [ "data/__dir__", 0, 010644 ], + [ "data/", 0, 0755, 040755 ], # both tar and unix permissions + [ "data/file1", 16, 0644, 0100644 ], + [ "data/file2", 16, 0644, 0100644 ], + [ "data/__dir__/", 0, 0755, 040755 ], ] def setup @@ -550,7 +552,7 @@ assert(File.file?(name2)) assert_equal(TEST_DATA_CONTENTS[jj][1], File.stat(name2).size, name2) end - assert_equal(TEST_DATA_CONTENTS[jj][2], File.stat(name2).mode, name2) unless RUBY_PLATFORM =~ /win32/ + assert_equal(TEST_DATA_CONTENTS[jj][3], File.stat(name2).mode, name2) unless RUBY_PLATFORM =~ /win32/ end end ensure --- NEW FILE rubygem-archive-tar-minitar.spec --- # Generated from archive-tar-minitar-0.5.2.gem by gem2rpm -*- rpm-spec -*- %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname archive-tar-minitar %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: Provides POSIX tar archive management from Ruby programs Name: rubygem-%{gemname} Version: 0.5.2 Release: 2%{?dist} Group: Development/Languages License: GPLv2+ or Ruby URL: http://rubyforge.org/projects/ruwiki Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem # Reported upstream via # http://rubyforge.org/tracker/?func=detail&aid=27356&group_id=84&atid=409 Patch0: rubygem-archive-tar-minitar-0.5.2-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} BuildRequires: ruby(rubygems) BuildRequires: ruby(abi) = %{rubyabi} BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects. %package doc Summary: Documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. %prep %setup -q -c -T mkdir -p .%{gemdir} gem install -V \ --local \ --install-dir $(pwd)/%{gemdir} \ --force --rdoc \ %{SOURCE0} pushd .%{geminstdir} %patch0 -p0 %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ mkdir -p %{buildroot}/%{_bindir} mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} rmdir %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x find %{buildroot}%{geminstdir}/{lib,tests} -type f | \ xargs -n 1 sed -i -e '/^#!\/usr\/bin\/env ruby/d' find %{buildroot}%{geminstdir}/bin -type f | \ xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"' # require_gem is deprecated # http://rubyforge.org/tracker/?func=detail&aid=22034&group_id=84&atid=409 sed -i 's^require_gem^gem^' %{buildroot}%{geminstdir}/bin/minitar %clean rm -rf %{buildroot} %check pushd .%{geminstdir} ruby tests/tc_tar.rb %files %defattr(-,root,root,-) %{_bindir}/minitar %doc %{geminstdir}/README %doc %{geminstdir}/ChangeLog %doc %{geminstdir}/Install %dir %{geminstdir} # Rakefile wants to load gemspec which isn't shipped with gem, drop it as it's # broken for now %exclude %{geminstdir}/Rakefile %exclude %{geminstdir}/Install %{geminstdir}/bin %{geminstdir}/lib %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files doc %defattr(-,root,root,-) %{geminstdir}/tests %{gemdir}/doc/%{gemname}-%{version} %changelog * Mon Nov 02 2009 Matthew Kent - 0.5.2-2 - Fix license (#531408). - Exclude Install (#531408). * Mon Oct 26 2009 Matthew Kent - 0.5.2-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-archive-tar-minitar/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:45:50 -0000 1.1 +++ .cvsignore 3 Nov 2009 07:35:52 -0000 1.2 @@ -0,0 +1 @@ +archive-tar-minitar-0.5.2.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-archive-tar-minitar/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:45:51 -0000 1.1 +++ sources 3 Nov 2009 07:35:54 -0000 1.2 @@ -0,0 +1 @@ +c8bf480d64cd6be11c0670870dbd760c archive-tar-minitar-0.5.2.gem From mkent at fedoraproject.org Tue Nov 3 07:37:17 2009 From: mkent at fedoraproject.org (Matthew Kent) Date: Tue, 3 Nov 2009 07:37:17 +0000 (UTC) Subject: rpms/rubygem-archive-tar-minitar/F-12 import.log, NONE, 1.1 rubygem-archive-tar-minitar-0.5.2-fix-tests.patch, NONE, 1.1 rubygem-archive-tar-minitar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103073717.7227A11C00E8@cvs1.fedora.phx.redhat.com> Author: mkent Update of /cvs/pkgs/rpms/rubygem-archive-tar-minitar/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2064/F-12 Modified Files: .cvsignore sources Added Files: import.log rubygem-archive-tar-minitar-0.5.2-fix-tests.patch rubygem-archive-tar-minitar.spec Log Message: - Initial CVS import --- NEW FILE import.log --- rubygem-archive-tar-minitar-0_5_2-2_magoazul:F-12:rubygem-archive-tar-minitar-0.5.2-2.magoazul.src.rpm:1257233792 rubygem-archive-tar-minitar-0.5.2-fix-tests.patch: tc_tar.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) --- NEW FILE rubygem-archive-tar-minitar-0.5.2-fix-tests.patch --- --- tests/tc_tar.rb.orig 2009-10-26 22:34:53.054062448 -0700 +++ tests/tc_tar.rb 2009-10-26 22:36:49.222080730 -0700 @@ -463,20 +463,22 @@ include TarTester require 'rbconfig' + require 'time' - TEST_TGZ = "\037\213\010\000\001B1A\000\vKI,I\324+I,\322K\257b\240\0250\000\002sSS\254\342 `dj\306``nnnbndbjd\000\0247336`P0\240\231\213\220 at i1\320\367 at +\351a\327 \004\362\335\034\f\313\034\r\035\031\270\337Ns\344b2\344q\335\375M\304\266QM1W\357\321>\221U\021\005\246\306\367\356\367u3\262;\212\004\265\236\\\334}\351,\377\037;\217\223\301e\247\030\024\\\236\211\277\347\346sii\265\010\330\355\234\240\362\274\371[\202\361\366\302S\316\335o&~m\237r\355\377\303\230\365\352WNW\334\266_\373\273\237\347Q\315t?\263{\377?\006\271\337?\367\207\325\346]\371\376y\307_\234~d\3772\265\346\261}\323\317\373\315\352\377O\376\271/\305\377?X\253\324\303S\373\361\347\277\372^)\267\377\363\03460\331\311\\wW|\031\203\300@\207\325p\004i\2319\251\3064\266\203P\376702B\313\377\246\246\006&\243\371\237\036 $#\263X\001\210@\351@\301XO\201\227k\240]4\nF\301(\030\005\243\200\036\000\000\004\330t\023\000\f\000\000" - FILETIMES = Time.mktime(2004).to_i + # generated with tar 1.22 via tar --format=ustar -czvf + TEST_TGZ = "\037\213\b\000u\000\344J\000\003KI,I\324+I,\322K\257b\240\0250\000\002sSS\020mhnj\200L\203\201\261\2419\203\201\271\271\271\211\271\221\211\251\021P\334\320\330\304\324\214A\301\200f.B\002\245\305@\337\003\235\222\233\235\232W\202G\035!y\250_\340\364\020\001\362\335\034\f\321\fO\274\030\230\337^\273\317\325d r\374c\354w\221\352\246\242\342b\375K\177\005L&\375\213\231\261\267~\366\224\220\200D\003\345?u\002}\v6<\356\263\217\b-{\352\265d*\353\271[\021S7\337\254\335+8\263\370\234E\356\032\276\357^\317\255\304/\251\275[]nW\232*\035e\371\346U\362\367g{\375\317\267\363\357\274f\037x\364g\376\254\332\265\227\326\n~_l\360\354\353\237\257\237\377\034\376\301\255\250~\363\310\314\363\365{s\375\214b>\212O\310\332\371\243\324~\306\265\t\365s\363z\327\177z\177\342\277\210\334\247\365'\377\337\371\362\363\373\276\254\250\367\301s\231\217\317\377\377\351P\344\271z\204\037\f\216\261\n\356\316\351c\320\030\270`\034\262 -3'\325\230\306v\020\312\377\006FFh\371\337\310\330\330d4\3 77\323\003\204dd\026+\000\021(\035(\030\353)\360r\r\264\213F\301(\030\005\243`\024\214\202Q0\nF\301(\030\005\243`\024\214\202Q0\nF\301(\030\005\243`\024\214\202Q0\nF\301(\030\005\243`\024\214\202Q0\nF\001)\000\000\277\313\321J\000(\000\000" + FILETIMES = Time.parse('Thu Jan 01 00:00:00 EST 2004').to_i TEST_CONTENTS = [ - [ "data.tar.gz", 174, 0755 ], + [ "data.tar.gz", 207, 0755 ], [ "file3", 18, 0755 ], ] TEST_DATA_CONTENTS = [ - [ "data", 0, 040755 ], - [ "data/file1", 16, 010644 ], - [ "data/file2", 16, 010644 ], - [ "data/__dir__", 0, 010644 ], + [ "data/", 0, 0755, 040755 ], # both tar and unix permissions + [ "data/file1", 16, 0644, 0100644 ], + [ "data/file2", 16, 0644, 0100644 ], + [ "data/__dir__/", 0, 0755, 040755 ], ] def setup @@ -550,7 +552,7 @@ assert(File.file?(name2)) assert_equal(TEST_DATA_CONTENTS[jj][1], File.stat(name2).size, name2) end - assert_equal(TEST_DATA_CONTENTS[jj][2], File.stat(name2).mode, name2) unless RUBY_PLATFORM =~ /win32/ + assert_equal(TEST_DATA_CONTENTS[jj][3], File.stat(name2).mode, name2) unless RUBY_PLATFORM =~ /win32/ end end ensure --- NEW FILE rubygem-archive-tar-minitar.spec --- # Generated from archive-tar-minitar-0.5.2.gem by gem2rpm -*- rpm-spec -*- %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname archive-tar-minitar %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: Provides POSIX tar archive management from Ruby programs Name: rubygem-%{gemname} Version: 0.5.2 Release: 2%{?dist} Group: Development/Languages License: GPLv2+ or Ruby URL: http://rubyforge.org/projects/ruwiki Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem # Reported upstream via # http://rubyforge.org/tracker/?func=detail&aid=27356&group_id=84&atid=409 Patch0: rubygem-archive-tar-minitar-0.5.2-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} BuildRequires: ruby(rubygems) BuildRequires: ruby(abi) = %{rubyabi} BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects. %package doc Summary: Documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. %prep %setup -q -c -T mkdir -p .%{gemdir} gem install -V \ --local \ --install-dir $(pwd)/%{gemdir} \ --force --rdoc \ %{SOURCE0} pushd .%{geminstdir} %patch0 -p0 %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ mkdir -p %{buildroot}/%{_bindir} mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} rmdir %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x find %{buildroot}%{geminstdir}/{lib,tests} -type f | \ xargs -n 1 sed -i -e '/^#!\/usr\/bin\/env ruby/d' find %{buildroot}%{geminstdir}/bin -type f | \ xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"' # require_gem is deprecated # http://rubyforge.org/tracker/?func=detail&aid=22034&group_id=84&atid=409 sed -i 's^require_gem^gem^' %{buildroot}%{geminstdir}/bin/minitar %clean rm -rf %{buildroot} %check pushd .%{geminstdir} ruby tests/tc_tar.rb %files %defattr(-,root,root,-) %{_bindir}/minitar %doc %{geminstdir}/README %doc %{geminstdir}/ChangeLog %doc %{geminstdir}/Install %dir %{geminstdir} # Rakefile wants to load gemspec which isn't shipped with gem, drop it as it's # broken for now %exclude %{geminstdir}/Rakefile %exclude %{geminstdir}/Install %{geminstdir}/bin %{geminstdir}/lib %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files doc %defattr(-,root,root,-) %{geminstdir}/tests %{gemdir}/doc/%{gemname}-%{version} %changelog * Mon Nov 02 2009 Matthew Kent - 0.5.2-2 - Fix license (#531408). - Exclude Install (#531408). * Mon Oct 26 2009 Matthew Kent - 0.5.2-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-archive-tar-minitar/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:45:50 -0000 1.1 +++ .cvsignore 3 Nov 2009 07:37:16 -0000 1.2 @@ -0,0 +1 @@ +archive-tar-minitar-0.5.2.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-archive-tar-minitar/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:45:51 -0000 1.1 +++ sources 3 Nov 2009 07:37:17 -0000 1.2 @@ -0,0 +1 @@ +c8bf480d64cd6be11c0670870dbd760c archive-tar-minitar-0.5.2.gem From mkent at fedoraproject.org Tue Nov 3 07:40:36 2009 From: mkent at fedoraproject.org (Matthew Kent) Date: Tue, 3 Nov 2009 07:40:36 +0000 (UTC) Subject: rpms/rubygem-erubis/devel import.log, NONE, 1.1 rubygem-erubis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103074036.612D311C0419@cvs1.fedora.phx.redhat.com> Author: mkent Update of /cvs/pkgs/rpms/rubygem-erubis/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3828/devel Modified Files: .cvsignore sources Added Files: import.log rubygem-erubis.spec Log Message: - Initial CVS import --- NEW FILE import.log --- rubygem-erubis-2_6_5-2_magoazul:HEAD:rubygem-erubis-2.6.5-2.magoazul.src.rpm:1257234011 --- NEW FILE rubygem-erubis.spec --- # Generated from erubis-2.6.5.gem by gem2rpm -*- rpm-spec -*- %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname erubis %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: A fast and extensible eRuby implementation Name: rubygem-%{gemname} Version: 2.6.5 Release: 2%{?dist} Group: Development/Languages License: MIT URL: http://www.kuwata-lab.com/erubis/ Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: rubygem(abstract) >= 1.0.0 BuildRequires: ruby(rubygems) BuildRequires: ruby(abi) = %{rubyabi} BuildRequires(check): rubygem(abstract) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Erubis is a very fast, secure, and extensible implementation of eRuby. %package doc Summary: Documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. %prep %setup -q -c -T %build mkdir -p .%{gemdir} gem install -V \ --local \ --install-dir $(pwd)/%{gemdir} \ --force --rdoc \ %{SOURCE0} # Wrong filename mv $(pwd)/.%{geminstdir}/test/data/users-guide/Example.ejava \ $(pwd)/.%{geminstdir}/test/data/users-guide/example.ejava %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ mkdir -p %{buildroot}/%{_bindir} mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} rmdir %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x find %{buildroot}%{geminstdir}/{bin,contrib} -type f | \ xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"' find %{buildroot}%{geminstdir}/benchmark -type f | \ xargs -n 1 sed -i -e '/^#!\/usr\/bin\/env ruby/d' %clean rm -rf %{buildroot} # Wants to test using the installed binary and gem, work around this # Reported upstream via # http://rubyforge.org/tracker/?func=detail&aid=27330&group_id=1320&atid=5201 %check export GEM_PATH=$(pwd)/%{gemdir} export PATH=$(pwd)/%{gemdir}/bin:$PATH pushd .%{geminstdir}/test find data/users-guide -type f -name \*.rb | \ xargs sed -i -e '/require.*erubis/i\require "rubygems"' ruby -rrubygems test.rb %files %defattr(-,root,root,-) %{_bindir}/erubis %doc %{geminstdir}/CHANGES.txt %doc %{geminstdir}/MIT-LICENSE %doc %{geminstdir}/README.txt %dir %{geminstdir} # We install via gem %exclude %{geminstdir}/setup.rb %{geminstdir}/bin %{geminstdir}/lib %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files doc %defattr(-,root,root,-) %{geminstdir}/benchmark %{geminstdir}/test %{geminstdir}/examples %{geminstdir}/contrib # Prefer generated rdoc %exclude %{geminstdir}/doc-api %{geminstdir}/doc %{gemdir}/doc/%{gemname}-%{version} %changelog * Thu Oct 29 2009 Matthew Kent - 2.6.5-2 - Move file rename to build stage (#530275). - Simplify %%check stage (#530275). - Remove disable of test_syntax2, fixed by new ruby build (#530275). * Mon Oct 19 2009 Matthew Kent - 2.6.5-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-erubis/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:44:43 -0000 1.1 +++ .cvsignore 3 Nov 2009 07:40:34 -0000 1.2 @@ -0,0 +1 @@ +erubis-2.6.5.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-erubis/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:44:43 -0000 1.1 +++ sources 3 Nov 2009 07:40:35 -0000 1.2 @@ -0,0 +1 @@ +071dc576fe9f1c547ef2993e0be942b0 erubis-2.6.5.gem From mkent at fedoraproject.org Tue Nov 3 07:41:49 2009 From: mkent at fedoraproject.org (Matthew Kent) Date: Tue, 3 Nov 2009 07:41:49 +0000 (UTC) Subject: rpms/rubygem-erubis/F-11 import.log, NONE, 1.1 rubygem-erubis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103074149.353AD11C00E8@cvs1.fedora.phx.redhat.com> Author: mkent Update of /cvs/pkgs/rpms/rubygem-erubis/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4481/F-11 Modified Files: .cvsignore sources Added Files: import.log rubygem-erubis.spec Log Message: - Initial CVS import --- NEW FILE import.log --- rubygem-erubis-2_6_5-2_magoazul:F-11:rubygem-erubis-2.6.5-2.magoazul.src.rpm:1257234082 --- NEW FILE rubygem-erubis.spec --- # Generated from erubis-2.6.5.gem by gem2rpm -*- rpm-spec -*- %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname erubis %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: A fast and extensible eRuby implementation Name: rubygem-%{gemname} Version: 2.6.5 Release: 2%{?dist} Group: Development/Languages License: MIT URL: http://www.kuwata-lab.com/erubis/ Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: rubygem(abstract) >= 1.0.0 BuildRequires: ruby(rubygems) BuildRequires: ruby(abi) = %{rubyabi} BuildRequires(check): rubygem(abstract) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Erubis is a very fast, secure, and extensible implementation of eRuby. %package doc Summary: Documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. %prep %setup -q -c -T %build mkdir -p .%{gemdir} gem install -V \ --local \ --install-dir $(pwd)/%{gemdir} \ --force --rdoc \ %{SOURCE0} # Wrong filename mv $(pwd)/.%{geminstdir}/test/data/users-guide/Example.ejava \ $(pwd)/.%{geminstdir}/test/data/users-guide/example.ejava %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ mkdir -p %{buildroot}/%{_bindir} mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} rmdir %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x find %{buildroot}%{geminstdir}/{bin,contrib} -type f | \ xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"' find %{buildroot}%{geminstdir}/benchmark -type f | \ xargs -n 1 sed -i -e '/^#!\/usr\/bin\/env ruby/d' %clean rm -rf %{buildroot} # Wants to test using the installed binary and gem, work around this # Reported upstream via # http://rubyforge.org/tracker/?func=detail&aid=27330&group_id=1320&atid=5201 %check export GEM_PATH=$(pwd)/%{gemdir} export PATH=$(pwd)/%{gemdir}/bin:$PATH pushd .%{geminstdir}/test find data/users-guide -type f -name \*.rb | \ xargs sed -i -e '/require.*erubis/i\require "rubygems"' ruby -rrubygems test.rb %files %defattr(-,root,root,-) %{_bindir}/erubis %doc %{geminstdir}/CHANGES.txt %doc %{geminstdir}/MIT-LICENSE %doc %{geminstdir}/README.txt %dir %{geminstdir} # We install via gem %exclude %{geminstdir}/setup.rb %{geminstdir}/bin %{geminstdir}/lib %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files doc %defattr(-,root,root,-) %{geminstdir}/benchmark %{geminstdir}/test %{geminstdir}/examples %{geminstdir}/contrib # Prefer generated rdoc %exclude %{geminstdir}/doc-api %{geminstdir}/doc %{gemdir}/doc/%{gemname}-%{version} %changelog * Thu Oct 29 2009 Matthew Kent - 2.6.5-2 - Move file rename to build stage (#530275). - Simplify %%check stage (#530275). - Remove disable of test_syntax2, fixed by new ruby build (#530275). * Mon Oct 19 2009 Matthew Kent - 2.6.5-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-erubis/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:44:43 -0000 1.1 +++ .cvsignore 3 Nov 2009 07:41:46 -0000 1.2 @@ -0,0 +1 @@ +erubis-2.6.5.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-erubis/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:44:43 -0000 1.1 +++ sources 3 Nov 2009 07:41:48 -0000 1.2 @@ -0,0 +1 @@ +071dc576fe9f1c547ef2993e0be942b0 erubis-2.6.5.gem From mkent at fedoraproject.org Tue Nov 3 07:42:46 2009 From: mkent at fedoraproject.org (Matthew Kent) Date: Tue, 3 Nov 2009 07:42:46 +0000 (UTC) Subject: rpms/rubygem-erubis/F-12 import.log, NONE, 1.1 rubygem-erubis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103074246.4EB8611C00E8@cvs1.fedora.phx.redhat.com> Author: mkent Update of /cvs/pkgs/rpms/rubygem-erubis/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4964/F-12 Modified Files: .cvsignore sources Added Files: import.log rubygem-erubis.spec Log Message: - Initial CVS import --- NEW FILE import.log --- rubygem-erubis-2_6_5-2_magoazul:F-12:rubygem-erubis-2.6.5-2.magoazul.src.rpm:1257234143 --- NEW FILE rubygem-erubis.spec --- # Generated from erubis-2.6.5.gem by gem2rpm -*- rpm-spec -*- %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname erubis %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global rubyabi 1.8 Summary: A fast and extensible eRuby implementation Name: rubygem-%{gemname} Version: 2.6.5 Release: 2%{?dist} Group: Development/Languages License: MIT URL: http://www.kuwata-lab.com/erubis/ Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(rubygems) Requires: ruby(abi) = %{rubyabi} Requires: rubygem(abstract) >= 1.0.0 BuildRequires: ruby(rubygems) BuildRequires: ruby(abi) = %{rubyabi} BuildRequires(check): rubygem(abstract) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Erubis is a very fast, secure, and extensible implementation of eRuby. %package doc Summary: Documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. %prep %setup -q -c -T %build mkdir -p .%{gemdir} gem install -V \ --local \ --install-dir $(pwd)/%{gemdir} \ --force --rdoc \ %{SOURCE0} # Wrong filename mv $(pwd)/.%{geminstdir}/test/data/users-guide/Example.ejava \ $(pwd)/.%{geminstdir}/test/data/users-guide/example.ejava %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} cp -a .%{gemdir}/* %{buildroot}%{gemdir}/ mkdir -p %{buildroot}/%{_bindir} mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir} rmdir %{buildroot}%{gemdir}/bin find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x find %{buildroot}%{geminstdir}/{bin,contrib} -type f | \ xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"' find %{buildroot}%{geminstdir}/benchmark -type f | \ xargs -n 1 sed -i -e '/^#!\/usr\/bin\/env ruby/d' %clean rm -rf %{buildroot} # Wants to test using the installed binary and gem, work around this # Reported upstream via # http://rubyforge.org/tracker/?func=detail&aid=27330&group_id=1320&atid=5201 %check export GEM_PATH=$(pwd)/%{gemdir} export PATH=$(pwd)/%{gemdir}/bin:$PATH pushd .%{geminstdir}/test find data/users-guide -type f -name \*.rb | \ xargs sed -i -e '/require.*erubis/i\require "rubygems"' ruby -rrubygems test.rb %files %defattr(-,root,root,-) %{_bindir}/erubis %doc %{geminstdir}/CHANGES.txt %doc %{geminstdir}/MIT-LICENSE %doc %{geminstdir}/README.txt %dir %{geminstdir} # We install via gem %exclude %{geminstdir}/setup.rb %{geminstdir}/bin %{geminstdir}/lib %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files doc %defattr(-,root,root,-) %{geminstdir}/benchmark %{geminstdir}/test %{geminstdir}/examples %{geminstdir}/contrib # Prefer generated rdoc %exclude %{geminstdir}/doc-api %{geminstdir}/doc %{gemdir}/doc/%{gemname}-%{version} %changelog * Thu Oct 29 2009 Matthew Kent - 2.6.5-2 - Move file rename to build stage (#530275). - Simplify %%check stage (#530275). - Remove disable of test_syntax2, fixed by new ruby build (#530275). * Mon Oct 19 2009 Matthew Kent - 2.6.5-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-erubis/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 31 Oct 2009 23:44:43 -0000 1.1 +++ .cvsignore 3 Nov 2009 07:42:42 -0000 1.2 @@ -0,0 +1 @@ +erubis-2.6.5.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-erubis/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 31 Oct 2009 23:44:43 -0000 1.1 +++ sources 3 Nov 2009 07:42:44 -0000 1.2 @@ -0,0 +1 @@ +071dc576fe9f1c547ef2993e0be942b0 erubis-2.6.5.gem From jnovy at fedoraproject.org Tue Nov 3 08:33:18 2009 From: jnovy at fedoraproject.org (Jindrich Novy) Date: Tue, 3 Nov 2009 08:33:18 +0000 (UTC) Subject: rpms/texlive/F-12 texlive.spec,1.56,1.57 Message-ID: <20091103083319.12C5011C00E8@cvs1.fedora.phx.redhat.com> Author: jnovy Update of /cvs/pkgs/rpms/texlive/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19251 Modified Files: texlive.spec Log Message: * Mon Nov 02 2009 Jindrich Novy 2007-47 - fix post/postun scriptlets (#532466) Index: texlive.spec =================================================================== RCS file: /cvs/pkgs/rpms/texlive/F-12/texlive.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -p -r1.56 -r1.57 --- texlive.spec 23 Oct 2009 01:42:28 -0000 1.56 +++ texlive.spec 3 Nov 2009 08:33:17 -0000 1.57 @@ -21,7 +21,7 @@ Name: texlive Version: %{texlive_ver} -Release: 46%{?dist} +Release: 47%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -678,24 +678,24 @@ rm -rf %{buildroot}%{_texmf_main}/texcon rm -rf %{buildroot} %post -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/web2c.info.gz %{_infodir}/dir -%{_bindir}/fmtutil-sys --all &> /dev/null -%{_bindir}/updmap-sys --syncwithtrees &> /dev/null +[ -x %{_bindir}/fmtutil-sys ] && %{_bindir}/fmtutil-sys --all &> /dev/null +[ -x %{_bindir}/updmap-sys ] && %{_bindir}/updmap-sys --syncwithtrees &> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post afm -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post context -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi @@ -703,21 +703,21 @@ fi %post dvips [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/dvips.info.gz %{_infodir}/dir -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post dviutils -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post east-asian -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi @@ -725,23 +725,23 @@ fi %post latex [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/latex.info.gz %{_infodir}/dir -%{_bindir}/texconfig-sys init &> /dev/null -%{_bindir}/texconfig-sys rehash 2> /dev/null -%{_bindir}/fmtutil-sys --all &> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys init &> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/fmtutil-sys ] && %{_bindir}/fmtutil-sys --all &> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post xetex -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %post -n kpathsea -/sbin/ldconfig +[ -x /sbin/ldconfig ] && /sbin/ldconfig [ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/kpathsea.info.gz %{_infodir}/dir if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ @@ -774,7 +774,7 @@ fi : %preun -n kpathsea -/sbin/ldconfig +[ -x /sbin/ldconfig ] && /sbin/ldconfig if [ "$1" = 0 ]; then [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/kpathsea.info.gz %{_infodir}/dir fi @@ -784,63 +784,63 @@ fi : %postun -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun afm -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun context -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun east-asian -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun dviutils -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun dvips -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun latex -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun xetex -%{_bindir}/texconfig-sys rehash 2> /dev/null +[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi : %postun -n kpathsea -/sbin/ldconfig +[ -x /sbin/ldconfig ] && /sbin/ldconfig if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi @@ -1237,7 +1237,10 @@ fi %{_mandir}/man1/textools.1* %{_mandir}/man1/texutil.1* -%changelog +%changelog +* Mon Nov 02 2009 Jindrich Novy 2007-47 +- fix post/postun scriptlets (#532466) + * Fri Oct 23 2009 Jindrich Novy 2007-46 - add missing dependency on kpathsea From sergiopr at fedoraproject.org Tue Nov 3 08:42:19 2009 From: sergiopr at fedoraproject.org (Sergio Pascual) Date: Tue, 3 Nov 2009 08:42:19 +0000 (UTC) Subject: rpms/cpl/devel cpl.spec,1.11,1.12 Message-ID: <20091103084219.EA67D11C0344@cvs1.fedora.phx.redhat.com> Author: sergiopr Update of /cvs/pkgs/rpms/cpl/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21692 Modified Files: cpl.spec Log Message: * Thu Nov 03 2009 Sergio Pascual 5.0.1-2 - Rebuilt for cfitsio-3.210-2 Index: cpl.spec =================================================================== RCS file: /cvs/pkgs/rpms/cpl/devel/cpl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- cpl.spec 28 Oct 2009 16:51:01 -0000 1.11 +++ cpl.spec 3 Nov 2009 08:42:19 -0000 1.12 @@ -1,6 +1,6 @@ Name: cpl Version: 5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ESO library for automated astronomical data-reduction tasks Group: Development/Libraries @@ -27,9 +27,8 @@ to shorten their development cycle and t Summary: Libraries, includes, etc. used to develop an application with %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: cfitsio-devel %description devel -This are the header files and libraries needed to develop a %{name} +These are the header files and libraries needed to develop a %{name} application %prep @@ -65,6 +64,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/*.la %changelog +* Thu Nov 03 2009 Sergio Pascual 5.0.1-2 +- Rebuilt for cfitsio-3.210-2 + * Wed Oct 28 2009 Sergio Pascual 5.0.1-1 - New upstream source From caolanm at fedoraproject.org Tue Nov 3 08:45:32 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Nov 2009 08:45:32 +0000 (UTC) Subject: rpms/openoffice.org/devel .cvsignore, 1.232, 1.233 openoffice.org.spec, 1.2057, 1.2058 sources, 1.379, 1.380 Message-ID: <20091103084532.A33E511C00E8@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23031 Modified Files: .cvsignore openoffice.org.spec sources Log Message: add Irish autocorrect rules Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.232 retrieving revision 1.233 diff -u -p -r1.232 -r1.233 --- .cvsignore 30 Oct 2009 11:46:52 -0000 1.232 +++ .cvsignore 3 Nov 2009 08:45:31 -0000 1.233 @@ -7,3 +7,4 @@ redhat-registry.tar.gz redhat-langpacks.tar.gz openoffice.org-javafilter.desktop OOO320_m3.tar.bz2 +acor_ga-IE.dat Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.2057 retrieving revision 1.2058 diff -u -p -r1.2057 -r1.2058 --- openoffice.org.spec 2 Nov 2009 08:07:31 -0000 1.2057 +++ openoffice.org.spec 3 Nov 2009 08:45:31 -0000 1.2058 @@ -51,6 +51,7 @@ Source6: redhat-registry.tar.gz Source7: redhat-langpacks.tar.gz Source8: redhat-agreement.xsl Source9: openoffice.org-javafilter.desktop +Source10: http://www.openoffice.org/nonav/issues/showattachment.cgi/65132/acor_ga-IE.dat BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++ BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -806,7 +807,7 @@ Provides additional french translations Summary: Irish language pack for OpenOffice.org Group: Applications/Productivity Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: hunspell-ga, hyphen-ga, mythes-ga +Requires: hunspell-ga, hyphen-ga, mythes-ga, autocorr-ga Obsoletes: openoffice.org2-langpack-ga_IE < 1:3.0.0 %description langpack-ga_IE @@ -1438,6 +1439,14 @@ BuildArch: noarch %description -n autocorr-fr Rules for autocorrecting common French typing errors. +%package -n autocorr-ga +Summary: Irish autocorrection rules +Group: Applications/Text +BuildArch: noarch + +%description -n autocorr-ga +Rules for autocorrecting common Irish typing errors. + %package -n autocorr-hu Summary: Hungarian autocorrection rules Group: Applications/Text @@ -1959,6 +1968,9 @@ popd #Set some aliases to canonical autocorrect language files for locales with matching languages pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr +#ooo#105600 +cp -p %{SOURCE10} acor_ga-IE.dat + #en-ZA exists and has a good autocorrect file with two or three extras that make sense for South Africa en_GB_aliases="en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK en-IE en-IN en-JM en-NG en-NZ en-SG en-TT" for lang in $en_GB_aliases; do @@ -4046,6 +4058,10 @@ update-desktop-database %{_datadir}/appl %dir %{_datadir}/autocorr %{_datadir}/autocorr/acor_fr-* +%files -n autocorr-ga +%dir %{_datadir}/autocorr +%{_datadir}/autocorr/acor_ga-* + %files -n autocorr-hu %dir %{_datadir}/autocorr %{_datadir}/autocorr/acor_hu-* Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v retrieving revision 1.379 retrieving revision 1.380 diff -u -p -r1.379 -r1.380 --- sources 30 Oct 2009 11:46:52 -0000 1.379 +++ sources 3 Nov 2009 08:45:31 -0000 1.380 @@ -6,4 +6,5 @@ f0cda31fe18bf9289629a321663031b8 redhat ffa417a9556cdb16028c83718d758bc7 redhat-langpacks.tar.gz 39a2c59cfae4019eda4a63f414c0aa54 redhat-registry.tar.gz 6c28507e29056a3afb4baffdadab8499 openoffice.org-javafilter.desktop +ef64057ee7e48ca472e80dd87f3dd426 acor_ga-IE.dat ff247bd2b075f7fdaf1d6068a1145011 OOO320_m3.tar.bz2 From caolanm at fedoraproject.org Tue Nov 3 08:46:17 2009 From: caolanm at fedoraproject.org (Caolan McNamara) Date: Tue, 3 Nov 2009 08:46:17 +0000 (UTC) Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2058,1.2059 Message-ID: <20091103084617.EF61811C00E8@cvs1.fedora.phx.redhat.com> Author: caolanm Update of /cvs/pkgs/rpms/openoffice.org/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23363 Modified Files: openoffice.org.spec Log Message: build it Index: openoffice.org.spec =================================================================== RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.2058 retrieving revision 1.2059 diff -u -p -r1.2058 -r1.2059 --- openoffice.org.spec 3 Nov 2009 08:45:31 -0000 1.2058 +++ openoffice.org.spec 3 Nov 2009 08:46:17 -0000 1.2059 @@ -4149,7 +4149,7 @@ fi unopkg list --shared > /dev/null 2>&1 || : %changelog -* Fri Oct 30 2009 Caol?n McNamara - 1:3.2.0-3.2.UNBUILT +* Tue Nov 03 2009 Caol?n McNamara - 1:3.2.0-3.2 - Resolves: ooo#106497 language marked as providing spellchecking when unavailable (caolanm) - Resolves: rhbz#532330 openoffice impress doesn't recognise .ogv From ellert at fedoraproject.org Tue Nov 3 08:52:08 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 08:52:08 +0000 (UTC) Subject: rpms/globus-scheduler-event-generator/devel globus-scheduler-event-generator.patch, NONE, 1.1 globus-scheduler-event-generator.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103085208.D609211C00E8@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-scheduler-event-generator/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25647/devel Modified Files: .cvsignore sources Added Files: globus-scheduler-event-generator.patch globus-scheduler-event-generator.spec import.log Log Message: * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated globus-scheduler-event-generator.patch: Makefile.am | 2 +- pkgdata/pkg_data_src.gpt.in | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) --- NEW FILE globus-scheduler-event-generator.patch --- diff -ur globus_scheduler_event_generator-2.1.orig/Makefile.am globus_scheduler_event_generator-2.1/Makefile.am --- globus_scheduler_event_generator-2.1.orig/Makefile.am 2006-06-05 22:23:05.000000000 +0200 +++ globus_scheduler_event_generator-2.1/Makefile.am 2009-07-29 01:06:01.170709414 +0200 @@ -26,7 +26,7 @@ # a list of libtool libraries that are to be installed in $prefix/lib lib_LTLIBRARIES = libglobus_scheduler_event_generator_$(GLOBUS_FLAVOR_NAME).la -libexec_PROGRAMS = globus-scheduler-event-generator +sbin_PROGRAMS = globus-scheduler-event-generator libglobus_scheduler_event_generator___GLOBUS_FLAVOR_NAME__la_SOURCES = \ globus_scheduler_event_generator.h globus_scheduler_event_generator.c diff -ur globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in --- globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in 2008-05-12 18:48:21.000000000 +0200 +++ globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in 2009-07-29 01:05:41.595707250 +0200 @@ -40,6 +40,17 @@ + + + + + + + + + + + @GPT_PKG_CFLAGS@ --- NEW FILE globus-scheduler-event-generator.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-scheduler-event-generator %global _name %(tr - _ <<< %{name}) Version: 2.1 Release: 1%{?dist} Summary: Globus Toolkit - Scheduler Event Generator Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/ws-gram/job_monitoring/common/c/source globus_scheduler_event_generator-2.1 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_scheduler_event_generator-2.1 # tar -zcf globus_scheduler_event_generator-2.1.tar.gz globus_scheduler_event_generator-2.1 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Add missing dependency metadata: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6819 Patch0: %{name}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} BuildRequires: grid-packaging-tools BuildRequires: globus-gram-protocol-devel%{?_isa} >= 5 BuildRequires: globus-libtool-devel%{?_isa} >= 1 BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-xio-gsi-driver-devel%{?_isa} BuildRequires: globus-xio-devel%{?_isa} BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package progs Summary: Globus Toolkit - Scheduler Event Generator Programs Group: Applications/Internet Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} %package devel Summary: Globus Toolkit - Scheduler Event Generator Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-gram-protocol-devel%{?_isa} >= 5 Requires: globus-libtool-devel%{?_isa} >= 1 Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-xio-gsi-driver-devel%{?_isa} Requires: globus-xio-devel%{?_isa} Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Scheduler Event Generator Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Scheduler Event Generator %description progs The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-progs package contains: Scheduler Event Generator Programs %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Scheduler Event Generator Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Scheduler Event Generator Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \ | sed s!^!%{_prefix}! > package-progs.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-progs.filelist progs %defattr(-,root,root,-) %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated --- NEW FILE import.log --- globus-scheduler-event-generator-2_1-1_fc11:HEAD:globus-scheduler-event-generator-2.1-1.fc11.src.rpm:1257238304 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:36:37 -0000 1.1 +++ .cvsignore 3 Nov 2009 08:52:08 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_scheduler_event_generator-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:36:37 -0000 1.1 +++ sources 3 Nov 2009 08:52:08 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +b85c470c9e64a972429d65ae89950bc5 globus_scheduler_event_generator-2.1.tar.gz From ellert at fedoraproject.org Tue Nov 3 08:53:34 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 08:53:34 +0000 (UTC) Subject: rpms/globus-scheduler-event-generator/F-12 globus-scheduler-event-generator.patch, NONE, 1.1 globus-scheduler-event-generator.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103085334.32C4C11C00E8@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-scheduler-event-generator/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26253/F-12 Modified Files: .cvsignore sources Added Files: globus-scheduler-event-generator.patch globus-scheduler-event-generator.spec import.log Log Message: * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated globus-scheduler-event-generator.patch: Makefile.am | 2 +- pkgdata/pkg_data_src.gpt.in | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) --- NEW FILE globus-scheduler-event-generator.patch --- diff -ur globus_scheduler_event_generator-2.1.orig/Makefile.am globus_scheduler_event_generator-2.1/Makefile.am --- globus_scheduler_event_generator-2.1.orig/Makefile.am 2006-06-05 22:23:05.000000000 +0200 +++ globus_scheduler_event_generator-2.1/Makefile.am 2009-07-29 01:06:01.170709414 +0200 @@ -26,7 +26,7 @@ # a list of libtool libraries that are to be installed in $prefix/lib lib_LTLIBRARIES = libglobus_scheduler_event_generator_$(GLOBUS_FLAVOR_NAME).la -libexec_PROGRAMS = globus-scheduler-event-generator +sbin_PROGRAMS = globus-scheduler-event-generator libglobus_scheduler_event_generator___GLOBUS_FLAVOR_NAME__la_SOURCES = \ globus_scheduler_event_generator.h globus_scheduler_event_generator.c diff -ur globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in --- globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in 2008-05-12 18:48:21.000000000 +0200 +++ globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in 2009-07-29 01:05:41.595707250 +0200 @@ -40,6 +40,17 @@ + + + + + + + + + + + @GPT_PKG_CFLAGS@ --- NEW FILE globus-scheduler-event-generator.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-scheduler-event-generator %global _name %(tr - _ <<< %{name}) Version: 2.1 Release: 1%{?dist} Summary: Globus Toolkit - Scheduler Event Generator Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/ws-gram/job_monitoring/common/c/source globus_scheduler_event_generator-2.1 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_scheduler_event_generator-2.1 # tar -zcf globus_scheduler_event_generator-2.1.tar.gz globus_scheduler_event_generator-2.1 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Add missing dependency metadata: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6819 Patch0: %{name}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} BuildRequires: grid-packaging-tools BuildRequires: globus-gram-protocol-devel%{?_isa} >= 5 BuildRequires: globus-libtool-devel%{?_isa} >= 1 BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-xio-gsi-driver-devel%{?_isa} BuildRequires: globus-xio-devel%{?_isa} BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package progs Summary: Globus Toolkit - Scheduler Event Generator Programs Group: Applications/Internet Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} %package devel Summary: Globus Toolkit - Scheduler Event Generator Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-gram-protocol-devel%{?_isa} >= 5 Requires: globus-libtool-devel%{?_isa} >= 1 Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-xio-gsi-driver-devel%{?_isa} Requires: globus-xio-devel%{?_isa} Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Scheduler Event Generator Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Scheduler Event Generator %description progs The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-progs package contains: Scheduler Event Generator Programs %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Scheduler Event Generator Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Scheduler Event Generator Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \ | sed s!^!%{_prefix}! > package-progs.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-progs.filelist progs %defattr(-,root,root,-) %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated --- NEW FILE import.log --- globus-scheduler-event-generator-2_1-1_fc11:F-12:globus-scheduler-event-generator-2.1-1.fc11.src.rpm:1257238388 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:36:37 -0000 1.1 +++ .cvsignore 3 Nov 2009 08:53:33 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_scheduler_event_generator-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:36:37 -0000 1.1 +++ sources 3 Nov 2009 08:53:33 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +b85c470c9e64a972429d65ae89950bc5 globus_scheduler_event_generator-2.1.tar.gz From ellert at fedoraproject.org Tue Nov 3 09:06:59 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 09:06:59 +0000 (UTC) Subject: rpms/globus-scheduler-event-generator/F-11 globus-scheduler-event-generator.patch, NONE, 1.1 globus-scheduler-event-generator.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103090659.C533F11C00E8@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-scheduler-event-generator/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30241/F-11 Modified Files: .cvsignore sources Added Files: globus-scheduler-event-generator.patch globus-scheduler-event-generator.spec import.log Log Message: * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated globus-scheduler-event-generator.patch: Makefile.am | 2 +- pkgdata/pkg_data_src.gpt.in | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) --- NEW FILE globus-scheduler-event-generator.patch --- diff -ur globus_scheduler_event_generator-2.1.orig/Makefile.am globus_scheduler_event_generator-2.1/Makefile.am --- globus_scheduler_event_generator-2.1.orig/Makefile.am 2006-06-05 22:23:05.000000000 +0200 +++ globus_scheduler_event_generator-2.1/Makefile.am 2009-07-29 01:06:01.170709414 +0200 @@ -26,7 +26,7 @@ # a list of libtool libraries that are to be installed in $prefix/lib lib_LTLIBRARIES = libglobus_scheduler_event_generator_$(GLOBUS_FLAVOR_NAME).la -libexec_PROGRAMS = globus-scheduler-event-generator +sbin_PROGRAMS = globus-scheduler-event-generator libglobus_scheduler_event_generator___GLOBUS_FLAVOR_NAME__la_SOURCES = \ globus_scheduler_event_generator.h globus_scheduler_event_generator.c diff -ur globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in --- globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in 2008-05-12 18:48:21.000000000 +0200 +++ globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in 2009-07-29 01:05:41.595707250 +0200 @@ -40,6 +40,17 @@ + + + + + + + + + + + @GPT_PKG_CFLAGS@ --- NEW FILE globus-scheduler-event-generator.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-scheduler-event-generator %global _name %(tr - _ <<< %{name}) Version: 2.1 Release: 1%{?dist} Summary: Globus Toolkit - Scheduler Event Generator Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/ws-gram/job_monitoring/common/c/source globus_scheduler_event_generator-2.1 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_scheduler_event_generator-2.1 # tar -zcf globus_scheduler_event_generator-2.1.tar.gz globus_scheduler_event_generator-2.1 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Add missing dependency metadata: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6819 Patch0: %{name}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} BuildRequires: grid-packaging-tools BuildRequires: globus-gram-protocol-devel%{?_isa} >= 5 BuildRequires: globus-libtool-devel%{?_isa} >= 1 BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-xio-gsi-driver-devel%{?_isa} BuildRequires: globus-xio-devel%{?_isa} BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package progs Summary: Globus Toolkit - Scheduler Event Generator Programs Group: Applications/Internet Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} %package devel Summary: Globus Toolkit - Scheduler Event Generator Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-gram-protocol-devel%{?_isa} >= 5 Requires: globus-libtool-devel%{?_isa} >= 1 Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-xio-gsi-driver-devel%{?_isa} Requires: globus-xio-devel%{?_isa} Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Scheduler Event Generator Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Scheduler Event Generator %description progs The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-progs package contains: Scheduler Event Generator Programs %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Scheduler Event Generator Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Scheduler Event Generator Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \ | sed s!^!%{_prefix}! > package-progs.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-progs.filelist progs %defattr(-,root,root,-) %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated --- NEW FILE import.log --- globus-scheduler-event-generator-2_1-1_fc11:F-11:globus-scheduler-event-generator-2.1-1.fc11.src.rpm:1257238460 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:36:37 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:06:59 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_scheduler_event_generator-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:36:37 -0000 1.1 +++ sources 3 Nov 2009 09:06:59 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +b85c470c9e64a972429d65ae89950bc5 globus_scheduler_event_generator-2.1.tar.gz From ellert at fedoraproject.org Tue Nov 3 09:12:18 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 09:12:18 +0000 (UTC) Subject: rpms/globus-scheduler-event-generator/EL-5 globus-scheduler-event-generator.patch, NONE, 1.1 globus-scheduler-event-generator.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103091219.00BB411C00E8@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-scheduler-event-generator/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32204/EL-5 Modified Files: .cvsignore sources Added Files: globus-scheduler-event-generator.patch globus-scheduler-event-generator.spec import.log Log Message: * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated globus-scheduler-event-generator.patch: Makefile.am | 2 +- pkgdata/pkg_data_src.gpt.in | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) --- NEW FILE globus-scheduler-event-generator.patch --- diff -ur globus_scheduler_event_generator-2.1.orig/Makefile.am globus_scheduler_event_generator-2.1/Makefile.am --- globus_scheduler_event_generator-2.1.orig/Makefile.am 2006-06-05 22:23:05.000000000 +0200 +++ globus_scheduler_event_generator-2.1/Makefile.am 2009-07-29 01:06:01.170709414 +0200 @@ -26,7 +26,7 @@ # a list of libtool libraries that are to be installed in $prefix/lib lib_LTLIBRARIES = libglobus_scheduler_event_generator_$(GLOBUS_FLAVOR_NAME).la -libexec_PROGRAMS = globus-scheduler-event-generator +sbin_PROGRAMS = globus-scheduler-event-generator libglobus_scheduler_event_generator___GLOBUS_FLAVOR_NAME__la_SOURCES = \ globus_scheduler_event_generator.h globus_scheduler_event_generator.c diff -ur globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in --- globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in 2008-05-12 18:48:21.000000000 +0200 +++ globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in 2009-07-29 01:05:41.595707250 +0200 @@ -40,6 +40,17 @@ + + + + + + + + + + + @GPT_PKG_CFLAGS@ --- NEW FILE globus-scheduler-event-generator.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-scheduler-event-generator %global _name %(tr - _ <<< %{name}) Version: 2.1 Release: 1%{?dist} Summary: Globus Toolkit - Scheduler Event Generator Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/ws-gram/job_monitoring/common/c/source globus_scheduler_event_generator-2.1 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_scheduler_event_generator-2.1 # tar -zcf globus_scheduler_event_generator-2.1.tar.gz globus_scheduler_event_generator-2.1 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Add missing dependency metadata: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6819 Patch0: %{name}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} BuildRequires: grid-packaging-tools BuildRequires: globus-gram-protocol-devel%{?_isa} >= 5 BuildRequires: globus-libtool-devel%{?_isa} >= 1 BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-xio-gsi-driver-devel%{?_isa} BuildRequires: globus-xio-devel%{?_isa} BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package progs Summary: Globus Toolkit - Scheduler Event Generator Programs Group: Applications/Internet Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} %package devel Summary: Globus Toolkit - Scheduler Event Generator Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-gram-protocol-devel%{?_isa} >= 5 Requires: globus-libtool-devel%{?_isa} >= 1 Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-xio-gsi-driver-devel%{?_isa} Requires: globus-xio-devel%{?_isa} Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Scheduler Event Generator Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Scheduler Event Generator %description progs The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-progs package contains: Scheduler Event Generator Programs %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Scheduler Event Generator Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Scheduler Event Generator Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \ | sed s!^!%{_prefix}! > package-progs.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-progs.filelist progs %defattr(-,root,root,-) %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated --- NEW FILE import.log --- globus-scheduler-event-generator-2_1-1_fc11:EL-5:globus-scheduler-event-generator-2.1-1.fc11.src.rpm:1257239273 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:36:37 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:12:18 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_scheduler_event_generator-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:36:37 -0000 1.1 +++ sources 3 Nov 2009 09:12:18 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +b85c470c9e64a972429d65ae89950bc5 globus_scheduler_event_generator-2.1.tar.gz From ellert at fedoraproject.org Tue Nov 3 09:13:36 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 09:13:36 +0000 (UTC) Subject: rpms/globus-scheduler-event-generator/EL-4 globus-scheduler-event-generator.patch, NONE, 1.1 globus-scheduler-event-generator.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103091336.5ADE811C00E8@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-scheduler-event-generator/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32753/EL-4 Modified Files: .cvsignore sources Added Files: globus-scheduler-event-generator.patch globus-scheduler-event-generator.spec import.log Log Message: * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated globus-scheduler-event-generator.patch: Makefile.am | 2 +- pkgdata/pkg_data_src.gpt.in | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) --- NEW FILE globus-scheduler-event-generator.patch --- diff -ur globus_scheduler_event_generator-2.1.orig/Makefile.am globus_scheduler_event_generator-2.1/Makefile.am --- globus_scheduler_event_generator-2.1.orig/Makefile.am 2006-06-05 22:23:05.000000000 +0200 +++ globus_scheduler_event_generator-2.1/Makefile.am 2009-07-29 01:06:01.170709414 +0200 @@ -26,7 +26,7 @@ # a list of libtool libraries that are to be installed in $prefix/lib lib_LTLIBRARIES = libglobus_scheduler_event_generator_$(GLOBUS_FLAVOR_NAME).la -libexec_PROGRAMS = globus-scheduler-event-generator +sbin_PROGRAMS = globus-scheduler-event-generator libglobus_scheduler_event_generator___GLOBUS_FLAVOR_NAME__la_SOURCES = \ globus_scheduler_event_generator.h globus_scheduler_event_generator.c diff -ur globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in --- globus_scheduler_event_generator-2.1.orig/pkgdata/pkg_data_src.gpt.in 2008-05-12 18:48:21.000000000 +0200 +++ globus_scheduler_event_generator-2.1/pkgdata/pkg_data_src.gpt.in 2009-07-29 01:05:41.595707250 +0200 @@ -40,6 +40,17 @@ + + + + + + + + + + + @GPT_PKG_CFLAGS@ --- NEW FILE globus-scheduler-event-generator.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-scheduler-event-generator %global _name %(tr - _ <<< %{name}) Version: 2.1 Release: 1%{?dist} Summary: Globus Toolkit - Scheduler Event Generator Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/ws-gram/job_monitoring/common/c/source globus_scheduler_event_generator-2.1 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_scheduler_event_generator-2.1 # tar -zcf globus_scheduler_event_generator-2.1.tar.gz globus_scheduler_event_generator-2.1 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw # Add missing dependency metadata: # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6819 Patch0: %{name}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} BuildRequires: grid-packaging-tools BuildRequires: globus-gram-protocol-devel%{?_isa} >= 5 BuildRequires: globus-libtool-devel%{?_isa} >= 1 BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-xio-gsi-driver-devel%{?_isa} BuildRequires: globus-xio-devel%{?_isa} BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package progs Summary: Globus Toolkit - Scheduler Event Generator Programs Group: Applications/Internet Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-libtool%{?_isa} >= 1 Requires: globus-xio-gsi-driver%{?_isa} %package devel Summary: Globus Toolkit - Scheduler Event Generator Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-gram-protocol-devel%{?_isa} >= 5 Requires: globus-libtool-devel%{?_isa} >= 1 Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-xio-gsi-driver-devel%{?_isa} Requires: globus-xio-devel%{?_isa} Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Scheduler Event Generator Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Scheduler Event Generator %description progs The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-progs package contains: Scheduler Event Generator Programs %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Scheduler Event Generator Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Scheduler Event Generator Documentation Files %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \ | sed s!^!%{_prefix}! > package-progs.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-progs.filelist progs %defattr(-,root,root,-) %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Wed Jul 29 2009 Mattias Ellert - 2.1-1 - Autogenerated --- NEW FILE import.log --- globus-scheduler-event-generator-2_1-1_fc11:EL-4:globus-scheduler-event-generator-2.1-1.fc11.src.rpm:1257239590 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:36:37 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:13:36 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_scheduler_event_generator-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-scheduler-event-generator/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:36:37 -0000 1.1 +++ sources 3 Nov 2009 09:13:36 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +b85c470c9e64a972429d65ae89950bc5 globus_scheduler_event_generator-2.1.tar.gz From kanarip at fedoraproject.org Tue Nov 3 09:16:17 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Tue, 3 Nov 2009 09:16:17 +0000 (UTC) Subject: rpms/rubygem-hawler/F-11 import.log, NONE, 1.1 rubygem-hawler-0.3.4-fix-tests.patch, NONE, 1.1 rubygem-hawler.COPYING, NONE, 1.1 rubygem-hawler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103091617.17A3D11C00E8@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-hawler/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1923/F-11 Modified Files: .cvsignore sources Added Files: import.log rubygem-hawler-0.3.4-fix-tests.patch rubygem-hawler.COPYING rubygem-hawler.spec Log Message: 0.3-5 --- NEW FILE import.log --- rubygem-hawler-0_3-5_fc12:F-11:rubygem-hawler-0.3-5.fc12.src.rpm:1257239743 rubygem-hawler-0.3.4-fix-tests.patch: lib/hawlerhelper.rb | 1 + test/ts_hawlerhelper.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE rubygem-hawler-0.3.4-fix-tests.patch --- --- lib/hawlerhelper.rb.debug 1970-01-01 09:00:00.000000000 +0900 +++ lib/hawlerhelper.rb 2009-10-26 00:42:05.000000000 +0900 @@ -30,6 +30,7 @@ # # Jon Hart +require 'set' require 'hpricot' module HawlerHelper --- test/ts_hawlerhelper.rb.debug 1970-01-01 09:00:00.000000000 +0900 +++ test/ts_hawlerhelper.rb 2009-10-26 00:43:30.000000000 +0900 @@ -5,7 +5,7 @@ require 'hawlerhelper' require 'test/unit' require 'test/unit/assertions' - +require 'net/http' class TestHawlerHelper < Test::Unit::TestCase --- NEW FILE rubygem-hawler.COPYING --- Copyright (c) 2008, Jon Hart All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY Jon Hart ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Jon Hart BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- NEW FILE rubygem-hawler.spec --- %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %define gemname hawler %define geminstdir %{gemdir}/gems/%{gemname}-%{version} Summary: Hawler, the ruby HTTP crawler Name: rubygem-%{gemname} Version: 0.3 Release: 5%{?dist} Group: Development/Languages License: BSD URL: http://spoofed.org/files Source0: http://spoofed.org/files/hawler/gems/%{gemname}-%{version}.gem # From http://spoofed.org/files/hawler/src/COPYING Source1: rubygem-hawler.COPYING Patch0: rubygem-hawler-0.3.4-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems Requires: rubygem(hpricot) BuildRequires: rubygems BuildRequires: rubygem(hpricot) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Hawler, the Ruby HTTP crawler. Written to ease satisfying curiousities about the way the web is woven. %prep %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} gem install --local --install-dir %{buildroot}%{gemdir} \ --force --rdoc %{SOURCE0} pushd %{buildroot}/%{geminstdir} patch -p0 < %{PATCH0} popd install -p -m644 %{SOURCE1} %{buildroot}/%{geminstdir}/COPYING # Remove backup files find %{buildroot}/%{geminstdir} -type f -name "*~" -delete # Fix anything executable that does not have a shebang for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file done # Find files with a shebang that do not have executable permissions for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file done # Find files that have non-standard-executable-perm find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \; # Find files that are not readable find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \; # Remove these hidden files rm -rf %{buildroot}/%{geminstdir}/.project rm -rf %{buildroot}/%{geminstdir}/.loadpath %check pushd %{buildroot}/%{geminstdir} ruby test/ts_hawlee.rb || : ruby test/ts_hawlerhelper.rb || : ruby test/ts_hawler.rb || : popd %clean rm -rf %{buildroot} %files %defattr(-, root, root, -) %doc %{gemdir}/doc/%{gemname}-%{version} %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %dir %{geminstdir} %doc %{geminstdir}/README %doc %{geminstdir}/COPYING %{geminstdir}/lib/ %{geminstdir}/test/ %changelog * Sun Nov 1 2009 Jeroen van Meeuwen - 0.3-5 - Fix tests (mtasaka, #530204) - Add requirement for rubygem-hpricot * Sun Oct 25 2009 Jeroen van Meeuwen - 0.3-4 - License is BSD - Included License file - Updated description - Enabled tests * Wed Oct 21 2009 Jeroen van Meeuwen - 0.3-2 - The license is actually unknown to me * Sat Oct 17 2009 Jeroen van Meeuwen - 0.3-1 - First package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hawler/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:35:51 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:16:16 -0000 1.2 @@ -0,0 +1 @@ +hawler-0.3.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hawler/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:35:52 -0000 1.1 +++ sources 3 Nov 2009 09:16:16 -0000 1.2 @@ -0,0 +1 @@ +bf65c3d93bb5983ebdfed95fe4f179b1 hawler-0.3.gem From than at fedoraproject.org Tue Nov 3 09:16:53 2009 From: than at fedoraproject.org (Than Ngo) Date: Tue, 3 Nov 2009 09:16:53 +0000 (UTC) Subject: rpms/kdenetwork/devel kdenetwork.spec, 1.205, 1.206 sources, 1.81, 1.82 Message-ID: <20091103091653.9899D11C00E8@cvs1.fedora.phx.redhat.com> Author: than Update of /cvs/extras/rpms/kdenetwork/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2154 Modified Files: kdenetwork.spec sources Log Message: respin Index: kdenetwork.spec =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -p -r1.205 -r1.206 --- kdenetwork.spec 31 Oct 2009 23:16:50 -0000 1.205 +++ kdenetwork.spec 3 Nov 2009 09:16:52 -0000 1.206 @@ -3,7 +3,7 @@ Summary: K Desktop Environment - Network Name: kdenetwork Epoch: 7 Version: 4.3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Internet @@ -194,6 +194,9 @@ fi %changelog +* Tue Nov 03 2009 Than Ngo - 4.3.3-2 +- respin + * Sat Oct 31 2009 Rex Dieter - 4.3.3-1 - 4.3.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdenetwork/devel/sources,v retrieving revision 1.81 retrieving revision 1.82 diff -u -p -r1.81 -r1.82 --- sources 31 Oct 2009 23:16:50 -0000 1.81 +++ sources 3 Nov 2009 09:16:52 -0000 1.82 @@ -1,2 +1,2 @@ 7dd360a790100c952090410c2c89937c krdc-icons.tar.bz2 -3dec4242e05c77f319b974ee579aaf77 kdenetwork-4.3.3.tar.bz2 +bb9a20da6e18a4952f7001b581aa9a1d kdenetwork-4.3.3.tar.bz2 From kanarip at fedoraproject.org Tue Nov 3 09:18:14 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Tue, 3 Nov 2009 09:18:14 +0000 (UTC) Subject: rpms/rubygem-hawler/F-12 import.log, NONE, 1.1 rubygem-hawler-0.3.4-fix-tests.patch, NONE, 1.1 rubygem-hawler.COPYING, NONE, 1.1 rubygem-hawler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103091814.E83A411C00E8@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-hawler/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2767/F-12 Modified Files: .cvsignore sources Added Files: import.log rubygem-hawler-0.3.4-fix-tests.patch rubygem-hawler.COPYING rubygem-hawler.spec Log Message: 0.3-5 --- NEW FILE import.log --- rubygem-hawler-0_3-5_fc12:F-12:rubygem-hawler-0.3-5.fc12.src.rpm:1257239861 rubygem-hawler-0.3.4-fix-tests.patch: lib/hawlerhelper.rb | 1 + test/ts_hawlerhelper.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE rubygem-hawler-0.3.4-fix-tests.patch --- --- lib/hawlerhelper.rb.debug 1970-01-01 09:00:00.000000000 +0900 +++ lib/hawlerhelper.rb 2009-10-26 00:42:05.000000000 +0900 @@ -30,6 +30,7 @@ # # Jon Hart +require 'set' require 'hpricot' module HawlerHelper --- test/ts_hawlerhelper.rb.debug 1970-01-01 09:00:00.000000000 +0900 +++ test/ts_hawlerhelper.rb 2009-10-26 00:43:30.000000000 +0900 @@ -5,7 +5,7 @@ require 'hawlerhelper' require 'test/unit' require 'test/unit/assertions' - +require 'net/http' class TestHawlerHelper < Test::Unit::TestCase --- NEW FILE rubygem-hawler.COPYING --- Copyright (c) 2008, Jon Hart All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY Jon Hart ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Jon Hart BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- NEW FILE rubygem-hawler.spec --- %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %define gemname hawler %define geminstdir %{gemdir}/gems/%{gemname}-%{version} Summary: Hawler, the ruby HTTP crawler Name: rubygem-%{gemname} Version: 0.3 Release: 5%{?dist} Group: Development/Languages License: BSD URL: http://spoofed.org/files Source0: http://spoofed.org/files/hawler/gems/%{gemname}-%{version}.gem # From http://spoofed.org/files/hawler/src/COPYING Source1: rubygem-hawler.COPYING Patch0: rubygem-hawler-0.3.4-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems Requires: rubygem(hpricot) BuildRequires: rubygems BuildRequires: rubygem(hpricot) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Hawler, the Ruby HTTP crawler. Written to ease satisfying curiousities about the way the web is woven. %prep %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} gem install --local --install-dir %{buildroot}%{gemdir} \ --force --rdoc %{SOURCE0} pushd %{buildroot}/%{geminstdir} patch -p0 < %{PATCH0} popd install -p -m644 %{SOURCE1} %{buildroot}/%{geminstdir}/COPYING # Remove backup files find %{buildroot}/%{geminstdir} -type f -name "*~" -delete # Fix anything executable that does not have a shebang for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file done # Find files with a shebang that do not have executable permissions for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file done # Find files that have non-standard-executable-perm find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \; # Find files that are not readable find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \; # Remove these hidden files rm -rf %{buildroot}/%{geminstdir}/.project rm -rf %{buildroot}/%{geminstdir}/.loadpath %check pushd %{buildroot}/%{geminstdir} ruby test/ts_hawlee.rb || : ruby test/ts_hawlerhelper.rb || : ruby test/ts_hawler.rb || : popd %clean rm -rf %{buildroot} %files %defattr(-, root, root, -) %doc %{gemdir}/doc/%{gemname}-%{version} %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %dir %{geminstdir} %doc %{geminstdir}/README %doc %{geminstdir}/COPYING %{geminstdir}/lib/ %{geminstdir}/test/ %changelog * Sun Nov 1 2009 Jeroen van Meeuwen - 0.3-5 - Fix tests (mtasaka, #530204) - Add requirement for rubygem-hpricot * Sun Oct 25 2009 Jeroen van Meeuwen - 0.3-4 - License is BSD - Included License file - Updated description - Enabled tests * Wed Oct 21 2009 Jeroen van Meeuwen - 0.3-2 - The license is actually unknown to me * Sat Oct 17 2009 Jeroen van Meeuwen - 0.3-1 - First package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hawler/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:35:51 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:18:14 -0000 1.2 @@ -0,0 +1 @@ +hawler-0.3.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hawler/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:35:52 -0000 1.1 +++ sources 3 Nov 2009 09:18:14 -0000 1.2 @@ -0,0 +1 @@ +bf65c3d93bb5983ebdfed95fe4f179b1 hawler-0.3.gem From ellert at fedoraproject.org Tue Nov 3 09:18:54 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 09:18:54 +0000 (UTC) Subject: rpms/globus-gram-job-manager-callout-error/devel globus-gram-job-manager-callout-error.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103091854.37CF511C00E8@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3152/devel Modified Files: .cvsignore sources Added Files: globus-gram-job-manager-callout-error.spec import.log Log Message: * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE globus-gram-job-manager-callout-error.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gram-job-manager-callout-error %global _name %(tr - _ <<< %{name}) Version: 0.2 Release: 1%{?dist} Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/callout_error globus_gram_job_manager_callout_error-0.2 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_callout_error-0.2 # tar -zcf globus_gram_job_manager_callout_error-0.2.tar.gz globus_gram_job_manager_callout_error-0.2 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-common BuildRequires: grid-packaging-tools BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package devel Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GRAM Jobmanager Callout Errors %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GRAM Jobmanager Callout Errors Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GRAM Jobmanager Callout Errors Documentation Files %prep %setup -q -n %{_name}-%{version} %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE import.log --- globus-gram-job-manager-callout-error-0_2-1_fc11:HEAD:globus-gram-job-manager-callout-error-0.2-1.fc11.src.rpm:1257239902 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:38:09 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:18:53 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gram_job_manager_callout_error-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:38:10 -0000 1.1 +++ sources 3 Nov 2009 09:18:53 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +a955e22db8443d56dc1f13c79f721897 globus_gram_job_manager_callout_error-0.2.tar.gz From kanarip at fedoraproject.org Tue Nov 3 09:20:16 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Tue, 3 Nov 2009 09:20:16 +0000 (UTC) Subject: rpms/rubygem-hawler/devel import.log, NONE, 1.1 rubygem-hawler-0.3.4-fix-tests.patch, NONE, 1.1 rubygem-hawler.COPYING, NONE, 1.1 rubygem-hawler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103092016.4E16511C0419@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-hawler/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3825/devel Modified Files: .cvsignore sources Added Files: import.log rubygem-hawler-0.3.4-fix-tests.patch rubygem-hawler.COPYING rubygem-hawler.spec Log Message: 0.3-5 --- NEW FILE import.log --- rubygem-hawler-0_3-5_fc12:HEAD:rubygem-hawler-0.3-5.fc12.src.rpm:1257239985 rubygem-hawler-0.3.4-fix-tests.patch: lib/hawlerhelper.rb | 1 + test/ts_hawlerhelper.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE rubygem-hawler-0.3.4-fix-tests.patch --- --- lib/hawlerhelper.rb.debug 1970-01-01 09:00:00.000000000 +0900 +++ lib/hawlerhelper.rb 2009-10-26 00:42:05.000000000 +0900 @@ -30,6 +30,7 @@ # # Jon Hart +require 'set' require 'hpricot' module HawlerHelper --- test/ts_hawlerhelper.rb.debug 1970-01-01 09:00:00.000000000 +0900 +++ test/ts_hawlerhelper.rb 2009-10-26 00:43:30.000000000 +0900 @@ -5,7 +5,7 @@ require 'hawlerhelper' require 'test/unit' require 'test/unit/assertions' - +require 'net/http' class TestHawlerHelper < Test::Unit::TestCase --- NEW FILE rubygem-hawler.COPYING --- Copyright (c) 2008, Jon Hart All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY Jon Hart ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Jon Hart BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- NEW FILE rubygem-hawler.spec --- %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %define gemname hawler %define geminstdir %{gemdir}/gems/%{gemname}-%{version} Summary: Hawler, the ruby HTTP crawler Name: rubygem-%{gemname} Version: 0.3 Release: 5%{?dist} Group: Development/Languages License: BSD URL: http://spoofed.org/files Source0: http://spoofed.org/files/hawler/gems/%{gemname}-%{version}.gem # From http://spoofed.org/files/hawler/src/COPYING Source1: rubygem-hawler.COPYING Patch0: rubygem-hawler-0.3.4-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems Requires: rubygem(hpricot) BuildRequires: rubygems BuildRequires: rubygem(hpricot) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Hawler, the Ruby HTTP crawler. Written to ease satisfying curiousities about the way the web is woven. %prep %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} gem install --local --install-dir %{buildroot}%{gemdir} \ --force --rdoc %{SOURCE0} pushd %{buildroot}/%{geminstdir} patch -p0 < %{PATCH0} popd install -p -m644 %{SOURCE1} %{buildroot}/%{geminstdir}/COPYING # Remove backup files find %{buildroot}/%{geminstdir} -type f -name "*~" -delete # Fix anything executable that does not have a shebang for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file done # Find files with a shebang that do not have executable permissions for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file done # Find files that have non-standard-executable-perm find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \; # Find files that are not readable find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \; # Remove these hidden files rm -rf %{buildroot}/%{geminstdir}/.project rm -rf %{buildroot}/%{geminstdir}/.loadpath %check pushd %{buildroot}/%{geminstdir} ruby test/ts_hawlee.rb || : ruby test/ts_hawlerhelper.rb || : ruby test/ts_hawler.rb || : popd %clean rm -rf %{buildroot} %files %defattr(-, root, root, -) %doc %{gemdir}/doc/%{gemname}-%{version} %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %dir %{geminstdir} %doc %{geminstdir}/README %doc %{geminstdir}/COPYING %{geminstdir}/lib/ %{geminstdir}/test/ %changelog * Sun Nov 1 2009 Jeroen van Meeuwen - 0.3-5 - Fix tests (mtasaka, #530204) - Add requirement for rubygem-hpricot * Sun Oct 25 2009 Jeroen van Meeuwen - 0.3-4 - License is BSD - Included License file - Updated description - Enabled tests * Wed Oct 21 2009 Jeroen van Meeuwen - 0.3-2 - The license is actually unknown to me * Sat Oct 17 2009 Jeroen van Meeuwen - 0.3-1 - First package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hawler/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:35:51 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:20:16 -0000 1.2 @@ -0,0 +1 @@ +hawler-0.3.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hawler/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:35:52 -0000 1.1 +++ sources 3 Nov 2009 09:20:16 -0000 1.2 @@ -0,0 +1 @@ +bf65c3d93bb5983ebdfed95fe4f179b1 hawler-0.3.gem From ellert at fedoraproject.org Tue Nov 3 09:20:22 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 09:20:22 +0000 (UTC) Subject: rpms/globus-gram-job-manager-callout-error/F-12 globus-gram-job-manager-callout-error.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103092022.4F97011C0419@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3857/F-12 Modified Files: .cvsignore sources Added Files: globus-gram-job-manager-callout-error.spec import.log Log Message: * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE globus-gram-job-manager-callout-error.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gram-job-manager-callout-error %global _name %(tr - _ <<< %{name}) Version: 0.2 Release: 1%{?dist} Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/callout_error globus_gram_job_manager_callout_error-0.2 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_callout_error-0.2 # tar -zcf globus_gram_job_manager_callout_error-0.2.tar.gz globus_gram_job_manager_callout_error-0.2 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-common BuildRequires: grid-packaging-tools BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package devel Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GRAM Jobmanager Callout Errors %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GRAM Jobmanager Callout Errors Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GRAM Jobmanager Callout Errors Documentation Files %prep %setup -q -n %{_name}-%{version} %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE import.log --- globus-gram-job-manager-callout-error-0_2-1_fc11:F-12:globus-gram-job-manager-callout-error-0.2-1.fc11.src.rpm:1257239991 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:38:09 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:20:19 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gram_job_manager_callout_error-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:38:10 -0000 1.1 +++ sources 3 Nov 2009 09:20:19 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +a955e22db8443d56dc1f13c79f721897 globus_gram_job_manager_callout_error-0.2.tar.gz From ellert at fedoraproject.org Tue Nov 3 09:21:34 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 09:21:34 +0000 (UTC) Subject: rpms/globus-gram-job-manager-callout-error/F-11 globus-gram-job-manager-callout-error.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103092134.95B3011C00E8@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4510/F-11 Modified Files: .cvsignore sources Added Files: globus-gram-job-manager-callout-error.spec import.log Log Message: * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE globus-gram-job-manager-callout-error.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gram-job-manager-callout-error %global _name %(tr - _ <<< %{name}) Version: 0.2 Release: 1%{?dist} Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/callout_error globus_gram_job_manager_callout_error-0.2 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_callout_error-0.2 # tar -zcf globus_gram_job_manager_callout_error-0.2.tar.gz globus_gram_job_manager_callout_error-0.2 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-common BuildRequires: grid-packaging-tools BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package devel Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GRAM Jobmanager Callout Errors %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GRAM Jobmanager Callout Errors Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GRAM Jobmanager Callout Errors Documentation Files %prep %setup -q -n %{_name}-%{version} %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE import.log --- globus-gram-job-manager-callout-error-0_2-1_fc11:F-11:globus-gram-job-manager-callout-error-0.2-1.fc11.src.rpm:1257240065 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:38:09 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:21:34 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gram_job_manager_callout_error-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:38:10 -0000 1.1 +++ sources 3 Nov 2009 09:21:34 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +a955e22db8443d56dc1f13c79f721897 globus_gram_job_manager_callout_error-0.2.tar.gz From kanarip at fedoraproject.org Tue Nov 3 09:22:12 2009 From: kanarip at fedoraproject.org (Jeroen van Meeuwen) Date: Tue, 3 Nov 2009 09:22:12 +0000 (UTC) Subject: rpms/rubygem-hawler/EL-5 import.log, NONE, 1.1 rubygem-hawler-0.3.4-fix-tests.patch, NONE, 1.1 rubygem-hawler.COPYING, NONE, 1.1 rubygem-hawler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103092212.5946911C00E8@cvs1.fedora.phx.redhat.com> Author: kanarip Update of /cvs/pkgs/rpms/rubygem-hawler/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4813/EL-5 Modified Files: .cvsignore sources Added Files: import.log rubygem-hawler-0.3.4-fix-tests.patch rubygem-hawler.COPYING rubygem-hawler.spec Log Message: 0.3-5 --- NEW FILE import.log --- rubygem-hawler-0_3-5_fc12:EL-5:rubygem-hawler-0.3-5.fc12.src.rpm:1257240101 rubygem-hawler-0.3.4-fix-tests.patch: lib/hawlerhelper.rb | 1 + test/ts_hawlerhelper.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE rubygem-hawler-0.3.4-fix-tests.patch --- --- lib/hawlerhelper.rb.debug 1970-01-01 09:00:00.000000000 +0900 +++ lib/hawlerhelper.rb 2009-10-26 00:42:05.000000000 +0900 @@ -30,6 +30,7 @@ # # Jon Hart +require 'set' require 'hpricot' module HawlerHelper --- test/ts_hawlerhelper.rb.debug 1970-01-01 09:00:00.000000000 +0900 +++ test/ts_hawlerhelper.rb 2009-10-26 00:43:30.000000000 +0900 @@ -5,7 +5,7 @@ require 'hawlerhelper' require 'test/unit' require 'test/unit/assertions' - +require 'net/http' class TestHawlerHelper < Test::Unit::TestCase --- NEW FILE rubygem-hawler.COPYING --- Copyright (c) 2008, Jon Hart All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY Jon Hart ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Jon Hart BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- NEW FILE rubygem-hawler.spec --- %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %define gemname hawler %define geminstdir %{gemdir}/gems/%{gemname}-%{version} Summary: Hawler, the ruby HTTP crawler Name: rubygem-%{gemname} Version: 0.3 Release: 5%{?dist} Group: Development/Languages License: BSD URL: http://spoofed.org/files Source0: http://spoofed.org/files/hawler/gems/%{gemname}-%{version}.gem # From http://spoofed.org/files/hawler/src/COPYING Source1: rubygem-hawler.COPYING Patch0: rubygem-hawler-0.3.4-fix-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ruby(abi) = 1.8 Requires: rubygems Requires: rubygem(hpricot) BuildRequires: rubygems BuildRequires: rubygem(hpricot) BuildArch: noarch Provides: rubygem(%{gemname}) = %{version} %description Hawler, the Ruby HTTP crawler. Written to ease satisfying curiousities about the way the web is woven. %prep %build %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gemdir} gem install --local --install-dir %{buildroot}%{gemdir} \ --force --rdoc %{SOURCE0} pushd %{buildroot}/%{geminstdir} patch -p0 < %{PATCH0} popd install -p -m644 %{SOURCE1} %{buildroot}/%{geminstdir}/COPYING # Remove backup files find %{buildroot}/%{geminstdir} -type f -name "*~" -delete # Fix anything executable that does not have a shebang for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file done # Find files with a shebang that do not have executable permissions for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file done # Find files that have non-standard-executable-perm find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \; # Find files that are not readable find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \; # Remove these hidden files rm -rf %{buildroot}/%{geminstdir}/.project rm -rf %{buildroot}/%{geminstdir}/.loadpath %check pushd %{buildroot}/%{geminstdir} ruby test/ts_hawlee.rb || : ruby test/ts_hawlerhelper.rb || : ruby test/ts_hawler.rb || : popd %clean rm -rf %{buildroot} %files %defattr(-, root, root, -) %doc %{gemdir}/doc/%{gemname}-%{version} %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %dir %{geminstdir} %doc %{geminstdir}/README %doc %{geminstdir}/COPYING %{geminstdir}/lib/ %{geminstdir}/test/ %changelog * Sun Nov 1 2009 Jeroen van Meeuwen - 0.3-5 - Fix tests (mtasaka, #530204) - Add requirement for rubygem-hpricot * Sun Oct 25 2009 Jeroen van Meeuwen - 0.3-4 - License is BSD - Included License file - Updated description - Enabled tests * Wed Oct 21 2009 Jeroen van Meeuwen - 0.3-2 - The license is actually unknown to me * Sat Oct 17 2009 Jeroen van Meeuwen - 0.3-1 - First package Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hawler/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:35:51 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:22:11 -0000 1.2 @@ -0,0 +1 @@ +hawler-0.3.gem Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rubygem-hawler/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:35:52 -0000 1.1 +++ sources 3 Nov 2009 09:22:11 -0000 1.2 @@ -0,0 +1 @@ +bf65c3d93bb5983ebdfed95fe4f179b1 hawler-0.3.gem From ellert at fedoraproject.org Tue Nov 3 09:22:46 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 09:22:46 +0000 (UTC) Subject: rpms/globus-gram-job-manager-callout-error/EL-5 globus-gram-job-manager-callout-error.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103092246.BB26C11C00E8@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5135/EL-5 Modified Files: .cvsignore sources Added Files: globus-gram-job-manager-callout-error.spec import.log Log Message: * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE globus-gram-job-manager-callout-error.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gram-job-manager-callout-error %global _name %(tr - _ <<< %{name}) Version: 0.2 Release: 1%{?dist} Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/callout_error globus_gram_job_manager_callout_error-0.2 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_callout_error-0.2 # tar -zcf globus_gram_job_manager_callout_error-0.2.tar.gz globus_gram_job_manager_callout_error-0.2 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-common BuildRequires: grid-packaging-tools BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package devel Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GRAM Jobmanager Callout Errors %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GRAM Jobmanager Callout Errors Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GRAM Jobmanager Callout Errors Documentation Files %prep %setup -q -n %{_name}-%{version} %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE import.log --- globus-gram-job-manager-callout-error-0_2-1_fc11:EL-5:globus-gram-job-manager-callout-error-0.2-1.fc11.src.rpm:1257240142 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/EL-5/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:38:09 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:22:46 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gram_job_manager_callout_error-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/EL-5/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:38:10 -0000 1.1 +++ sources 3 Nov 2009 09:22:46 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +a955e22db8443d56dc1f13c79f721897 globus_gram_job_manager_callout_error-0.2.tar.gz From ellert at fedoraproject.org Tue Nov 3 09:23:56 2009 From: ellert at fedoraproject.org (Mattias Ellert) Date: Tue, 3 Nov 2009 09:23:56 +0000 (UTC) Subject: rpms/globus-gram-job-manager-callout-error/EL-4 globus-gram-job-manager-callout-error.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103092356.35E9411C00E8@cvs1.fedora.phx.redhat.com> Author: ellert Update of /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5692/EL-4 Modified Files: .cvsignore sources Added Files: globus-gram-job-manager-callout-error.spec import.log Log Message: * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE globus-gram-job-manager-callout-error.spec --- %ifarch alpha ia64 ppc64 s390x sparc64 x86_64 %global flavor gcc64pthr %else %global flavor gcc32pthr %endif Name: globus-gram-job-manager-callout-error %global _name %(tr - _ <<< %{name}) Version: 0.2 Release: 1%{?dist} Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ # Source is extracted from the globus toolkit installer: # wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2 # tar -jxf gt4.2.1-all-source-installer.tar.bz2 # mv gt4.2.1-all-source-installer/source-trees/gram/jobmanager/callout_error globus_gram_job_manager_callout_error-0.2 # cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_job_manager_callout_error-0.2 # tar -zcf globus_gram_job_manager_callout_error-0.2.tar.gz globus_gram_job_manager_callout_error-0.2 Source: %{_name}-%{version}.tar.gz # This is a workaround for the broken epstopdf script in RHEL5 # See: https://bugzilla.redhat.com/show_bug.cgi?id=450388 Source9: epstopdf-2.9.5gw BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-common BuildRequires: grid-packaging-tools BuildRequires: globus-common-devel%{?_isa} >= 3 BuildRequires: globus-core%{?_isa} >= 4 BuildRequires: doxygen BuildRequires: graphviz %if "%{?rhel}" == "5" BuildRequires: graphviz-gd %endif BuildRequires: ghostscript %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif %package devel Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: globus-common-devel%{?_isa} >= 3 Requires: globus-core%{?_isa} >= 4 %package doc Summary: Globus Toolkit - Globus GRAM Jobmanager Callout Errors Documentation Files Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name} package contains: Globus GRAM Jobmanager Callout Errors %description devel The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-devel package contains: Globus GRAM Jobmanager Callout Errors Development Files %description doc The Globus Toolkit is an open source software toolkit used for building Grid systems and applications. It is being developed by the Globus Alliance and many others all over the world. A growing number of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. The %{name}-doc package contains: Globus GRAM Jobmanager Callout Errors Documentation Files %prep %setup -q -n %{_name}-%{version} %if "%{rhel}" == "5" mkdir bin install %{SOURCE9} bin/epstopdf %endif %build %if "%{rhel}" == "5" export PATH=$PWD/bin:$PATH %endif # Remove files that should be replaced during bootstrap rm -f doxygen/Doxyfile* rm -f doxygen/Makefile.am rm -f pkgdata/Makefile.am rm -f globus_automake* rm -rf autom4te.cache # Remove flavor tags for f in `find . -name Makefile.am` ; do sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \ -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \ -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f done sed -e "s! \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc # Move documentation to default RPM location mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} sed s!doc/%{_name}!doc/%{name}-%{version}! \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Remove unwanted documentation (needed for RHEL4) rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3 sed -e '/_%{_name}-%{version}_.*\.3/d' \ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist # Install license file mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # Generate package filelists cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ | sed s!^!%{_prefix}! > package.filelist cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ | sed s!^!%{_prefix}! > package-devel.filelist cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f package.filelist %defattr(-,root,root,-) %dir %{_datadir}/globus/packages/%{_name} %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE %files -f package-devel.filelist devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/%{name}.pc %files -f package-doc.filelist doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version}/html %changelog * Tue Jul 28 2009 Mattias Ellert - 0.2-1 - Autogenerated --- NEW FILE import.log --- globus-gram-job-manager-callout-error-0_2-1_fc11:EL-4:globus-gram-job-manager-callout-error-0.2-1.fc11.src.rpm:1257240213 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/EL-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:38:09 -0000 1.1 +++ .cvsignore 3 Nov 2009 09:23:55 -0000 1.2 @@ -0,0 +1,2 @@ +epstopdf-2.9.5gw +globus_gram_job_manager_callout_error-0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/globus-gram-job-manager-callout-error/EL-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:38:10 -0000 1.1 +++ sources 3 Nov 2009 09:23:56 -0000 1.2 @@ -0,0 +1,2 @@ +44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw +a955e22db8443d56dc1f13c79f721897 globus_gram_job_manager_callout_error-0.2.tar.gz From harald at fedoraproject.org Tue Nov 3 09:53:31 2009 From: harald at fedoraproject.org (Harald Hoyer) Date: Tue, 3 Nov 2009 09:53:31 +0000 (UTC) Subject: rpms/dracut/devel dracut.spec,1.41,1.42 Message-ID: <20091103095331.76AC711C00E8@cvs1.fedora.phx.redhat.com> Author: harald Update of /cvs/pkgs/rpms/dracut/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15176 Modified Files: dracut.spec Log Message: * Tue Nov 03 2009 Harald Hoyer 002-19 - changed rd_DASD to rd_DASD_MOD (bug #531720) - Resolves: rhbz#531720 Index: dracut.spec =================================================================== RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -r1.41 -r1.42 --- dracut.spec 27 Oct 2009 14:13:15 -0000 1.41 +++ dracut.spec 3 Nov 2009 09:53:30 -0000 1.42 @@ -1,4 +1,4 @@ -%define gittag 413bcf78 +%define gittag 78b52181 %define with_switch_root 1 %if 0%{?fedora} > 11 @@ -18,7 +18,7 @@ Name: dracut Version: 002 -Release: 18%{?rdist} +Release: 19%{?rdist} Summary: Initramfs generator using udev Group: System Environment/Base License: GPLv2+ @@ -158,6 +158,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dracut/modules.d/95resume %{_datadir}/dracut/modules.d/95rootfs-block %{_datadir}/dracut/modules.d/95dasd +%{_datadir}/dracut/modules.d/95dasd_mod %{_datadir}/dracut/modules.d/95zfcp %{_datadir}/dracut/modules.d/95ccw %{_datadir}/dracut/modules.d/95terminfo @@ -194,6 +195,10 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Tue Nov 03 2009 Harald Hoyer 002-19 +- changed rd_DASD to rd_DASD_MOD (bug #531720) +- Resolves: rhbz#531720 + * Tue Oct 27 2009 Harald Hoyer 002-18 - renamed lvm/device-mapper udev rules according to upstream changes - fixed dracut search path issue From hadess at fedoraproject.org Tue Nov 3 09:53:45 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Nov 2009 09:53:45 +0000 (UTC) Subject: rpms/bluez/F-11 bluez-4.42-make-udev-helper-build.patch, 1.1, 1.2 bluez.spec, 1.75, 1.76 Message-ID: <20091103095345.0F6E711C00E8@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/bluez/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15276 Modified Files: bluez-4.42-make-udev-helper-build.patch bluez.spec Log Message: * Tue Nov 03 2009 Bastien Nocera 4.42-9 - Update hid2hci udev rules for F11 udev bluez-4.42-make-udev-helper-build.patch: scripts/bluetooth-hid2hci.rules | 2 - tools/hid2hci.c | 59 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-) Index: bluez-4.42-make-udev-helper-build.patch =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez-4.42-make-udev-helper-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- bluez-4.42-make-udev-helper-build.patch 2 Nov 2009 17:41:34 -0000 1.1 +++ bluez-4.42-make-udev-helper-build.patch 3 Nov 2009 09:53:44 -0000 1.2 @@ -73,3 +73,14 @@ enum mode { HCI = 0, +--- bluez-4.42/scripts/bluetooth-hid2hci.rules.old 2009-11-03 09:51:29.000000000 +0000 ++++ bluez-4.42/scripts/bluetooth-hid2hci.rules 2009-11-03 09:51:47.000000000 +0000 +@@ -20,7 +20,7 @@ ENV{DEVTYPE}!="usb_device", GOTO="hid2hc + # Unfortunately the only event seen is the BT device disappearing, so the mouse + # device needs to be chased down on the USB bus. + ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \ +- ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" ++ ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb" + + # CSR devices + ATTR{idVendor}=="0a12|0458|05ac", ATTR{idProduct}=="1000", RUN+="hid2hci --method=csr --devpath=%p" Index: bluez.spec =================================================================== RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -p -r1.75 -r1.76 --- bluez.spec 2 Nov 2009 18:25:48 -0000 1.75 +++ bluez.spec 3 Nov 2009 09:53:44 -0000 1.76 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez Version: 4.42 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/System Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz @@ -226,6 +226,9 @@ fi %{_sysconfdir}/alsa/bluetooth.conf %changelog +* Tue Nov 03 2009 Bastien Nocera 4.42-9 +- Update hid2hci udev rules for F11 udev + * Mon Nov 02 2009 Bastien Nocera 4.42-8 - Update hid2hci code from udev master From harald at fedoraproject.org Tue Nov 3 09:56:29 2009 From: harald at fedoraproject.org (Harald Hoyer) Date: Tue, 3 Nov 2009 09:56:29 +0000 (UTC) Subject: rpms/dracut/devel .cvsignore,1.25,1.26 sources,1.26,1.27 Message-ID: <20091103095629.5C7F011C00E8@cvs1.fedora.phx.redhat.com> Author: harald Update of /cvs/pkgs/rpms/dracut/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16216 Modified Files: .cvsignore sources Log Message: * Tue Nov 03 2009 Harald Hoyer 002-19 - changed rd_DASD to rd_DASD_MOD (bug #531720) - Resolves: rhbz#531720 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- .cvsignore 27 Oct 2009 14:13:15 -0000 1.25 +++ .cvsignore 3 Nov 2009 09:56:28 -0000 1.26 @@ -1 +1 @@ -dracut-002-413bcf78.tar.bz2 +dracut-002-78b52181.tar.bz2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- sources 27 Oct 2009 14:13:15 -0000 1.26 +++ sources 3 Nov 2009 09:56:29 -0000 1.27 @@ -1 +1 @@ -7cdf072d0b2c256ce20f0319ab90bfbb dracut-002-413bcf78.tar.bz2 +3a8f7b35bf833e82b9458457234ffe86 dracut-002-78b52181.tar.bz2 From ivaxer at fedoraproject.org Tue Nov 3 10:40:35 2009 From: ivaxer at fedoraproject.org (John A. Khvatov) Date: Tue, 3 Nov 2009 10:40:35 +0000 (UTC) Subject: rpms/opensips/devel import.log, NONE, 1.1 opensips--init.patch, NONE, 1.1 opensips.spec, NONE, 1.1 opensips.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103104035.716B611C0419@cvs1.fedora.phx.redhat.com> Author: ivaxer Update of /cvs/pkgs/rpms/opensips/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29300/devel Modified Files: .cvsignore sources Added Files: import.log opensips--init.patch opensips.spec opensips.sysconfig Log Message: Initial import (#529831) --- NEW FILE import.log --- opensips-1_6_0-2_fc11:HEAD:opensips-1.6.0-2.fc11.src.rpm:1257244541 opensips--init.patch: opensips.init | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE opensips--init.patch --- diff -Nur opensips-1.6.0-tls/packaging/fedora/opensips.init opensips-1.6.0-tls_patched/packaging/fedora/opensips.init --- opensips-1.6.0-tls/packaging/fedora/opensips.init 2009-10-16 04:37:55.000000000 +0400 +++ opensips-1.6.0-tls_patched/packaging/fedora/opensips.init 2009-10-29 14:05:56.211918358 +0300 @@ -14,8 +14,7 @@ # Required-Start: $local_fs $network $named # Should-Start: mysqld postgresql # Short-Description: start, stop OpenSIPS -# Description: OpenSIPS or OpenSIPS is a very fast and flexible -# SIP (RFC3261) server. +# Description: OpenSIPS is a very fast and flexible SIP (RFC3261) server. ### END INIT INFO # Source function library. --- NEW FILE opensips.spec --- %if 0%{?rhel} # copied from lm_sensors exclusive arch %ifnarch alpha i386 i486 i586 i686 pentium3 pentium4 athlon x86_64 %define disable_snmpstats snmpstats %endif %endif %define EXCLUDE_MODULES mi_xmlrpc osp json %{?disable_snmpstats} %{!?_with_oracle:db_oracle} Summary: Open Source SIP Server Name: opensips Version: 1.6.0 Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz Source1: %{name}.sysconfig Patch1: opensips--init.patch URL: http://opensips.org BuildRequires: expat-devel BuildRequires: libxml2-devel BuildRequires: bison BuildRequires: flex #BuildRequires: subversion # needed by snmpstats BuildRequires: radiusclient-ng-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel # required by snmpstats module %if %{undefined disable_snmpstats} BuildRequires: lm_sensors-devel %endif BuildRequires: net-snmp-devel BuildRequires: unixODBC-devel BuildRequires: openssl-devel BuildRequires: expat-devel #BuildRequires: xmlrpc-c-devel BuildRequires: libconfuse-devel BuildRequires: db4-devel BuildRequires: openldap-devel BuildRequires: curl-devel BuildRequires: libmemcached-devel BuildRequires: GeoIP-devel BuildRequires: pcre-devel Requires(post): chkconfig Requires(preun):chkconfig # for /sbin/service Requires(preun):initscripts BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description OpenSIPS or Open SIP Server is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, opensips can handle thousands calls per second even on low-budget hardware. A C Shell like scripting language provides full control over the server's behaviour. It's modular architecture allows only required functionality to be loaded. Currently the following modules are available: digest authentication, CPL scripts, instant messaging, MySQL and UNIXODBC support, a presence agent, radius authentication, record routing, an SMS gateway, a jabber gateway, a transaction and dialog module, OSP module, statistics support, registrar and user location. %package aaa_radius Summary: RADIUS backend for AAA api Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description aaa_radius This module provides the RADIUS backend for the AAA API - group, auth, uri module use the AAA API for performing RADIUS ops. %package acc Summary: Accounts transactions information to different backends Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description acc ACC module is used to account transactions information to different backends like syslog, SQL, AAA. %package auth_aaa Summary: Performs authentication using an AAA server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description auth_aaa This module contains functions that are used to perform authentication using an AAA server. Basically the proxy will pass along the credentials to the AAA server which will in turn send a reply containing result of the authentication. So basically the whole authentication is done in the AAA server. %package auth_diameter Summary: Performs authentication using a Diameter server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description auth_diameter This module implements SIP authentication and authorization with DIAMETER server, namely DIameter Server Client (DISC). %package b2bua Summary: Back-2-Back User Agent Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description b2bua B2BUA is an implementation of the behavior of a B2BUA as defined in RFC 3261 that offers the possibility to build certain services on top of it. %package carrierroute Summary: Routing extension suitable for carriers Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description carrierroute A module which provides routing, balancing and blacklisting capabilities. %package cpl-c Summary: Call Processing Language interpreter Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description cpl-c This module implements a CPL (Call Processing Language) interpreter. Support for uploading/downloading/removing scripts via SIP REGISTER method is present. %package db_berkeley Summary: Berkley DB backend support Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description db_berkeley This is a module which integrates the Berkeley DB into OpenSIPS. It implements the DB API defined in OpenSIPS. %package db_http Summary: HTTP DB backend support Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description db_http This module provides access to a database that is implemented as a HTTP server. %package h350 Summary: H350 implementation Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description h350 The OpenSIPS H350 module enables an OpenSIPS SIP proxy server to access SIP account data stored in an LDAP [RFC4510] directory containing H.350 [H.350] commObjects. %package jabber Summary: Gateway between OpenSIPS and a jabber server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description jabber Jabber module that integrates XODE XML parser for parsing Jabber messages. %package ldap Summary: LDAP connector Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description ldap The LDAP module implements an LDAP search interface for OpenSIPS. %package memcached Summary: Memcached connector Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description memcached Memcached module is an implementation of a cache system designed to work with a memcached server. %package mmgeoip Summary: Wrapper for the MaxMind GeoIP API Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description mmgeoip Mmgeoip is a lightweight wrapper for the MaxMind GeoIP API. It adds IP address-to-location lookup capability to OpenSIPS scripts. %if %{defined db_oracle} %package oracle Summary: Oracle Storage Support for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description oracle The %{name}-oracle package contains the Oracle plugin for %{name}, which allows a Oracle-Database to be used for persistent storage. %endif %package mysql Summary: MySQL Storage Support for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description mysql The %{name}-mysql package contains the MySQL plugin for %{name}, which allows a MySQL-Database to be used for persistent storage. %package perl Summary: Helps implement your own OpenSIPS extensions in Perl Group: System Environment/Daemons # require perl-devel for >F7 and perl for <=F6 BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?rhel} BuildRequires: perl(ExtUtils::Embed) %else BuildRequires: perl(ExtUtils::Embed), perl-devel %endif Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl The time needed when writing a new OpenSIPS module unfortunately is quite high, while the options provided by the configuration file are limited to the features implemented in the modules. With this Perl module, you can easily implement your own OpenSIPS extensions in Perl. This allows for simple access to the full world of CPAN modules. SIP URI rewriting could be implemented based on regular expressions; accessing arbitrary data backends, e.g. LDAP or Berkeley DB files, is now extremely simple. %package perlvdb Summary: Perl virtual database engine Group: System Environment/Daemons # require perl-devel for >F7 and perl for <=F6 BuildRequires: perl(ExtUtils::MakeMaker) Requires: %{name} = %{version}-%{release} Requires: %{name}-perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perlvdb The Perl Virtual Database (VDB) provides a virtualization framework for OpenSIPS's database access. It does not handle a particular database engine itself but lets the user relay database requests to arbitrary Perl functions. %package peering Summary: Radius peering Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description peering Peering module allows SIP providers (operators or organizations) to verify from a broker if source or destination of a SIP request is a trusted peer. %package postgresql Summary: PostgreSQL Storage Support for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description postgresql The %{name}-postgresql package contains the PostgreSQL plugin for %{name}, which allows a PostgreSQL-Database to be used for persistent storage. %package presence Summary: Presence server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description presence This module implements a presence server. It handles PUBLISH and SUBSCRIBE messages and generates NOTIFY messages. It offers support for aggregation of published presence information for the same presentity using more devices. It can also filter the information provided to watchers according to privacy rules. %package presence_dialoginfo Summary: Extension to Presence server for Dialog-Info Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence %description presence_dialoginfo The module enables the handling of "Event: dialog" (as defined in RFC 4235) inside of the presence module. This can be used distribute the dialog-info status to the subscribed watchers. %package presence_mwi Summary: Extension to Presence server for Message Waiting Indication Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence %description presence_mwi The module does specific handling for notify-subscribe message-summary (message waiting indication) events as specified in RFC 3842. It is used with the general event handling module, presence. It constructs and adds message-summary event to it. %package presence_xcapdiff Summary: Extension to Presence server for XCAP-DIFF event Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence Requires: %{name}-pia_mi %description presence_xcapdiff The presence_xcapdiff is an OpenSIPS module that adds support for the "xcap-diff" event to presence and pua. %package presence_xml Summary: SIMPLE Presence extension Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence Requires: %{name}-xcap_client %description presence_xml The module does specific handling for notify-subscribe events using xml bodies. It is used with the general event handling module, presence. %package pua Summary: Offer the functionality of a presence user agent client Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description pua This module offer the functionality of a presence user agent client, sending Subscribe and Publish messages. %package pua_dialoginfo Summary: Dialog-Info extension for PUA Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua %description pua_dialoginfo The pua_dialoginfo retrieves dialog state information from the dialog module and PUBLISHes the dialog-information using the pua module. Thus, in combination with the presence_xml module this can be used to derive dialog-info from the dialog module and NOTIFY the subscribed watchers about dialog-info changes. %package pua_bla Summary: BLA extension for PUA Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua Requires: %{name}-presence %description pua_bla The pua_bla module enables Bridged Line Appearances support according to the specifications in draft-anil-sipping-bla-03.txt. %package pua_mi Summary: Connector between usrloc and MI interface Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua %description pua_mi The pua_mi sends offer the possibility to publish presence information via MI transports. Using this module you can create independent applications/scripts to publish not sip-related information (e.g., system resources like CPU-usage, memory, number of active subscribers ...) %package pua_usrloc Summary: Connector between usrloc and pua modules Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua %description pua_usrloc This module is the connector between usrloc and pua modules. It creates the environment to send PUBLISH requests for user location records, on specific events (e.g., when new record is added in usrloc, a PUBLISH with status open (online) is issued; when expires, it sends closed (offline)). Using this module, phones which have no support for presence can be seen as online/offline. %package pua_xmpp Summary: SIMPLE-XMPP Presence gateway Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua Requires: %{name}-presence Requires: %{name}-xmpp %description pua_xmpp This module is a gateway for presence between SIP and XMPP. It translates one format into another and uses xmpp, pua and presence modules to manage the transmition of presence state information. %package regex Summary: RegExp via PCRE library Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description regex This module offers matching operations against regular expressions using the powerful PCRE library. %package rls Summary: Resource List Server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua Requires: %{name}-presence %description rls The modules is a Resource List Server implementation following the specification in RFC 4662 and RFC 4826. %package seas Summary: Transfers the execution logic control to a given external entity Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description seas SEAS module enables OpenSIPS to transfer the execution logic control of a sip message to a given external entity, called the Application Server. When the OpenSIPS script is being executed on an incoming SIP message, invocation of the as_relay_t() function makes this module send the message along with some transaction information to the specified Application Server. The Application Server then executes some call-control logic code, and tells OpenSIPS to take some actions, ie. forward the message downstream, or respond to the message with a SIP repy, etc %package sms Summary: Gateway between SIP and GSM networks via sms Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description sms This module provides a way of communication between SIP network (via SIP MESSAGE) and GSM networks (via ShortMessageService). Communication is possible from SIP to SMS and vice versa. The module provides facilities like SMS confirmation--the gateway can confirm to the SIP user if his message really reached its destination as a SMS--or multi-part messages--if a SIP messages is too long it will be split and sent as multiple SMS. %if %{undefined disable_snmpstats} %package snmpstats Summary: SNMP management interface for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description snmpstats The %{name}-snmpstats package provides an SNMP management interface to OpenSIPS. Specifically, it provides general SNMP queryable scalar statistics, table representations of more complicated data such as user and contact information, and alarm monitoring capabilities. %endif %package tlsops Summary: TLS-relating functions for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description tlsops The %{name}-tlsops package implements TLS related functions to use in the routing script, and exports pseudo variables with certificate and TLS parameters. %package unixodbc Summary: OpenSIPS unixODBC Storage support Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description unixodbc The %{name}-unixodbc package contains the unixODBC plugin for %{name}, which allows a unixODBC to be used for persistent storage %package xcap_client Summary: XCAP client Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description xcap_client The modules is an XCAP client for OpenSIPS that can be used by other modules. It fetches XCAP elements, either documents or part of them, by sending HTTP GET requests. It also offers support for conditional queries. It uses libcurl library as a client-side HTTP transfer library. %package xmpp Summary: Gateway between OpenSIPS and a jabber server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description xmpp This modules is a gateway between Openser and a jabber server. It enables the exchange of instant messages between SIP clients and XMPP(jabber) clients. %prep %setup -q -n %{name}-%{version}-tls %patch1 -p1 %build LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \ exclude_modules="%EXCLUDE_MODULES" \ cfg-target=%{_sysconfdir}/opensips/ \ modules-prefix=%{buildroot}/%{_prefix} \ modules-dir=%{_lib}/%{name}/modules %install rm -rf $RPM_BUILD_ROOT %{__make} install TLS=1 LIBDIR=%{_lib} \ exclude_modules="%EXCLUDE_MODULES" \ basedir=%{buildroot} prefix=%{_prefix} \ cfg-prefix=%{buildroot} \ modules-prefix=%{buildroot}/%{_prefix} \ modules-dir=%{_lib}/%{name}/modules \ DBTEXTON=yes # fixed dbtext documentation installation # clean some things mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib} if [ -d "$RPM_BUILD_ROOT/%{_prefix}/perl" ]; then # for fedora>=11 mv $RPM_BUILD_ROOT/%{_prefix}/perl/* \ $RPM_BUILD_ROOT/%{perl_vendorlib}/ else # for fedora<=10 mv $RPM_BUILD_ROOT/%{_libdir}/opensips/perl/* \ $RPM_BUILD_ROOT/%{perl_vendorlib}/ fi mv $RPM_BUILD_ROOT/%{_sysconfdir}/opensips/tls/README \ $RPM_BUILD_ROOT/%{_docdir}/opensips/README.tls rm -f $RPM_BUILD_ROOT%{_docdir}/opensips/INSTALL mv $RPM_BUILD_ROOT/%{_docdir}/opensips docdir # recode documentation for i in docdir/*; do mv -f $i $i.old iconv -f iso8859-1 -t UTF-8 $i.old > $i rm -f $i.old done mkdir -p $RPM_BUILD_ROOT%{_initrddir} %{__install} -p -D -m 755 packaging/fedora/opensips.init \ $RPM_BUILD_ROOT%{_initrddir}/opensips echo -e "\nETCDIR=\"%{_sysconfdir}/opensips\"\n" \ >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/opensipsctlrc #install sysconfig file install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add opensips %preun if [ $1 = 0 ]; then /sbin/service opensips stop > /dev/null 2>&1 /sbin/chkconfig --del opensips fi %files %defattr(-,root,root,-) %{_sbindir}/opensips %{_sbindir}/opensipsctl %{_sbindir}/opensipsdbctl %{_sbindir}/opensipsunix %{_sbindir}/osipsconsole %attr(750,root,root) %dir %{_sysconfdir}/opensips %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/rootCA %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/rootCA/certs %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/rootCA/private %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/user %dir %{_libdir}/opensips/ %dir %{_libdir}/opensips/modules/ %dir %{_libdir}/opensips/opensipsctl/ %dir %{_libdir}/opensips/opensipsctl/dbtextdb %attr(755,root,root) %{_initrddir}/opensips %config(noreplace) %{_sysconfdir}/opensips/dictionary.opensips %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %attr(640,root,root) %config(noreplace) %{_sysconfdir}/opensips/opensips.cfg %attr(640,root,root) %config(noreplace) %{_sysconfdir}/opensips/opensipsctlrc %attr(640,root,root) %config(noreplace) %{_sysconfdir}/opensips/osipsconsolerc # these files are just an example so no need to restrict access to them %config(noreplace) %{_sysconfdir}/opensips/tls/ca.conf %config(noreplace) %{_sysconfdir}/opensips/tls/request.conf %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/cacert.pem %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/certs/01.pem %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/index.txt %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/private/cakey.pem %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/serial %config(noreplace) %{_sysconfdir}/opensips/tls/user.conf %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-calist.pem %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-cert.pem %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-cert_req.pem %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-privkey.pem %{_libdir}/opensips/opensipsctl/opensipsctl.* %{_libdir}/opensips/opensipsctl/opensipsdbctl.base %{_libdir}/opensips/opensipsctl/opensipsdbctl.dbtext %{_libdir}/opensips/opensipsctl/dbtextdb/dbtextdb.py* %dir %{_datadir}/opensips %dir %{_datadir}/opensips/dbtext %dir %{_datadir}/opensips/dbtext/opensips %{_datadir}/opensips/dbtext/opensips/* %{_mandir}/man5/opensips.cfg.5* %{_mandir}/man8/opensips.8* %{_mandir}/man8/opensipsctl.8* %{_mandir}/man8/opensipsunix.8* %doc docdir/AUTHORS %doc docdir/NEWS %doc docdir/README %doc docdir/README-MODULES %doc docdir/README.tls %doc COPYING %{_libdir}/opensips/modules/acc.so %{_libdir}/opensips/modules/alias_db.so %{_libdir}/opensips/modules/auth.so %{_libdir}/opensips/modules/auth_db.so %{_libdir}/opensips/modules/avpops.so %{_libdir}/opensips/modules/benchmark.so %{_libdir}/opensips/modules/call_control.so %{_libdir}/opensips/modules/closeddial.so %{_libdir}/opensips/modules/cfgutils.so %{_libdir}/opensips/modules/db_flatstore.so %{_libdir}/opensips/modules/db_virtual.so %{_libdir}/opensips/modules/db_text.so %{_libdir}/opensips/modules/dialog.so %{_libdir}/opensips/modules/dialplan.so %{_libdir}/opensips/modules/dispatcher.so %{_libdir}/opensips/modules/diversion.so %{_libdir}/opensips/modules/domain.so %{_libdir}/opensips/modules/domainpolicy.so %{_libdir}/opensips/modules/drouting.so %{_libdir}/opensips/modules/enum.so %{_libdir}/opensips/modules/exec.so %{_libdir}/opensips/modules/gflags.so %{_libdir}/opensips/modules/group.so %{_libdir}/opensips/modules/identity.so %{_libdir}/opensips/modules/imc.so %{_libdir}/opensips/modules/lcr.so %{_libdir}/opensips/modules/load_balancer.so %{_libdir}/opensips/modules/localcache.so %{_libdir}/opensips/modules/mangler.so %{_libdir}/opensips/modules/maxfwd.so %{_libdir}/opensips/modules/mediaproxy.so %{_libdir}/opensips/modules/mi_fifo.so %{_libdir}/opensips/modules/mi_datagram.so %{_libdir}/opensips/modules/msilo.so %{_libdir}/opensips/modules/nathelper.so %{_libdir}/opensips/modules/nat_traversal.so %{_libdir}/opensips/modules/options.so %{_libdir}/opensips/modules/path.so %{_libdir}/opensips/modules/pdt.so %{_libdir}/opensips/modules/permissions.so %{_libdir}/opensips/modules/pike.so %{_libdir}/opensips/modules/qos.so %{_libdir}/opensips/modules/ratelimit.so %{_libdir}/opensips/modules/registrar.so %{_libdir}/opensips/modules/rr.so %{_libdir}/opensips/modules/signaling.so %{_libdir}/opensips/modules/siptrace.so %{_libdir}/opensips/modules/sl.so %{_libdir}/opensips/modules/speeddial.so %{_libdir}/opensips/modules/sst.so %{_libdir}/opensips/modules/statistics.so %{_libdir}/opensips/modules/stun.so %{_libdir}/opensips/modules/textops.so %{_libdir}/opensips/modules/tm.so %{_libdir}/opensips/modules/uac.so %{_libdir}/opensips/modules/uac_redirect.so %{_libdir}/opensips/modules/userblacklist.so %{_libdir}/opensips/modules/uri.so %{_libdir}/opensips/modules/usrloc.so %{_libdir}/opensips/modules/xlog.so %doc docdir/README.acc %doc docdir/README.alias_db %doc docdir/README.auth %doc docdir/README.auth_db %doc docdir/README.avpops %doc docdir/README.benchmark %doc docdir/README.cfgutils %doc docdir/README.db_text %doc docdir/README.dialog %doc docdir/README.dialplan %doc docdir/README.dispatcher %doc docdir/README.diversion %doc docdir/README.domain %doc docdir/README.domainpolicy %doc docdir/README.drouting %doc docdir/README.enum %doc docdir/README.exec #%doc docdir/README.flatstore %doc docdir/README.gflags %doc docdir/README.group %doc docdir/README.imc %doc docdir/README.lcr %doc docdir/README.mangler %doc docdir/README.maxfwd %doc docdir/README.mediaproxy %doc docdir/README.mi_fifo %doc docdir/README.mi_datagram %doc docdir/README.msilo %doc docdir/README.nathelper %doc docdir/README.options %doc docdir/README.path %doc docdir/README.pdt %doc docdir/README.permissions %doc docdir/README.pike %doc docdir/README.registrar %doc docdir/README.rr %doc docdir/README.siptrace %doc docdir/README.sl %doc docdir/README.speeddial %doc docdir/README.sst %doc docdir/README.statistics #%doc docdir/README.textops %doc docdir/README.tm %doc docdir/README.uac %doc docdir/README.uac_redirect %doc docdir/README.uri %doc docdir/README.usrloc %doc docdir/README.xlog %files aaa_radius %defattr(-,root,root,-) %{_libdir}/opensips/modules/aaa_radius.so %doc docdir/README.aaa_radius %files acc %defattr(-,root,root,-) %{_libdir}/opensips/modules/acc.so %doc docdir/README.acc %files auth_aaa %defattr(-,root,root,-) %{_libdir}/opensips/modules/auth_aaa.so %doc docdir/README.auth_aaa %files auth_diameter %defattr(-,root,root,-) %{_libdir}/opensips/modules/auth_diameter.so %doc docdir/README.auth_diameter %files b2bua %defattr(-,root,root,-) %{_libdir}/opensips/modules/b2b_entities.so %{_libdir}/opensips/modules/b2b_logic.so %doc docdir/README.b2b_entities %doc docdir/README.b2b_logic %files carrierroute %defattr(-,root,root,-) %{_libdir}/opensips/modules/carrierroute.so %doc docdir/README.carrierroute %files cpl-c %defattr(-,root,root,-) %{_libdir}/opensips/modules/cpl-c.so %doc docdir/README.cpl-c %files db_berkeley %defattr(-,root,root,-) %{_sbindir}/bdb_recover %{_libdir}/opensips/modules/db_berkeley.so %{_libdir}/opensips/opensipsctl/opensipsdbctl.db_berkeley %dir %{_datadir}/opensips/db_berkeley %dir %{_datadir}/opensips/db_berkeley/opensips %{_datadir}/opensips/db_berkeley/opensips/* %doc docdir/README.db_berkeley %files db_http %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_http.so %doc docdir/README.db_http %files h350 %defattr(-,root,root,-) %{_libdir}/opensips/modules/h350.so %doc docdir/README.h350 %files jabber %defattr(-,root,root,-) %{_libdir}/opensips/modules/jabber.so %doc docdir/README.jabber %files ldap %defattr(-,root,root,-) %{_libdir}/opensips/modules/ldap.so %doc docdir/README.ldap %files memcached %defattr(-,root,root,-) %{_libdir}/opensips/modules/memcached.so %doc docdir/README.memcached %files mmgeoip %defattr(-,root,root,-) %{_libdir}/opensips/modules/mmgeoip.so %doc docdir/README.mmgeoip %files mysql %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_mysql.so %{_libdir}/opensips/opensipsctl/opensipsdbctl.mysql %dir %{_datadir}/opensips/mysql %{_datadir}/opensips/mysql/*.sql %doc docdir/README.db_mysql %if %{defined db_oracle} %files oracle %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_oracle.db %{_libdir}/opensips/opensipsctl/opensipsdbctl.oracle %dir %{_datadir}/opensips/oracle %{_datadir}/opensips/oracle/* %doc docdir/README.db_oracle %endif %files perl %defattr(-,root,root,-) %dir %{perl_vendorlib}/OpenSIPS %dir %{perl_vendorlib}/OpenSIPS/LDAPUtils %dir %{perl_vendorlib}/OpenSIPS/Utils %{_libdir}/opensips/modules/perl.so %{perl_vendorlib}/OpenSIPS.pm %{perl_vendorlib}/OpenSIPS/Constants.pm %{perl_vendorlib}/OpenSIPS/LDAPUtils/LDAPConf.pm %{perl_vendorlib}/OpenSIPS/LDAPUtils/LDAPConnection.pm %{perl_vendorlib}/OpenSIPS/Message.pm %{perl_vendorlib}/OpenSIPS/Utils/PhoneNumbers.pm %{perl_vendorlib}/OpenSIPS/Utils/Debug.pm %doc docdir/README.perl %files perlvdb %defattr(-,root,root,-) %dir %{perl_vendorlib}/OpenSIPS/VDB %dir %{perl_vendorlib}/OpenSIPS/VDB/Adapter %{_libdir}/opensips/modules/perlvdb.so %{perl_vendorlib}/OpenSIPS/VDB.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/AccountingSIPtrace.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Alias.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Auth.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Describe.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Speeddial.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/TableVersions.pm %{perl_vendorlib}/OpenSIPS/VDB/Column.pm %{perl_vendorlib}/OpenSIPS/VDB/Pair.pm %{perl_vendorlib}/OpenSIPS/VDB/ReqCond.pm %{perl_vendorlib}/OpenSIPS/VDB/Result.pm %{perl_vendorlib}/OpenSIPS/VDB/VTab.pm %{perl_vendorlib}/OpenSIPS/VDB/Value.pm %doc docdir/README.perlvdb %files peering %defattr(-,root,root,-) %{_libdir}/opensips/modules/peering.so %doc docdir/README.peering %files postgresql %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_postgres.so %{_libdir}/opensips/opensipsctl/opensipsdbctl.pgsql %dir %{_datadir}/opensips/postgres %{_datadir}/opensips/postgres/*.sql %doc docdir/README.db_postgres %files presence %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence.so %doc docdir/README.presence %files presence_dialoginfo %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_dialoginfo.so %doc docdir/README.presence_dialoginfo %files presence_mwi %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_mwi.so %doc docdir/README.presence_mwi %files presence_xcapdiff %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_xcapdiff.so %files presence_xml %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_xml.so %doc docdir/README.presence_xml %files pua %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua.so %doc docdir/README.pua %files pua_dialoginfo %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_dialoginfo.so %doc docdir/README.pua_dialoginfo %files pua_bla %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_bla.so %doc docdir/README.pua_bla %files pua_mi %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_mi.so %doc docdir/README.pua_mi %files pua_usrloc %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_usrloc.so %doc docdir/README.pua_usrloc %files pua_xmpp %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_xmpp.so %doc docdir/README.pua_xmpp %files regex %defattr(-,root,root,-) %{_libdir}/opensips/modules/regex.so %doc docdir/README.regex %files rls %defattr(-,root,root,-) %{_libdir}/opensips/modules/rls.so %doc docdir/README.rls %files seas %defattr(-,root,root,-) %{_libdir}/opensips/modules/seas.so %doc docdir/README.seas %files sms %defattr(-,root,root,-) %{_libdir}/opensips/modules/sms.so %doc docdir/README.sms %if %{undefined disable_snmpstats} %files snmpstats %defattr(-,root,root,-) %{_libdir}/opensips/modules/snmpstats.so %doc docdir/README.snmpstats %dir %{_datadir}/snmp %dir %{_datadir}/snmp/mibs %{_datadir}/snmp/mibs/OPENSER-MIB %{_datadir}/snmp/mibs/OPENSER-REG-MIB %{_datadir}/snmp/mibs/OPENSER-SIP-COMMON-MIB %{_datadir}/snmp/mibs/OPENSER-SIP-SERVER-MIB %{_datadir}/snmp/mibs/OPENSER-TC %endif %files tlsops %defattr(-,root,root,-) %{_libdir}/opensips/modules/tlsops.so %doc docdir/README.tlsops %files unixodbc %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_unixodbc.so %doc docdir/README.db_unixodbc %files xcap_client %defattr(-,root,root,-) %{_libdir}/opensips/modules/xcap_client.so %doc docdir/README.xcap_client %files xmpp %defattr(-,root,root,-) %{_libdir}/opensips/modules/xmpp.so %doc docdir/README.xmpp %changelog * Thu Oct 29 2009 John Khvatov - 1.6.0-2 - Added patch for init script to fix malformed comment block - Added COPYING file - Fixed not-capitalized summory of memcached subpackage * Mon Oct 19 2009 John Khvatov - 1.6.0-1 - Created new package from openser package - Upgrade to OpenSIPS 1.6 - New modules - Added osipconsole tool * Tue Aug 25 2009 Tomas Mraz - 1.3.4-8 - rebuilt with new openssl * Sat Jul 25 2009 Fedora Release Engineering - 1.3.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Mar 02 2009 Jan ONDREJ (SAL) - 1.3.4-6 - allow build of this package on fedora<=10 * Sat Feb 28 2009 Jan ONDREJ (SAL) - 1.3.4-5 - fix module path * Sat Feb 28 2009 Jan ONDREJ (SAL) - 1.3.4-3 - addedd subversion build dependency to avoid svnversion error messages - fixed installation of perl modules in rawhide * Fri Jan 23 2009 Jan ONDREJ (SAL) 1.3.4-2 - Rebuild for new mysql. * Mon Dec 8 2008 Peter Lemenkov 1.3.4-1 - Ver. 1.3.4 - Added sysconfig-file * Thu Aug 28 2008 Michael Schwendt - 1.3.3-3 - Include lots of unowned directories. * Thu Aug 28 2008 Peter Lemenkov 1.3.3-2 - Removed dialplan and drouting modules from upstream * Thu Aug 28 2008 Peter Lemenkov 1.3.3-1 - Ver. 1.3.3 - Dropped upstreamed patch * Mon Aug 11 2008 Peter Lemenkov 1.3.2-5 - Typo fix * Mon Aug 11 2008 Peter Lemenkov 1.3.2-4 - Fix build with --fuzz=0 * Mon Aug 11 2008 Peter Lemenkov 1.3.2-3 - Fixed urls - Restricted access to openser.cfg and openserctl.cfg - Service won't start by default (BZ# 441297) * Fri May 16 2008 Peter Lemenkov 1.3.2-2 - New modules - dialplan and drouting (this one still has no README) * Thu May 15 2008 Peter Lemenkov 1.3.2-1 - Ver. 1.3.2 * Tue Mar 18 2008 Tom "spot" Callaway - 1.3.1-3 - add Requires for versioned perl (libperl.so) - drop silly file Requires * Fri Mar 14 2008 Jan ONDREJ (SAL) - 1.3.1-2 - removed perl patch, which is not necessary * Thu Mar 13 2008 Jan ONDREJ (SAL) - 1.3.1-1 - update to upstream - removed obsolete patches * Fri Mar 7 2008 Tom "spot" Callaway - 1.3.0-12 - patch perl code to use PERL_SYS_INIT3_BODY * Fri Mar 7 2008 Tom "spot" Callaway - 1.3.0-11 - fix perl build requires * Thu Mar 06 2008 Tom "spot" Callaway - 1.3.0-10 - Rebuild for new perl * Sat Feb 23 2008 Jan ONDREJ (SAL) 1.3.0-9 - ia64 build fix * Sat Feb 9 2008 Peter Lemenkov 1.3.0-8.1 - typo fix * Sat Feb 9 2008 Peter Lemenkov 1.3.0-8 - Rebuild for GCC 4.3 * Sat Jan 26 2008 Jan ONDREJ (SAL) 1.3.0-7 - Updated syntax error in default config * Sat Jan 26 2008 Peter Lemenkov 1.3.0-5 - Merge of acc module into main package * Fri Jan 25 2008 Jan ONDREJ (SAL) 1.3.0-4 - modify and apply forgotten patch4 * Thu Jan 17 2008 Jan ONDREJ (SAL) 1.3.0-2 - removed openser.init and replaced by upstream version - fixed configuration path for openserdbctl (#428799) * Sun Jan 13 2008 Peter Lemenkov 1.3.0-1.4 - 4th try to remove lm_sensors-devel from EL-[45] at ppc{64} * Thu Dec 13 2007 Peter Lemenkov 1.3.0-1 - Final ver. 1.3.0 - Removed some leftovers from spec-file * Wed Dec 12 2007 Peter Lemenkov 1.3.0-0.1.pre1 - Latest snapshot - 1.3.0pre1 * Mon Dec 10 2007 Jan ONDREJ (SAL) 1.2.2-11 - added ETCDIR into openserctlrc (need openser-1.3 to work) * Mon Sep 24 2007 Jan ONDREJ (SAL) 1.2.2-10 - perl scripts moved to perl_vendorlib directory - added LDAPUtils and Utils subdirectories - changed perl module BuildRequires * Mon Sep 24 2007 Jan ONDREJ (SAL) 1.2.2-9 - added reload section to init script - init script specified with initrddir macro - documentation converted to UTF-8 - added doc macro for documentation - documentation moved do proper place (/usr/share/doc/NAME-VERSION/) - which removed from BuildRequires, it's in guidelines exceptions - unixodbc subpackage summary update * Thu Sep 6 2007 Peter Lemenkov 1.2.2-8 - Added another one missing BR - which (needs by snmpstats module) - Cosmetic: dropped commented out 'Requires' * Thu Sep 06 2007 Jan ONDREJ (SAL) 1.2.2-7 - added attr macro for init script - added -p to install arguments to preserve timestamp - parallel make used * Sun Aug 26 2007 Jan ONDREJ (SAL) 1.2.2-6 - Fedora Core 6 build updates - changed attributes for openser.init to be rpmlint more silent * Sun Aug 26 2007 Peter Lemenkov 1.2.2-5 - fixed paths for openssl libs and includes * Sun Aug 26 2007 Peter Lemenkov 1.2.2-4 - Introduced acc and acc_radius modules (Jan Ondrej) - Dropped radius_accounting condition * Sat Aug 25 2007 Peter Lemenkov 1.2.2-3 - Changed license according to Fedora's policy - Make rpmlint more silent * Fri Aug 24 2007 Jan ONDREJ (SAL) 1.2.2-2 - added openser.init script - removed Patch0: openser--Makefile.diff and updated build section - spec file is 80 characters wide - added radius_accounting condition * Wed Aug 22 2007 Peter Lemenkov 1.2.2-1 - Ver. 1.2.2 * Tue Jul 24 2007 Peter Lemenkov 1.2.1-1 - Initial spec. --- NEW FILE opensips.sysconfig --- # Add extra options here OPTIONS="" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/opensips/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:34:15 -0000 1.1 +++ .cvsignore 3 Nov 2009 10:40:34 -0000 1.2 @@ -0,0 +1 @@ +opensips-1.6.0-tls_src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/opensips/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:34:16 -0000 1.1 +++ sources 3 Nov 2009 10:40:34 -0000 1.2 @@ -0,0 +1 @@ +c9dbca1dc74e0a3a383f61e3dc4844df opensips-1.6.0-tls_src.tar.gz From ivaxer at fedoraproject.org Tue Nov 3 10:42:45 2009 From: ivaxer at fedoraproject.org (John A. Khvatov) Date: Tue, 3 Nov 2009 10:42:45 +0000 (UTC) Subject: rpms/opensips/F-12 import.log, NONE, 1.1 opensips--init.patch, NONE, 1.1 opensips.spec, NONE, 1.1 opensips.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103104245.F260311C00E8@cvs1.fedora.phx.redhat.com> Author: ivaxer Update of /cvs/pkgs/rpms/opensips/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30126/F-12 Modified Files: .cvsignore sources Added Files: import.log opensips--init.patch opensips.spec opensips.sysconfig Log Message: Initial import (#529831) --- NEW FILE import.log --- opensips-1_6_0-2_fc11:F-12:opensips-1.6.0-2.fc11.src.rpm:1257244682 opensips--init.patch: opensips.init | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE opensips--init.patch --- diff -Nur opensips-1.6.0-tls/packaging/fedora/opensips.init opensips-1.6.0-tls_patched/packaging/fedora/opensips.init --- opensips-1.6.0-tls/packaging/fedora/opensips.init 2009-10-16 04:37:55.000000000 +0400 +++ opensips-1.6.0-tls_patched/packaging/fedora/opensips.init 2009-10-29 14:05:56.211918358 +0300 @@ -14,8 +14,7 @@ # Required-Start: $local_fs $network $named # Should-Start: mysqld postgresql # Short-Description: start, stop OpenSIPS -# Description: OpenSIPS or OpenSIPS is a very fast and flexible -# SIP (RFC3261) server. +# Description: OpenSIPS is a very fast and flexible SIP (RFC3261) server. ### END INIT INFO # Source function library. --- NEW FILE opensips.spec --- %if 0%{?rhel} # copied from lm_sensors exclusive arch %ifnarch alpha i386 i486 i586 i686 pentium3 pentium4 athlon x86_64 %define disable_snmpstats snmpstats %endif %endif %define EXCLUDE_MODULES mi_xmlrpc osp json %{?disable_snmpstats} %{!?_with_oracle:db_oracle} Summary: Open Source SIP Server Name: opensips Version: 1.6.0 Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz Source1: %{name}.sysconfig Patch1: opensips--init.patch URL: http://opensips.org BuildRequires: expat-devel BuildRequires: libxml2-devel BuildRequires: bison BuildRequires: flex #BuildRequires: subversion # needed by snmpstats BuildRequires: radiusclient-ng-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel # required by snmpstats module %if %{undefined disable_snmpstats} BuildRequires: lm_sensors-devel %endif BuildRequires: net-snmp-devel BuildRequires: unixODBC-devel BuildRequires: openssl-devel BuildRequires: expat-devel #BuildRequires: xmlrpc-c-devel BuildRequires: libconfuse-devel BuildRequires: db4-devel BuildRequires: openldap-devel BuildRequires: curl-devel BuildRequires: libmemcached-devel BuildRequires: GeoIP-devel BuildRequires: pcre-devel Requires(post): chkconfig Requires(preun):chkconfig # for /sbin/service Requires(preun):initscripts BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description OpenSIPS or Open SIP Server is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, opensips can handle thousands calls per second even on low-budget hardware. A C Shell like scripting language provides full control over the server's behaviour. It's modular architecture allows only required functionality to be loaded. Currently the following modules are available: digest authentication, CPL scripts, instant messaging, MySQL and UNIXODBC support, a presence agent, radius authentication, record routing, an SMS gateway, a jabber gateway, a transaction and dialog module, OSP module, statistics support, registrar and user location. %package aaa_radius Summary: RADIUS backend for AAA api Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description aaa_radius This module provides the RADIUS backend for the AAA API - group, auth, uri module use the AAA API for performing RADIUS ops. %package acc Summary: Accounts transactions information to different backends Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description acc ACC module is used to account transactions information to different backends like syslog, SQL, AAA. %package auth_aaa Summary: Performs authentication using an AAA server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description auth_aaa This module contains functions that are used to perform authentication using an AAA server. Basically the proxy will pass along the credentials to the AAA server which will in turn send a reply containing result of the authentication. So basically the whole authentication is done in the AAA server. %package auth_diameter Summary: Performs authentication using a Diameter server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description auth_diameter This module implements SIP authentication and authorization with DIAMETER server, namely DIameter Server Client (DISC). %package b2bua Summary: Back-2-Back User Agent Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description b2bua B2BUA is an implementation of the behavior of a B2BUA as defined in RFC 3261 that offers the possibility to build certain services on top of it. %package carrierroute Summary: Routing extension suitable for carriers Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description carrierroute A module which provides routing, balancing and blacklisting capabilities. %package cpl-c Summary: Call Processing Language interpreter Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description cpl-c This module implements a CPL (Call Processing Language) interpreter. Support for uploading/downloading/removing scripts via SIP REGISTER method is present. %package db_berkeley Summary: Berkley DB backend support Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description db_berkeley This is a module which integrates the Berkeley DB into OpenSIPS. It implements the DB API defined in OpenSIPS. %package db_http Summary: HTTP DB backend support Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description db_http This module provides access to a database that is implemented as a HTTP server. %package h350 Summary: H350 implementation Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description h350 The OpenSIPS H350 module enables an OpenSIPS SIP proxy server to access SIP account data stored in an LDAP [RFC4510] directory containing H.350 [H.350] commObjects. %package jabber Summary: Gateway between OpenSIPS and a jabber server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description jabber Jabber module that integrates XODE XML parser for parsing Jabber messages. %package ldap Summary: LDAP connector Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description ldap The LDAP module implements an LDAP search interface for OpenSIPS. %package memcached Summary: Memcached connector Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description memcached Memcached module is an implementation of a cache system designed to work with a memcached server. %package mmgeoip Summary: Wrapper for the MaxMind GeoIP API Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description mmgeoip Mmgeoip is a lightweight wrapper for the MaxMind GeoIP API. It adds IP address-to-location lookup capability to OpenSIPS scripts. %if %{defined db_oracle} %package oracle Summary: Oracle Storage Support for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description oracle The %{name}-oracle package contains the Oracle plugin for %{name}, which allows a Oracle-Database to be used for persistent storage. %endif %package mysql Summary: MySQL Storage Support for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description mysql The %{name}-mysql package contains the MySQL plugin for %{name}, which allows a MySQL-Database to be used for persistent storage. %package perl Summary: Helps implement your own OpenSIPS extensions in Perl Group: System Environment/Daemons # require perl-devel for >F7 and perl for <=F6 BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?rhel} BuildRequires: perl(ExtUtils::Embed) %else BuildRequires: perl(ExtUtils::Embed), perl-devel %endif Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl The time needed when writing a new OpenSIPS module unfortunately is quite high, while the options provided by the configuration file are limited to the features implemented in the modules. With this Perl module, you can easily implement your own OpenSIPS extensions in Perl. This allows for simple access to the full world of CPAN modules. SIP URI rewriting could be implemented based on regular expressions; accessing arbitrary data backends, e.g. LDAP or Berkeley DB files, is now extremely simple. %package perlvdb Summary: Perl virtual database engine Group: System Environment/Daemons # require perl-devel for >F7 and perl for <=F6 BuildRequires: perl(ExtUtils::MakeMaker) Requires: %{name} = %{version}-%{release} Requires: %{name}-perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perlvdb The Perl Virtual Database (VDB) provides a virtualization framework for OpenSIPS's database access. It does not handle a particular database engine itself but lets the user relay database requests to arbitrary Perl functions. %package peering Summary: Radius peering Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description peering Peering module allows SIP providers (operators or organizations) to verify from a broker if source or destination of a SIP request is a trusted peer. %package postgresql Summary: PostgreSQL Storage Support for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description postgresql The %{name}-postgresql package contains the PostgreSQL plugin for %{name}, which allows a PostgreSQL-Database to be used for persistent storage. %package presence Summary: Presence server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description presence This module implements a presence server. It handles PUBLISH and SUBSCRIBE messages and generates NOTIFY messages. It offers support for aggregation of published presence information for the same presentity using more devices. It can also filter the information provided to watchers according to privacy rules. %package presence_dialoginfo Summary: Extension to Presence server for Dialog-Info Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence %description presence_dialoginfo The module enables the handling of "Event: dialog" (as defined in RFC 4235) inside of the presence module. This can be used distribute the dialog-info status to the subscribed watchers. %package presence_mwi Summary: Extension to Presence server for Message Waiting Indication Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence %description presence_mwi The module does specific handling for notify-subscribe message-summary (message waiting indication) events as specified in RFC 3842. It is used with the general event handling module, presence. It constructs and adds message-summary event to it. %package presence_xcapdiff Summary: Extension to Presence server for XCAP-DIFF event Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence Requires: %{name}-pia_mi %description presence_xcapdiff The presence_xcapdiff is an OpenSIPS module that adds support for the "xcap-diff" event to presence and pua. %package presence_xml Summary: SIMPLE Presence extension Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence Requires: %{name}-xcap_client %description presence_xml The module does specific handling for notify-subscribe events using xml bodies. It is used with the general event handling module, presence. %package pua Summary: Offer the functionality of a presence user agent client Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description pua This module offer the functionality of a presence user agent client, sending Subscribe and Publish messages. %package pua_dialoginfo Summary: Dialog-Info extension for PUA Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua %description pua_dialoginfo The pua_dialoginfo retrieves dialog state information from the dialog module and PUBLISHes the dialog-information using the pua module. Thus, in combination with the presence_xml module this can be used to derive dialog-info from the dialog module and NOTIFY the subscribed watchers about dialog-info changes. %package pua_bla Summary: BLA extension for PUA Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua Requires: %{name}-presence %description pua_bla The pua_bla module enables Bridged Line Appearances support according to the specifications in draft-anil-sipping-bla-03.txt. %package pua_mi Summary: Connector between usrloc and MI interface Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua %description pua_mi The pua_mi sends offer the possibility to publish presence information via MI transports. Using this module you can create independent applications/scripts to publish not sip-related information (e.g., system resources like CPU-usage, memory, number of active subscribers ...) %package pua_usrloc Summary: Connector between usrloc and pua modules Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua %description pua_usrloc This module is the connector between usrloc and pua modules. It creates the environment to send PUBLISH requests for user location records, on specific events (e.g., when new record is added in usrloc, a PUBLISH with status open (online) is issued; when expires, it sends closed (offline)). Using this module, phones which have no support for presence can be seen as online/offline. %package pua_xmpp Summary: SIMPLE-XMPP Presence gateway Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua Requires: %{name}-presence Requires: %{name}-xmpp %description pua_xmpp This module is a gateway for presence between SIP and XMPP. It translates one format into another and uses xmpp, pua and presence modules to manage the transmition of presence state information. %package regex Summary: RegExp via PCRE library Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description regex This module offers matching operations against regular expressions using the powerful PCRE library. %package rls Summary: Resource List Server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua Requires: %{name}-presence %description rls The modules is a Resource List Server implementation following the specification in RFC 4662 and RFC 4826. %package seas Summary: Transfers the execution logic control to a given external entity Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description seas SEAS module enables OpenSIPS to transfer the execution logic control of a sip message to a given external entity, called the Application Server. When the OpenSIPS script is being executed on an incoming SIP message, invocation of the as_relay_t() function makes this module send the message along with some transaction information to the specified Application Server. The Application Server then executes some call-control logic code, and tells OpenSIPS to take some actions, ie. forward the message downstream, or respond to the message with a SIP repy, etc %package sms Summary: Gateway between SIP and GSM networks via sms Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description sms This module provides a way of communication between SIP network (via SIP MESSAGE) and GSM networks (via ShortMessageService). Communication is possible from SIP to SMS and vice versa. The module provides facilities like SMS confirmation--the gateway can confirm to the SIP user if his message really reached its destination as a SMS--or multi-part messages--if a SIP messages is too long it will be split and sent as multiple SMS. %if %{undefined disable_snmpstats} %package snmpstats Summary: SNMP management interface for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description snmpstats The %{name}-snmpstats package provides an SNMP management interface to OpenSIPS. Specifically, it provides general SNMP queryable scalar statistics, table representations of more complicated data such as user and contact information, and alarm monitoring capabilities. %endif %package tlsops Summary: TLS-relating functions for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description tlsops The %{name}-tlsops package implements TLS related functions to use in the routing script, and exports pseudo variables with certificate and TLS parameters. %package unixodbc Summary: OpenSIPS unixODBC Storage support Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description unixodbc The %{name}-unixodbc package contains the unixODBC plugin for %{name}, which allows a unixODBC to be used for persistent storage %package xcap_client Summary: XCAP client Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description xcap_client The modules is an XCAP client for OpenSIPS that can be used by other modules. It fetches XCAP elements, either documents or part of them, by sending HTTP GET requests. It also offers support for conditional queries. It uses libcurl library as a client-side HTTP transfer library. %package xmpp Summary: Gateway between OpenSIPS and a jabber server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description xmpp This modules is a gateway between Openser and a jabber server. It enables the exchange of instant messages between SIP clients and XMPP(jabber) clients. %prep %setup -q -n %{name}-%{version}-tls %patch1 -p1 %build LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \ exclude_modules="%EXCLUDE_MODULES" \ cfg-target=%{_sysconfdir}/opensips/ \ modules-prefix=%{buildroot}/%{_prefix} \ modules-dir=%{_lib}/%{name}/modules %install rm -rf $RPM_BUILD_ROOT %{__make} install TLS=1 LIBDIR=%{_lib} \ exclude_modules="%EXCLUDE_MODULES" \ basedir=%{buildroot} prefix=%{_prefix} \ cfg-prefix=%{buildroot} \ modules-prefix=%{buildroot}/%{_prefix} \ modules-dir=%{_lib}/%{name}/modules \ DBTEXTON=yes # fixed dbtext documentation installation # clean some things mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib} if [ -d "$RPM_BUILD_ROOT/%{_prefix}/perl" ]; then # for fedora>=11 mv $RPM_BUILD_ROOT/%{_prefix}/perl/* \ $RPM_BUILD_ROOT/%{perl_vendorlib}/ else # for fedora<=10 mv $RPM_BUILD_ROOT/%{_libdir}/opensips/perl/* \ $RPM_BUILD_ROOT/%{perl_vendorlib}/ fi mv $RPM_BUILD_ROOT/%{_sysconfdir}/opensips/tls/README \ $RPM_BUILD_ROOT/%{_docdir}/opensips/README.tls rm -f $RPM_BUILD_ROOT%{_docdir}/opensips/INSTALL mv $RPM_BUILD_ROOT/%{_docdir}/opensips docdir # recode documentation for i in docdir/*; do mv -f $i $i.old iconv -f iso8859-1 -t UTF-8 $i.old > $i rm -f $i.old done mkdir -p $RPM_BUILD_ROOT%{_initrddir} %{__install} -p -D -m 755 packaging/fedora/opensips.init \ $RPM_BUILD_ROOT%{_initrddir}/opensips echo -e "\nETCDIR=\"%{_sysconfdir}/opensips\"\n" \ >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/opensipsctlrc #install sysconfig file install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add opensips %preun if [ $1 = 0 ]; then /sbin/service opensips stop > /dev/null 2>&1 /sbin/chkconfig --del opensips fi %files %defattr(-,root,root,-) %{_sbindir}/opensips %{_sbindir}/opensipsctl %{_sbindir}/opensipsdbctl %{_sbindir}/opensipsunix %{_sbindir}/osipsconsole %attr(750,root,root) %dir %{_sysconfdir}/opensips %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/rootCA %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/rootCA/certs %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/rootCA/private %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/user %dir %{_libdir}/opensips/ %dir %{_libdir}/opensips/modules/ %dir %{_libdir}/opensips/opensipsctl/ %dir %{_libdir}/opensips/opensipsctl/dbtextdb %attr(755,root,root) %{_initrddir}/opensips %config(noreplace) %{_sysconfdir}/opensips/dictionary.opensips %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %attr(640,root,root) %config(noreplace) %{_sysconfdir}/opensips/opensips.cfg %attr(640,root,root) %config(noreplace) %{_sysconfdir}/opensips/opensipsctlrc %attr(640,root,root) %config(noreplace) %{_sysconfdir}/opensips/osipsconsolerc # these files are just an example so no need to restrict access to them %config(noreplace) %{_sysconfdir}/opensips/tls/ca.conf %config(noreplace) %{_sysconfdir}/opensips/tls/request.conf %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/cacert.pem %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/certs/01.pem %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/index.txt %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/private/cakey.pem %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/serial %config(noreplace) %{_sysconfdir}/opensips/tls/user.conf %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-calist.pem %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-cert.pem %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-cert_req.pem %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-privkey.pem %{_libdir}/opensips/opensipsctl/opensipsctl.* %{_libdir}/opensips/opensipsctl/opensipsdbctl.base %{_libdir}/opensips/opensipsctl/opensipsdbctl.dbtext %{_libdir}/opensips/opensipsctl/dbtextdb/dbtextdb.py* %dir %{_datadir}/opensips %dir %{_datadir}/opensips/dbtext %dir %{_datadir}/opensips/dbtext/opensips %{_datadir}/opensips/dbtext/opensips/* %{_mandir}/man5/opensips.cfg.5* %{_mandir}/man8/opensips.8* %{_mandir}/man8/opensipsctl.8* %{_mandir}/man8/opensipsunix.8* %doc docdir/AUTHORS %doc docdir/NEWS %doc docdir/README %doc docdir/README-MODULES %doc docdir/README.tls %doc COPYING %{_libdir}/opensips/modules/acc.so %{_libdir}/opensips/modules/alias_db.so %{_libdir}/opensips/modules/auth.so %{_libdir}/opensips/modules/auth_db.so %{_libdir}/opensips/modules/avpops.so %{_libdir}/opensips/modules/benchmark.so %{_libdir}/opensips/modules/call_control.so %{_libdir}/opensips/modules/closeddial.so %{_libdir}/opensips/modules/cfgutils.so %{_libdir}/opensips/modules/db_flatstore.so %{_libdir}/opensips/modules/db_virtual.so %{_libdir}/opensips/modules/db_text.so %{_libdir}/opensips/modules/dialog.so %{_libdir}/opensips/modules/dialplan.so %{_libdir}/opensips/modules/dispatcher.so %{_libdir}/opensips/modules/diversion.so %{_libdir}/opensips/modules/domain.so %{_libdir}/opensips/modules/domainpolicy.so %{_libdir}/opensips/modules/drouting.so %{_libdir}/opensips/modules/enum.so %{_libdir}/opensips/modules/exec.so %{_libdir}/opensips/modules/gflags.so %{_libdir}/opensips/modules/group.so %{_libdir}/opensips/modules/identity.so %{_libdir}/opensips/modules/imc.so %{_libdir}/opensips/modules/lcr.so %{_libdir}/opensips/modules/load_balancer.so %{_libdir}/opensips/modules/localcache.so %{_libdir}/opensips/modules/mangler.so %{_libdir}/opensips/modules/maxfwd.so %{_libdir}/opensips/modules/mediaproxy.so %{_libdir}/opensips/modules/mi_fifo.so %{_libdir}/opensips/modules/mi_datagram.so %{_libdir}/opensips/modules/msilo.so %{_libdir}/opensips/modules/nathelper.so %{_libdir}/opensips/modules/nat_traversal.so %{_libdir}/opensips/modules/options.so %{_libdir}/opensips/modules/path.so %{_libdir}/opensips/modules/pdt.so %{_libdir}/opensips/modules/permissions.so %{_libdir}/opensips/modules/pike.so %{_libdir}/opensips/modules/qos.so %{_libdir}/opensips/modules/ratelimit.so %{_libdir}/opensips/modules/registrar.so %{_libdir}/opensips/modules/rr.so %{_libdir}/opensips/modules/signaling.so %{_libdir}/opensips/modules/siptrace.so %{_libdir}/opensips/modules/sl.so %{_libdir}/opensips/modules/speeddial.so %{_libdir}/opensips/modules/sst.so %{_libdir}/opensips/modules/statistics.so %{_libdir}/opensips/modules/stun.so %{_libdir}/opensips/modules/textops.so %{_libdir}/opensips/modules/tm.so %{_libdir}/opensips/modules/uac.so %{_libdir}/opensips/modules/uac_redirect.so %{_libdir}/opensips/modules/userblacklist.so %{_libdir}/opensips/modules/uri.so %{_libdir}/opensips/modules/usrloc.so %{_libdir}/opensips/modules/xlog.so %doc docdir/README.acc %doc docdir/README.alias_db %doc docdir/README.auth %doc docdir/README.auth_db %doc docdir/README.avpops %doc docdir/README.benchmark %doc docdir/README.cfgutils %doc docdir/README.db_text %doc docdir/README.dialog %doc docdir/README.dialplan %doc docdir/README.dispatcher %doc docdir/README.diversion %doc docdir/README.domain %doc docdir/README.domainpolicy %doc docdir/README.drouting %doc docdir/README.enum %doc docdir/README.exec #%doc docdir/README.flatstore %doc docdir/README.gflags %doc docdir/README.group %doc docdir/README.imc %doc docdir/README.lcr %doc docdir/README.mangler %doc docdir/README.maxfwd %doc docdir/README.mediaproxy %doc docdir/README.mi_fifo %doc docdir/README.mi_datagram %doc docdir/README.msilo %doc docdir/README.nathelper %doc docdir/README.options %doc docdir/README.path %doc docdir/README.pdt %doc docdir/README.permissions %doc docdir/README.pike %doc docdir/README.registrar %doc docdir/README.rr %doc docdir/README.siptrace %doc docdir/README.sl %doc docdir/README.speeddial %doc docdir/README.sst %doc docdir/README.statistics #%doc docdir/README.textops %doc docdir/README.tm %doc docdir/README.uac %doc docdir/README.uac_redirect %doc docdir/README.uri %doc docdir/README.usrloc %doc docdir/README.xlog %files aaa_radius %defattr(-,root,root,-) %{_libdir}/opensips/modules/aaa_radius.so %doc docdir/README.aaa_radius %files acc %defattr(-,root,root,-) %{_libdir}/opensips/modules/acc.so %doc docdir/README.acc %files auth_aaa %defattr(-,root,root,-) %{_libdir}/opensips/modules/auth_aaa.so %doc docdir/README.auth_aaa %files auth_diameter %defattr(-,root,root,-) %{_libdir}/opensips/modules/auth_diameter.so %doc docdir/README.auth_diameter %files b2bua %defattr(-,root,root,-) %{_libdir}/opensips/modules/b2b_entities.so %{_libdir}/opensips/modules/b2b_logic.so %doc docdir/README.b2b_entities %doc docdir/README.b2b_logic %files carrierroute %defattr(-,root,root,-) %{_libdir}/opensips/modules/carrierroute.so %doc docdir/README.carrierroute %files cpl-c %defattr(-,root,root,-) %{_libdir}/opensips/modules/cpl-c.so %doc docdir/README.cpl-c %files db_berkeley %defattr(-,root,root,-) %{_sbindir}/bdb_recover %{_libdir}/opensips/modules/db_berkeley.so %{_libdir}/opensips/opensipsctl/opensipsdbctl.db_berkeley %dir %{_datadir}/opensips/db_berkeley %dir %{_datadir}/opensips/db_berkeley/opensips %{_datadir}/opensips/db_berkeley/opensips/* %doc docdir/README.db_berkeley %files db_http %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_http.so %doc docdir/README.db_http %files h350 %defattr(-,root,root,-) %{_libdir}/opensips/modules/h350.so %doc docdir/README.h350 %files jabber %defattr(-,root,root,-) %{_libdir}/opensips/modules/jabber.so %doc docdir/README.jabber %files ldap %defattr(-,root,root,-) %{_libdir}/opensips/modules/ldap.so %doc docdir/README.ldap %files memcached %defattr(-,root,root,-) %{_libdir}/opensips/modules/memcached.so %doc docdir/README.memcached %files mmgeoip %defattr(-,root,root,-) %{_libdir}/opensips/modules/mmgeoip.so %doc docdir/README.mmgeoip %files mysql %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_mysql.so %{_libdir}/opensips/opensipsctl/opensipsdbctl.mysql %dir %{_datadir}/opensips/mysql %{_datadir}/opensips/mysql/*.sql %doc docdir/README.db_mysql %if %{defined db_oracle} %files oracle %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_oracle.db %{_libdir}/opensips/opensipsctl/opensipsdbctl.oracle %dir %{_datadir}/opensips/oracle %{_datadir}/opensips/oracle/* %doc docdir/README.db_oracle %endif %files perl %defattr(-,root,root,-) %dir %{perl_vendorlib}/OpenSIPS %dir %{perl_vendorlib}/OpenSIPS/LDAPUtils %dir %{perl_vendorlib}/OpenSIPS/Utils %{_libdir}/opensips/modules/perl.so %{perl_vendorlib}/OpenSIPS.pm %{perl_vendorlib}/OpenSIPS/Constants.pm %{perl_vendorlib}/OpenSIPS/LDAPUtils/LDAPConf.pm %{perl_vendorlib}/OpenSIPS/LDAPUtils/LDAPConnection.pm %{perl_vendorlib}/OpenSIPS/Message.pm %{perl_vendorlib}/OpenSIPS/Utils/PhoneNumbers.pm %{perl_vendorlib}/OpenSIPS/Utils/Debug.pm %doc docdir/README.perl %files perlvdb %defattr(-,root,root,-) %dir %{perl_vendorlib}/OpenSIPS/VDB %dir %{perl_vendorlib}/OpenSIPS/VDB/Adapter %{_libdir}/opensips/modules/perlvdb.so %{perl_vendorlib}/OpenSIPS/VDB.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/AccountingSIPtrace.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Alias.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Auth.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Describe.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Speeddial.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/TableVersions.pm %{perl_vendorlib}/OpenSIPS/VDB/Column.pm %{perl_vendorlib}/OpenSIPS/VDB/Pair.pm %{perl_vendorlib}/OpenSIPS/VDB/ReqCond.pm %{perl_vendorlib}/OpenSIPS/VDB/Result.pm %{perl_vendorlib}/OpenSIPS/VDB/VTab.pm %{perl_vendorlib}/OpenSIPS/VDB/Value.pm %doc docdir/README.perlvdb %files peering %defattr(-,root,root,-) %{_libdir}/opensips/modules/peering.so %doc docdir/README.peering %files postgresql %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_postgres.so %{_libdir}/opensips/opensipsctl/opensipsdbctl.pgsql %dir %{_datadir}/opensips/postgres %{_datadir}/opensips/postgres/*.sql %doc docdir/README.db_postgres %files presence %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence.so %doc docdir/README.presence %files presence_dialoginfo %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_dialoginfo.so %doc docdir/README.presence_dialoginfo %files presence_mwi %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_mwi.so %doc docdir/README.presence_mwi %files presence_xcapdiff %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_xcapdiff.so %files presence_xml %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_xml.so %doc docdir/README.presence_xml %files pua %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua.so %doc docdir/README.pua %files pua_dialoginfo %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_dialoginfo.so %doc docdir/README.pua_dialoginfo %files pua_bla %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_bla.so %doc docdir/README.pua_bla %files pua_mi %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_mi.so %doc docdir/README.pua_mi %files pua_usrloc %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_usrloc.so %doc docdir/README.pua_usrloc %files pua_xmpp %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_xmpp.so %doc docdir/README.pua_xmpp %files regex %defattr(-,root,root,-) %{_libdir}/opensips/modules/regex.so %doc docdir/README.regex %files rls %defattr(-,root,root,-) %{_libdir}/opensips/modules/rls.so %doc docdir/README.rls %files seas %defattr(-,root,root,-) %{_libdir}/opensips/modules/seas.so %doc docdir/README.seas %files sms %defattr(-,root,root,-) %{_libdir}/opensips/modules/sms.so %doc docdir/README.sms %if %{undefined disable_snmpstats} %files snmpstats %defattr(-,root,root,-) %{_libdir}/opensips/modules/snmpstats.so %doc docdir/README.snmpstats %dir %{_datadir}/snmp %dir %{_datadir}/snmp/mibs %{_datadir}/snmp/mibs/OPENSER-MIB %{_datadir}/snmp/mibs/OPENSER-REG-MIB %{_datadir}/snmp/mibs/OPENSER-SIP-COMMON-MIB %{_datadir}/snmp/mibs/OPENSER-SIP-SERVER-MIB %{_datadir}/snmp/mibs/OPENSER-TC %endif %files tlsops %defattr(-,root,root,-) %{_libdir}/opensips/modules/tlsops.so %doc docdir/README.tlsops %files unixodbc %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_unixodbc.so %doc docdir/README.db_unixodbc %files xcap_client %defattr(-,root,root,-) %{_libdir}/opensips/modules/xcap_client.so %doc docdir/README.xcap_client %files xmpp %defattr(-,root,root,-) %{_libdir}/opensips/modules/xmpp.so %doc docdir/README.xmpp %changelog * Thu Oct 29 2009 John Khvatov - 1.6.0-2 - Added patch for init script to fix malformed comment block - Added COPYING file - Fixed not-capitalized summory of memcached subpackage * Mon Oct 19 2009 John Khvatov - 1.6.0-1 - Created new package from openser package - Upgrade to OpenSIPS 1.6 - New modules - Added osipconsole tool * Tue Aug 25 2009 Tomas Mraz - 1.3.4-8 - rebuilt with new openssl * Sat Jul 25 2009 Fedora Release Engineering - 1.3.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Mar 02 2009 Jan ONDREJ (SAL) - 1.3.4-6 - allow build of this package on fedora<=10 * Sat Feb 28 2009 Jan ONDREJ (SAL) - 1.3.4-5 - fix module path * Sat Feb 28 2009 Jan ONDREJ (SAL) - 1.3.4-3 - addedd subversion build dependency to avoid svnversion error messages - fixed installation of perl modules in rawhide * Fri Jan 23 2009 Jan ONDREJ (SAL) 1.3.4-2 - Rebuild for new mysql. * Mon Dec 8 2008 Peter Lemenkov 1.3.4-1 - Ver. 1.3.4 - Added sysconfig-file * Thu Aug 28 2008 Michael Schwendt - 1.3.3-3 - Include lots of unowned directories. * Thu Aug 28 2008 Peter Lemenkov 1.3.3-2 - Removed dialplan and drouting modules from upstream * Thu Aug 28 2008 Peter Lemenkov 1.3.3-1 - Ver. 1.3.3 - Dropped upstreamed patch * Mon Aug 11 2008 Peter Lemenkov 1.3.2-5 - Typo fix * Mon Aug 11 2008 Peter Lemenkov 1.3.2-4 - Fix build with --fuzz=0 * Mon Aug 11 2008 Peter Lemenkov 1.3.2-3 - Fixed urls - Restricted access to openser.cfg and openserctl.cfg - Service won't start by default (BZ# 441297) * Fri May 16 2008 Peter Lemenkov 1.3.2-2 - New modules - dialplan and drouting (this one still has no README) * Thu May 15 2008 Peter Lemenkov 1.3.2-1 - Ver. 1.3.2 * Tue Mar 18 2008 Tom "spot" Callaway - 1.3.1-3 - add Requires for versioned perl (libperl.so) - drop silly file Requires * Fri Mar 14 2008 Jan ONDREJ (SAL) - 1.3.1-2 - removed perl patch, which is not necessary * Thu Mar 13 2008 Jan ONDREJ (SAL) - 1.3.1-1 - update to upstream - removed obsolete patches * Fri Mar 7 2008 Tom "spot" Callaway - 1.3.0-12 - patch perl code to use PERL_SYS_INIT3_BODY * Fri Mar 7 2008 Tom "spot" Callaway - 1.3.0-11 - fix perl build requires * Thu Mar 06 2008 Tom "spot" Callaway - 1.3.0-10 - Rebuild for new perl * Sat Feb 23 2008 Jan ONDREJ (SAL) 1.3.0-9 - ia64 build fix * Sat Feb 9 2008 Peter Lemenkov 1.3.0-8.1 - typo fix * Sat Feb 9 2008 Peter Lemenkov 1.3.0-8 - Rebuild for GCC 4.3 * Sat Jan 26 2008 Jan ONDREJ (SAL) 1.3.0-7 - Updated syntax error in default config * Sat Jan 26 2008 Peter Lemenkov 1.3.0-5 - Merge of acc module into main package * Fri Jan 25 2008 Jan ONDREJ (SAL) 1.3.0-4 - modify and apply forgotten patch4 * Thu Jan 17 2008 Jan ONDREJ (SAL) 1.3.0-2 - removed openser.init and replaced by upstream version - fixed configuration path for openserdbctl (#428799) * Sun Jan 13 2008 Peter Lemenkov 1.3.0-1.4 - 4th try to remove lm_sensors-devel from EL-[45] at ppc{64} * Thu Dec 13 2007 Peter Lemenkov 1.3.0-1 - Final ver. 1.3.0 - Removed some leftovers from spec-file * Wed Dec 12 2007 Peter Lemenkov 1.3.0-0.1.pre1 - Latest snapshot - 1.3.0pre1 * Mon Dec 10 2007 Jan ONDREJ (SAL) 1.2.2-11 - added ETCDIR into openserctlrc (need openser-1.3 to work) * Mon Sep 24 2007 Jan ONDREJ (SAL) 1.2.2-10 - perl scripts moved to perl_vendorlib directory - added LDAPUtils and Utils subdirectories - changed perl module BuildRequires * Mon Sep 24 2007 Jan ONDREJ (SAL) 1.2.2-9 - added reload section to init script - init script specified with initrddir macro - documentation converted to UTF-8 - added doc macro for documentation - documentation moved do proper place (/usr/share/doc/NAME-VERSION/) - which removed from BuildRequires, it's in guidelines exceptions - unixodbc subpackage summary update * Thu Sep 6 2007 Peter Lemenkov 1.2.2-8 - Added another one missing BR - which (needs by snmpstats module) - Cosmetic: dropped commented out 'Requires' * Thu Sep 06 2007 Jan ONDREJ (SAL) 1.2.2-7 - added attr macro for init script - added -p to install arguments to preserve timestamp - parallel make used * Sun Aug 26 2007 Jan ONDREJ (SAL) 1.2.2-6 - Fedora Core 6 build updates - changed attributes for openser.init to be rpmlint more silent * Sun Aug 26 2007 Peter Lemenkov 1.2.2-5 - fixed paths for openssl libs and includes * Sun Aug 26 2007 Peter Lemenkov 1.2.2-4 - Introduced acc and acc_radius modules (Jan Ondrej) - Dropped radius_accounting condition * Sat Aug 25 2007 Peter Lemenkov 1.2.2-3 - Changed license according to Fedora's policy - Make rpmlint more silent * Fri Aug 24 2007 Jan ONDREJ (SAL) 1.2.2-2 - added openser.init script - removed Patch0: openser--Makefile.diff and updated build section - spec file is 80 characters wide - added radius_accounting condition * Wed Aug 22 2007 Peter Lemenkov 1.2.2-1 - Ver. 1.2.2 * Tue Jul 24 2007 Peter Lemenkov 1.2.1-1 - Initial spec. --- NEW FILE opensips.sysconfig --- # Add extra options here OPTIONS="" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/opensips/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:34:15 -0000 1.1 +++ .cvsignore 3 Nov 2009 10:42:45 -0000 1.2 @@ -0,0 +1 @@ +opensips-1.6.0-tls_src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/opensips/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:34:16 -0000 1.1 +++ sources 3 Nov 2009 10:42:45 -0000 1.2 @@ -0,0 +1 @@ +c9dbca1dc74e0a3a383f61e3dc4844df opensips-1.6.0-tls_src.tar.gz From ivaxer at fedoraproject.org Tue Nov 3 10:44:19 2009 From: ivaxer at fedoraproject.org (John A. Khvatov) Date: Tue, 3 Nov 2009 10:44:19 +0000 (UTC) Subject: rpms/opensips/F-11 import.log, NONE, 1.1 opensips--init.patch, NONE, 1.1 opensips.spec, NONE, 1.1 opensips.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <20091103104419.D464F11C00E8@cvs1.fedora.phx.redhat.com> Author: ivaxer Update of /cvs/pkgs/rpms/opensips/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30804/F-11 Modified Files: .cvsignore sources Added Files: import.log opensips--init.patch opensips.spec opensips.sysconfig Log Message: Initial import (#529831) --- NEW FILE import.log --- opensips-1_6_0-2_fc11:F-11:opensips-1.6.0-2.fc11.src.rpm:1257244801 opensips--init.patch: opensips.init | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE opensips--init.patch --- diff -Nur opensips-1.6.0-tls/packaging/fedora/opensips.init opensips-1.6.0-tls_patched/packaging/fedora/opensips.init --- opensips-1.6.0-tls/packaging/fedora/opensips.init 2009-10-16 04:37:55.000000000 +0400 +++ opensips-1.6.0-tls_patched/packaging/fedora/opensips.init 2009-10-29 14:05:56.211918358 +0300 @@ -14,8 +14,7 @@ # Required-Start: $local_fs $network $named # Should-Start: mysqld postgresql # Short-Description: start, stop OpenSIPS -# Description: OpenSIPS or OpenSIPS is a very fast and flexible -# SIP (RFC3261) server. +# Description: OpenSIPS is a very fast and flexible SIP (RFC3261) server. ### END INIT INFO # Source function library. --- NEW FILE opensips.spec --- %if 0%{?rhel} # copied from lm_sensors exclusive arch %ifnarch alpha i386 i486 i586 i686 pentium3 pentium4 athlon x86_64 %define disable_snmpstats snmpstats %endif %endif %define EXCLUDE_MODULES mi_xmlrpc osp json %{?disable_snmpstats} %{!?_with_oracle:db_oracle} Summary: Open Source SIP Server Name: opensips Version: 1.6.0 Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz Source1: %{name}.sysconfig Patch1: opensips--init.patch URL: http://opensips.org BuildRequires: expat-devel BuildRequires: libxml2-devel BuildRequires: bison BuildRequires: flex #BuildRequires: subversion # needed by snmpstats BuildRequires: radiusclient-ng-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel # required by snmpstats module %if %{undefined disable_snmpstats} BuildRequires: lm_sensors-devel %endif BuildRequires: net-snmp-devel BuildRequires: unixODBC-devel BuildRequires: openssl-devel BuildRequires: expat-devel #BuildRequires: xmlrpc-c-devel BuildRequires: libconfuse-devel BuildRequires: db4-devel BuildRequires: openldap-devel BuildRequires: curl-devel BuildRequires: libmemcached-devel BuildRequires: GeoIP-devel BuildRequires: pcre-devel Requires(post): chkconfig Requires(preun):chkconfig # for /sbin/service Requires(preun):initscripts BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description OpenSIPS or Open SIP Server is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, opensips can handle thousands calls per second even on low-budget hardware. A C Shell like scripting language provides full control over the server's behaviour. It's modular architecture allows only required functionality to be loaded. Currently the following modules are available: digest authentication, CPL scripts, instant messaging, MySQL and UNIXODBC support, a presence agent, radius authentication, record routing, an SMS gateway, a jabber gateway, a transaction and dialog module, OSP module, statistics support, registrar and user location. %package aaa_radius Summary: RADIUS backend for AAA api Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description aaa_radius This module provides the RADIUS backend for the AAA API - group, auth, uri module use the AAA API for performing RADIUS ops. %package acc Summary: Accounts transactions information to different backends Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description acc ACC module is used to account transactions information to different backends like syslog, SQL, AAA. %package auth_aaa Summary: Performs authentication using an AAA server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description auth_aaa This module contains functions that are used to perform authentication using an AAA server. Basically the proxy will pass along the credentials to the AAA server which will in turn send a reply containing result of the authentication. So basically the whole authentication is done in the AAA server. %package auth_diameter Summary: Performs authentication using a Diameter server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description auth_diameter This module implements SIP authentication and authorization with DIAMETER server, namely DIameter Server Client (DISC). %package b2bua Summary: Back-2-Back User Agent Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description b2bua B2BUA is an implementation of the behavior of a B2BUA as defined in RFC 3261 that offers the possibility to build certain services on top of it. %package carrierroute Summary: Routing extension suitable for carriers Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description carrierroute A module which provides routing, balancing and blacklisting capabilities. %package cpl-c Summary: Call Processing Language interpreter Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description cpl-c This module implements a CPL (Call Processing Language) interpreter. Support for uploading/downloading/removing scripts via SIP REGISTER method is present. %package db_berkeley Summary: Berkley DB backend support Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description db_berkeley This is a module which integrates the Berkeley DB into OpenSIPS. It implements the DB API defined in OpenSIPS. %package db_http Summary: HTTP DB backend support Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description db_http This module provides access to a database that is implemented as a HTTP server. %package h350 Summary: H350 implementation Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description h350 The OpenSIPS H350 module enables an OpenSIPS SIP proxy server to access SIP account data stored in an LDAP [RFC4510] directory containing H.350 [H.350] commObjects. %package jabber Summary: Gateway between OpenSIPS and a jabber server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description jabber Jabber module that integrates XODE XML parser for parsing Jabber messages. %package ldap Summary: LDAP connector Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description ldap The LDAP module implements an LDAP search interface for OpenSIPS. %package memcached Summary: Memcached connector Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description memcached Memcached module is an implementation of a cache system designed to work with a memcached server. %package mmgeoip Summary: Wrapper for the MaxMind GeoIP API Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description mmgeoip Mmgeoip is a lightweight wrapper for the MaxMind GeoIP API. It adds IP address-to-location lookup capability to OpenSIPS scripts. %if %{defined db_oracle} %package oracle Summary: Oracle Storage Support for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description oracle The %{name}-oracle package contains the Oracle plugin for %{name}, which allows a Oracle-Database to be used for persistent storage. %endif %package mysql Summary: MySQL Storage Support for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description mysql The %{name}-mysql package contains the MySQL plugin for %{name}, which allows a MySQL-Database to be used for persistent storage. %package perl Summary: Helps implement your own OpenSIPS extensions in Perl Group: System Environment/Daemons # require perl-devel for >F7 and perl for <=F6 BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?rhel} BuildRequires: perl(ExtUtils::Embed) %else BuildRequires: perl(ExtUtils::Embed), perl-devel %endif Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl The time needed when writing a new OpenSIPS module unfortunately is quite high, while the options provided by the configuration file are limited to the features implemented in the modules. With this Perl module, you can easily implement your own OpenSIPS extensions in Perl. This allows for simple access to the full world of CPAN modules. SIP URI rewriting could be implemented based on regular expressions; accessing arbitrary data backends, e.g. LDAP or Berkeley DB files, is now extremely simple. %package perlvdb Summary: Perl virtual database engine Group: System Environment/Daemons # require perl-devel for >F7 and perl for <=F6 BuildRequires: perl(ExtUtils::MakeMaker) Requires: %{name} = %{version}-%{release} Requires: %{name}-perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perlvdb The Perl Virtual Database (VDB) provides a virtualization framework for OpenSIPS's database access. It does not handle a particular database engine itself but lets the user relay database requests to arbitrary Perl functions. %package peering Summary: Radius peering Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description peering Peering module allows SIP providers (operators or organizations) to verify from a broker if source or destination of a SIP request is a trusted peer. %package postgresql Summary: PostgreSQL Storage Support for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description postgresql The %{name}-postgresql package contains the PostgreSQL plugin for %{name}, which allows a PostgreSQL-Database to be used for persistent storage. %package presence Summary: Presence server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description presence This module implements a presence server. It handles PUBLISH and SUBSCRIBE messages and generates NOTIFY messages. It offers support for aggregation of published presence information for the same presentity using more devices. It can also filter the information provided to watchers according to privacy rules. %package presence_dialoginfo Summary: Extension to Presence server for Dialog-Info Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence %description presence_dialoginfo The module enables the handling of "Event: dialog" (as defined in RFC 4235) inside of the presence module. This can be used distribute the dialog-info status to the subscribed watchers. %package presence_mwi Summary: Extension to Presence server for Message Waiting Indication Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence %description presence_mwi The module does specific handling for notify-subscribe message-summary (message waiting indication) events as specified in RFC 3842. It is used with the general event handling module, presence. It constructs and adds message-summary event to it. %package presence_xcapdiff Summary: Extension to Presence server for XCAP-DIFF event Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence Requires: %{name}-pia_mi %description presence_xcapdiff The presence_xcapdiff is an OpenSIPS module that adds support for the "xcap-diff" event to presence and pua. %package presence_xml Summary: SIMPLE Presence extension Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-presence Requires: %{name}-xcap_client %description presence_xml The module does specific handling for notify-subscribe events using xml bodies. It is used with the general event handling module, presence. %package pua Summary: Offer the functionality of a presence user agent client Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description pua This module offer the functionality of a presence user agent client, sending Subscribe and Publish messages. %package pua_dialoginfo Summary: Dialog-Info extension for PUA Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua %description pua_dialoginfo The pua_dialoginfo retrieves dialog state information from the dialog module and PUBLISHes the dialog-information using the pua module. Thus, in combination with the presence_xml module this can be used to derive dialog-info from the dialog module and NOTIFY the subscribed watchers about dialog-info changes. %package pua_bla Summary: BLA extension for PUA Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua Requires: %{name}-presence %description pua_bla The pua_bla module enables Bridged Line Appearances support according to the specifications in draft-anil-sipping-bla-03.txt. %package pua_mi Summary: Connector between usrloc and MI interface Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua %description pua_mi The pua_mi sends offer the possibility to publish presence information via MI transports. Using this module you can create independent applications/scripts to publish not sip-related information (e.g., system resources like CPU-usage, memory, number of active subscribers ...) %package pua_usrloc Summary: Connector between usrloc and pua modules Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua %description pua_usrloc This module is the connector between usrloc and pua modules. It creates the environment to send PUBLISH requests for user location records, on specific events (e.g., when new record is added in usrloc, a PUBLISH with status open (online) is issued; when expires, it sends closed (offline)). Using this module, phones which have no support for presence can be seen as online/offline. %package pua_xmpp Summary: SIMPLE-XMPP Presence gateway Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua Requires: %{name}-presence Requires: %{name}-xmpp %description pua_xmpp This module is a gateway for presence between SIP and XMPP. It translates one format into another and uses xmpp, pua and presence modules to manage the transmition of presence state information. %package regex Summary: RegExp via PCRE library Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description regex This module offers matching operations against regular expressions using the powerful PCRE library. %package rls Summary: Resource List Server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-pua Requires: %{name}-presence %description rls The modules is a Resource List Server implementation following the specification in RFC 4662 and RFC 4826. %package seas Summary: Transfers the execution logic control to a given external entity Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description seas SEAS module enables OpenSIPS to transfer the execution logic control of a sip message to a given external entity, called the Application Server. When the OpenSIPS script is being executed on an incoming SIP message, invocation of the as_relay_t() function makes this module send the message along with some transaction information to the specified Application Server. The Application Server then executes some call-control logic code, and tells OpenSIPS to take some actions, ie. forward the message downstream, or respond to the message with a SIP repy, etc %package sms Summary: Gateway between SIP and GSM networks via sms Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description sms This module provides a way of communication between SIP network (via SIP MESSAGE) and GSM networks (via ShortMessageService). Communication is possible from SIP to SMS and vice versa. The module provides facilities like SMS confirmation--the gateway can confirm to the SIP user if his message really reached its destination as a SMS--or multi-part messages--if a SIP messages is too long it will be split and sent as multiple SMS. %if %{undefined disable_snmpstats} %package snmpstats Summary: SNMP management interface for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description snmpstats The %{name}-snmpstats package provides an SNMP management interface to OpenSIPS. Specifically, it provides general SNMP queryable scalar statistics, table representations of more complicated data such as user and contact information, and alarm monitoring capabilities. %endif %package tlsops Summary: TLS-relating functions for the OpenSIPS Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description tlsops The %{name}-tlsops package implements TLS related functions to use in the routing script, and exports pseudo variables with certificate and TLS parameters. %package unixodbc Summary: OpenSIPS unixODBC Storage support Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description unixodbc The %{name}-unixodbc package contains the unixODBC plugin for %{name}, which allows a unixODBC to be used for persistent storage %package xcap_client Summary: XCAP client Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description xcap_client The modules is an XCAP client for OpenSIPS that can be used by other modules. It fetches XCAP elements, either documents or part of them, by sending HTTP GET requests. It also offers support for conditional queries. It uses libcurl library as a client-side HTTP transfer library. %package xmpp Summary: Gateway between OpenSIPS and a jabber server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} %description xmpp This modules is a gateway between Openser and a jabber server. It enables the exchange of instant messages between SIP clients and XMPP(jabber) clients. %prep %setup -q -n %{name}-%{version}-tls %patch1 -p1 %build LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \ exclude_modules="%EXCLUDE_MODULES" \ cfg-target=%{_sysconfdir}/opensips/ \ modules-prefix=%{buildroot}/%{_prefix} \ modules-dir=%{_lib}/%{name}/modules %install rm -rf $RPM_BUILD_ROOT %{__make} install TLS=1 LIBDIR=%{_lib} \ exclude_modules="%EXCLUDE_MODULES" \ basedir=%{buildroot} prefix=%{_prefix} \ cfg-prefix=%{buildroot} \ modules-prefix=%{buildroot}/%{_prefix} \ modules-dir=%{_lib}/%{name}/modules \ DBTEXTON=yes # fixed dbtext documentation installation # clean some things mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib} if [ -d "$RPM_BUILD_ROOT/%{_prefix}/perl" ]; then # for fedora>=11 mv $RPM_BUILD_ROOT/%{_prefix}/perl/* \ $RPM_BUILD_ROOT/%{perl_vendorlib}/ else # for fedora<=10 mv $RPM_BUILD_ROOT/%{_libdir}/opensips/perl/* \ $RPM_BUILD_ROOT/%{perl_vendorlib}/ fi mv $RPM_BUILD_ROOT/%{_sysconfdir}/opensips/tls/README \ $RPM_BUILD_ROOT/%{_docdir}/opensips/README.tls rm -f $RPM_BUILD_ROOT%{_docdir}/opensips/INSTALL mv $RPM_BUILD_ROOT/%{_docdir}/opensips docdir # recode documentation for i in docdir/*; do mv -f $i $i.old iconv -f iso8859-1 -t UTF-8 $i.old > $i rm -f $i.old done mkdir -p $RPM_BUILD_ROOT%{_initrddir} %{__install} -p -D -m 755 packaging/fedora/opensips.init \ $RPM_BUILD_ROOT%{_initrddir}/opensips echo -e "\nETCDIR=\"%{_sysconfdir}/opensips\"\n" \ >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/opensipsctlrc #install sysconfig file install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add opensips %preun if [ $1 = 0 ]; then /sbin/service opensips stop > /dev/null 2>&1 /sbin/chkconfig --del opensips fi %files %defattr(-,root,root,-) %{_sbindir}/opensips %{_sbindir}/opensipsctl %{_sbindir}/opensipsdbctl %{_sbindir}/opensipsunix %{_sbindir}/osipsconsole %attr(750,root,root) %dir %{_sysconfdir}/opensips %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/rootCA %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/rootCA/certs %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/rootCA/private %attr(750,root,root) %dir %{_sysconfdir}/opensips/tls/user %dir %{_libdir}/opensips/ %dir %{_libdir}/opensips/modules/ %dir %{_libdir}/opensips/opensipsctl/ %dir %{_libdir}/opensips/opensipsctl/dbtextdb %attr(755,root,root) %{_initrddir}/opensips %config(noreplace) %{_sysconfdir}/opensips/dictionary.opensips %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %attr(640,root,root) %config(noreplace) %{_sysconfdir}/opensips/opensips.cfg %attr(640,root,root) %config(noreplace) %{_sysconfdir}/opensips/opensipsctlrc %attr(640,root,root) %config(noreplace) %{_sysconfdir}/opensips/osipsconsolerc # these files are just an example so no need to restrict access to them %config(noreplace) %{_sysconfdir}/opensips/tls/ca.conf %config(noreplace) %{_sysconfdir}/opensips/tls/request.conf %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/cacert.pem %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/certs/01.pem %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/index.txt %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/private/cakey.pem %config(noreplace) %{_sysconfdir}/opensips/tls/rootCA/serial %config(noreplace) %{_sysconfdir}/opensips/tls/user.conf %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-calist.pem %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-cert.pem %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-cert_req.pem %config(noreplace) %{_sysconfdir}/opensips/tls/user/user-privkey.pem %{_libdir}/opensips/opensipsctl/opensipsctl.* %{_libdir}/opensips/opensipsctl/opensipsdbctl.base %{_libdir}/opensips/opensipsctl/opensipsdbctl.dbtext %{_libdir}/opensips/opensipsctl/dbtextdb/dbtextdb.py* %dir %{_datadir}/opensips %dir %{_datadir}/opensips/dbtext %dir %{_datadir}/opensips/dbtext/opensips %{_datadir}/opensips/dbtext/opensips/* %{_mandir}/man5/opensips.cfg.5* %{_mandir}/man8/opensips.8* %{_mandir}/man8/opensipsctl.8* %{_mandir}/man8/opensipsunix.8* %doc docdir/AUTHORS %doc docdir/NEWS %doc docdir/README %doc docdir/README-MODULES %doc docdir/README.tls %doc COPYING %{_libdir}/opensips/modules/acc.so %{_libdir}/opensips/modules/alias_db.so %{_libdir}/opensips/modules/auth.so %{_libdir}/opensips/modules/auth_db.so %{_libdir}/opensips/modules/avpops.so %{_libdir}/opensips/modules/benchmark.so %{_libdir}/opensips/modules/call_control.so %{_libdir}/opensips/modules/closeddial.so %{_libdir}/opensips/modules/cfgutils.so %{_libdir}/opensips/modules/db_flatstore.so %{_libdir}/opensips/modules/db_virtual.so %{_libdir}/opensips/modules/db_text.so %{_libdir}/opensips/modules/dialog.so %{_libdir}/opensips/modules/dialplan.so %{_libdir}/opensips/modules/dispatcher.so %{_libdir}/opensips/modules/diversion.so %{_libdir}/opensips/modules/domain.so %{_libdir}/opensips/modules/domainpolicy.so %{_libdir}/opensips/modules/drouting.so %{_libdir}/opensips/modules/enum.so %{_libdir}/opensips/modules/exec.so %{_libdir}/opensips/modules/gflags.so %{_libdir}/opensips/modules/group.so %{_libdir}/opensips/modules/identity.so %{_libdir}/opensips/modules/imc.so %{_libdir}/opensips/modules/lcr.so %{_libdir}/opensips/modules/load_balancer.so %{_libdir}/opensips/modules/localcache.so %{_libdir}/opensips/modules/mangler.so %{_libdir}/opensips/modules/maxfwd.so %{_libdir}/opensips/modules/mediaproxy.so %{_libdir}/opensips/modules/mi_fifo.so %{_libdir}/opensips/modules/mi_datagram.so %{_libdir}/opensips/modules/msilo.so %{_libdir}/opensips/modules/nathelper.so %{_libdir}/opensips/modules/nat_traversal.so %{_libdir}/opensips/modules/options.so %{_libdir}/opensips/modules/path.so %{_libdir}/opensips/modules/pdt.so %{_libdir}/opensips/modules/permissions.so %{_libdir}/opensips/modules/pike.so %{_libdir}/opensips/modules/qos.so %{_libdir}/opensips/modules/ratelimit.so %{_libdir}/opensips/modules/registrar.so %{_libdir}/opensips/modules/rr.so %{_libdir}/opensips/modules/signaling.so %{_libdir}/opensips/modules/siptrace.so %{_libdir}/opensips/modules/sl.so %{_libdir}/opensips/modules/speeddial.so %{_libdir}/opensips/modules/sst.so %{_libdir}/opensips/modules/statistics.so %{_libdir}/opensips/modules/stun.so %{_libdir}/opensips/modules/textops.so %{_libdir}/opensips/modules/tm.so %{_libdir}/opensips/modules/uac.so %{_libdir}/opensips/modules/uac_redirect.so %{_libdir}/opensips/modules/userblacklist.so %{_libdir}/opensips/modules/uri.so %{_libdir}/opensips/modules/usrloc.so %{_libdir}/opensips/modules/xlog.so %doc docdir/README.acc %doc docdir/README.alias_db %doc docdir/README.auth %doc docdir/README.auth_db %doc docdir/README.avpops %doc docdir/README.benchmark %doc docdir/README.cfgutils %doc docdir/README.db_text %doc docdir/README.dialog %doc docdir/README.dialplan %doc docdir/README.dispatcher %doc docdir/README.diversion %doc docdir/README.domain %doc docdir/README.domainpolicy %doc docdir/README.drouting %doc docdir/README.enum %doc docdir/README.exec #%doc docdir/README.flatstore %doc docdir/README.gflags %doc docdir/README.group %doc docdir/README.imc %doc docdir/README.lcr %doc docdir/README.mangler %doc docdir/README.maxfwd %doc docdir/README.mediaproxy %doc docdir/README.mi_fifo %doc docdir/README.mi_datagram %doc docdir/README.msilo %doc docdir/README.nathelper %doc docdir/README.options %doc docdir/README.path %doc docdir/README.pdt %doc docdir/README.permissions %doc docdir/README.pike %doc docdir/README.registrar %doc docdir/README.rr %doc docdir/README.siptrace %doc docdir/README.sl %doc docdir/README.speeddial %doc docdir/README.sst %doc docdir/README.statistics #%doc docdir/README.textops %doc docdir/README.tm %doc docdir/README.uac %doc docdir/README.uac_redirect %doc docdir/README.uri %doc docdir/README.usrloc %doc docdir/README.xlog %files aaa_radius %defattr(-,root,root,-) %{_libdir}/opensips/modules/aaa_radius.so %doc docdir/README.aaa_radius %files acc %defattr(-,root,root,-) %{_libdir}/opensips/modules/acc.so %doc docdir/README.acc %files auth_aaa %defattr(-,root,root,-) %{_libdir}/opensips/modules/auth_aaa.so %doc docdir/README.auth_aaa %files auth_diameter %defattr(-,root,root,-) %{_libdir}/opensips/modules/auth_diameter.so %doc docdir/README.auth_diameter %files b2bua %defattr(-,root,root,-) %{_libdir}/opensips/modules/b2b_entities.so %{_libdir}/opensips/modules/b2b_logic.so %doc docdir/README.b2b_entities %doc docdir/README.b2b_logic %files carrierroute %defattr(-,root,root,-) %{_libdir}/opensips/modules/carrierroute.so %doc docdir/README.carrierroute %files cpl-c %defattr(-,root,root,-) %{_libdir}/opensips/modules/cpl-c.so %doc docdir/README.cpl-c %files db_berkeley %defattr(-,root,root,-) %{_sbindir}/bdb_recover %{_libdir}/opensips/modules/db_berkeley.so %{_libdir}/opensips/opensipsctl/opensipsdbctl.db_berkeley %dir %{_datadir}/opensips/db_berkeley %dir %{_datadir}/opensips/db_berkeley/opensips %{_datadir}/opensips/db_berkeley/opensips/* %doc docdir/README.db_berkeley %files db_http %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_http.so %doc docdir/README.db_http %files h350 %defattr(-,root,root,-) %{_libdir}/opensips/modules/h350.so %doc docdir/README.h350 %files jabber %defattr(-,root,root,-) %{_libdir}/opensips/modules/jabber.so %doc docdir/README.jabber %files ldap %defattr(-,root,root,-) %{_libdir}/opensips/modules/ldap.so %doc docdir/README.ldap %files memcached %defattr(-,root,root,-) %{_libdir}/opensips/modules/memcached.so %doc docdir/README.memcached %files mmgeoip %defattr(-,root,root,-) %{_libdir}/opensips/modules/mmgeoip.so %doc docdir/README.mmgeoip %files mysql %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_mysql.so %{_libdir}/opensips/opensipsctl/opensipsdbctl.mysql %dir %{_datadir}/opensips/mysql %{_datadir}/opensips/mysql/*.sql %doc docdir/README.db_mysql %if %{defined db_oracle} %files oracle %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_oracle.db %{_libdir}/opensips/opensipsctl/opensipsdbctl.oracle %dir %{_datadir}/opensips/oracle %{_datadir}/opensips/oracle/* %doc docdir/README.db_oracle %endif %files perl %defattr(-,root,root,-) %dir %{perl_vendorlib}/OpenSIPS %dir %{perl_vendorlib}/OpenSIPS/LDAPUtils %dir %{perl_vendorlib}/OpenSIPS/Utils %{_libdir}/opensips/modules/perl.so %{perl_vendorlib}/OpenSIPS.pm %{perl_vendorlib}/OpenSIPS/Constants.pm %{perl_vendorlib}/OpenSIPS/LDAPUtils/LDAPConf.pm %{perl_vendorlib}/OpenSIPS/LDAPUtils/LDAPConnection.pm %{perl_vendorlib}/OpenSIPS/Message.pm %{perl_vendorlib}/OpenSIPS/Utils/PhoneNumbers.pm %{perl_vendorlib}/OpenSIPS/Utils/Debug.pm %doc docdir/README.perl %files perlvdb %defattr(-,root,root,-) %dir %{perl_vendorlib}/OpenSIPS/VDB %dir %{perl_vendorlib}/OpenSIPS/VDB/Adapter %{_libdir}/opensips/modules/perlvdb.so %{perl_vendorlib}/OpenSIPS/VDB.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/AccountingSIPtrace.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Alias.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Auth.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Describe.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/Speeddial.pm %{perl_vendorlib}/OpenSIPS/VDB/Adapter/TableVersions.pm %{perl_vendorlib}/OpenSIPS/VDB/Column.pm %{perl_vendorlib}/OpenSIPS/VDB/Pair.pm %{perl_vendorlib}/OpenSIPS/VDB/ReqCond.pm %{perl_vendorlib}/OpenSIPS/VDB/Result.pm %{perl_vendorlib}/OpenSIPS/VDB/VTab.pm %{perl_vendorlib}/OpenSIPS/VDB/Value.pm %doc docdir/README.perlvdb %files peering %defattr(-,root,root,-) %{_libdir}/opensips/modules/peering.so %doc docdir/README.peering %files postgresql %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_postgres.so %{_libdir}/opensips/opensipsctl/opensipsdbctl.pgsql %dir %{_datadir}/opensips/postgres %{_datadir}/opensips/postgres/*.sql %doc docdir/README.db_postgres %files presence %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence.so %doc docdir/README.presence %files presence_dialoginfo %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_dialoginfo.so %doc docdir/README.presence_dialoginfo %files presence_mwi %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_mwi.so %doc docdir/README.presence_mwi %files presence_xcapdiff %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_xcapdiff.so %files presence_xml %defattr(-,root,root,-) %{_libdir}/opensips/modules/presence_xml.so %doc docdir/README.presence_xml %files pua %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua.so %doc docdir/README.pua %files pua_dialoginfo %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_dialoginfo.so %doc docdir/README.pua_dialoginfo %files pua_bla %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_bla.so %doc docdir/README.pua_bla %files pua_mi %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_mi.so %doc docdir/README.pua_mi %files pua_usrloc %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_usrloc.so %doc docdir/README.pua_usrloc %files pua_xmpp %defattr(-,root,root,-) %{_libdir}/opensips/modules/pua_xmpp.so %doc docdir/README.pua_xmpp %files regex %defattr(-,root,root,-) %{_libdir}/opensips/modules/regex.so %doc docdir/README.regex %files rls %defattr(-,root,root,-) %{_libdir}/opensips/modules/rls.so %doc docdir/README.rls %files seas %defattr(-,root,root,-) %{_libdir}/opensips/modules/seas.so %doc docdir/README.seas %files sms %defattr(-,root,root,-) %{_libdir}/opensips/modules/sms.so %doc docdir/README.sms %if %{undefined disable_snmpstats} %files snmpstats %defattr(-,root,root,-) %{_libdir}/opensips/modules/snmpstats.so %doc docdir/README.snmpstats %dir %{_datadir}/snmp %dir %{_datadir}/snmp/mibs %{_datadir}/snmp/mibs/OPENSER-MIB %{_datadir}/snmp/mibs/OPENSER-REG-MIB %{_datadir}/snmp/mibs/OPENSER-SIP-COMMON-MIB %{_datadir}/snmp/mibs/OPENSER-SIP-SERVER-MIB %{_datadir}/snmp/mibs/OPENSER-TC %endif %files tlsops %defattr(-,root,root,-) %{_libdir}/opensips/modules/tlsops.so %doc docdir/README.tlsops %files unixodbc %defattr(-,root,root,-) %{_libdir}/opensips/modules/db_unixodbc.so %doc docdir/README.db_unixodbc %files xcap_client %defattr(-,root,root,-) %{_libdir}/opensips/modules/xcap_client.so %doc docdir/README.xcap_client %files xmpp %defattr(-,root,root,-) %{_libdir}/opensips/modules/xmpp.so %doc docdir/README.xmpp %changelog * Thu Oct 29 2009 John Khvatov - 1.6.0-2 - Added patch for init script to fix malformed comment block - Added COPYING file - Fixed not-capitalized summory of memcached subpackage * Mon Oct 19 2009 John Khvatov - 1.6.0-1 - Created new package from openser package - Upgrade to OpenSIPS 1.6 - New modules - Added osipconsole tool * Tue Aug 25 2009 Tomas Mraz - 1.3.4-8 - rebuilt with new openssl * Sat Jul 25 2009 Fedora Release Engineering - 1.3.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Mar 02 2009 Jan ONDREJ (SAL) - 1.3.4-6 - allow build of this package on fedora<=10 * Sat Feb 28 2009 Jan ONDREJ (SAL) - 1.3.4-5 - fix module path * Sat Feb 28 2009 Jan ONDREJ (SAL) - 1.3.4-3 - addedd subversion build dependency to avoid svnversion error messages - fixed installation of perl modules in rawhide * Fri Jan 23 2009 Jan ONDREJ (SAL) 1.3.4-2 - Rebuild for new mysql. * Mon Dec 8 2008 Peter Lemenkov 1.3.4-1 - Ver. 1.3.4 - Added sysconfig-file * Thu Aug 28 2008 Michael Schwendt - 1.3.3-3 - Include lots of unowned directories. * Thu Aug 28 2008 Peter Lemenkov 1.3.3-2 - Removed dialplan and drouting modules from upstream * Thu Aug 28 2008 Peter Lemenkov 1.3.3-1 - Ver. 1.3.3 - Dropped upstreamed patch * Mon Aug 11 2008 Peter Lemenkov 1.3.2-5 - Typo fix * Mon Aug 11 2008 Peter Lemenkov 1.3.2-4 - Fix build with --fuzz=0 * Mon Aug 11 2008 Peter Lemenkov 1.3.2-3 - Fixed urls - Restricted access to openser.cfg and openserctl.cfg - Service won't start by default (BZ# 441297) * Fri May 16 2008 Peter Lemenkov 1.3.2-2 - New modules - dialplan and drouting (this one still has no README) * Thu May 15 2008 Peter Lemenkov 1.3.2-1 - Ver. 1.3.2 * Tue Mar 18 2008 Tom "spot" Callaway - 1.3.1-3 - add Requires for versioned perl (libperl.so) - drop silly file Requires * Fri Mar 14 2008 Jan ONDREJ (SAL) - 1.3.1-2 - removed perl patch, which is not necessary * Thu Mar 13 2008 Jan ONDREJ (SAL) - 1.3.1-1 - update to upstream - removed obsolete patches * Fri Mar 7 2008 Tom "spot" Callaway - 1.3.0-12 - patch perl code to use PERL_SYS_INIT3_BODY * Fri Mar 7 2008 Tom "spot" Callaway - 1.3.0-11 - fix perl build requires * Thu Mar 06 2008 Tom "spot" Callaway - 1.3.0-10 - Rebuild for new perl * Sat Feb 23 2008 Jan ONDREJ (SAL) 1.3.0-9 - ia64 build fix * Sat Feb 9 2008 Peter Lemenkov 1.3.0-8.1 - typo fix * Sat Feb 9 2008 Peter Lemenkov 1.3.0-8 - Rebuild for GCC 4.3 * Sat Jan 26 2008 Jan ONDREJ (SAL) 1.3.0-7 - Updated syntax error in default config * Sat Jan 26 2008 Peter Lemenkov 1.3.0-5 - Merge of acc module into main package * Fri Jan 25 2008 Jan ONDREJ (SAL) 1.3.0-4 - modify and apply forgotten patch4 * Thu Jan 17 2008 Jan ONDREJ (SAL) 1.3.0-2 - removed openser.init and replaced by upstream version - fixed configuration path for openserdbctl (#428799) * Sun Jan 13 2008 Peter Lemenkov 1.3.0-1.4 - 4th try to remove lm_sensors-devel from EL-[45] at ppc{64} * Thu Dec 13 2007 Peter Lemenkov 1.3.0-1 - Final ver. 1.3.0 - Removed some leftovers from spec-file * Wed Dec 12 2007 Peter Lemenkov 1.3.0-0.1.pre1 - Latest snapshot - 1.3.0pre1 * Mon Dec 10 2007 Jan ONDREJ (SAL) 1.2.2-11 - added ETCDIR into openserctlrc (need openser-1.3 to work) * Mon Sep 24 2007 Jan ONDREJ (SAL) 1.2.2-10 - perl scripts moved to perl_vendorlib directory - added LDAPUtils and Utils subdirectories - changed perl module BuildRequires * Mon Sep 24 2007 Jan ONDREJ (SAL) 1.2.2-9 - added reload section to init script - init script specified with initrddir macro - documentation converted to UTF-8 - added doc macro for documentation - documentation moved do proper place (/usr/share/doc/NAME-VERSION/) - which removed from BuildRequires, it's in guidelines exceptions - unixodbc subpackage summary update * Thu Sep 6 2007 Peter Lemenkov 1.2.2-8 - Added another one missing BR - which (needs by snmpstats module) - Cosmetic: dropped commented out 'Requires' * Thu Sep 06 2007 Jan ONDREJ (SAL) 1.2.2-7 - added attr macro for init script - added -p to install arguments to preserve timestamp - parallel make used * Sun Aug 26 2007 Jan ONDREJ (SAL) 1.2.2-6 - Fedora Core 6 build updates - changed attributes for openser.init to be rpmlint more silent * Sun Aug 26 2007 Peter Lemenkov 1.2.2-5 - fixed paths for openssl libs and includes * Sun Aug 26 2007 Peter Lemenkov 1.2.2-4 - Introduced acc and acc_radius modules (Jan Ondrej) - Dropped radius_accounting condition * Sat Aug 25 2007 Peter Lemenkov 1.2.2-3 - Changed license according to Fedora's policy - Make rpmlint more silent * Fri Aug 24 2007 Jan ONDREJ (SAL) 1.2.2-2 - added openser.init script - removed Patch0: openser--Makefile.diff and updated build section - spec file is 80 characters wide - added radius_accounting condition * Wed Aug 22 2007 Peter Lemenkov 1.2.2-1 - Ver. 1.2.2 * Tue Jul 24 2007 Peter Lemenkov 1.2.1-1 - Initial spec. --- NEW FILE opensips.sysconfig --- # Add extra options here OPTIONS="" Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/opensips/F-11/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- .cvsignore 3 Nov 2009 04:34:15 -0000 1.1 +++ .cvsignore 3 Nov 2009 10:44:19 -0000 1.2 @@ -0,0 +1 @@ +opensips-1.6.0-tls_src.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/opensips/F-11/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- sources 3 Nov 2009 04:34:16 -0000 1.1 +++ sources 3 Nov 2009 10:44:19 -0000 1.2 @@ -0,0 +1 @@ +c9dbca1dc74e0a3a383f61e3dc4844df opensips-1.6.0-tls_src.tar.gz From atkac at fedoraproject.org Tue Nov 3 11:06:17 2009 From: atkac at fedoraproject.org (Adam Tkac) Date: Tue, 3 Nov 2009 11:06:17 +0000 (UTC) Subject: rpms/bind/devel bind97-dist-pkcs11.patch, NONE, 1.1 .cvsignore, 1.57, 1.58 bind-9.5-libidn.patch, 1.4, 1.5 bind-9.5-sdb.patch, 1.5, 1.6 bind-96-dyndb.patch, 1.11, 1.12 bind.spec, 1.329, 1.330 named.sysconfig, 1.12, 1.13 sources, 1.66, 1.67 Message-ID: <20091103110617.6EE1611C00E8@cvs1.fedora.phx.redhat.com> Author: atkac Update of /cvs/pkgs/rpms/bind/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5015 Modified Files: .cvsignore bind-9.5-libidn.patch bind-9.5-sdb.patch bind-96-dyndb.patch bind.spec named.sysconfig sources Added Files: bind97-dist-pkcs11.patch Log Message: - update to 9.7.0b1 - add bind-pkcs11 subpackage to support PKCS11 compatible keystores for DNSSEC keys bind97-dist-pkcs11.patch: configure.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- NEW FILE bind97-dist-pkcs11.patch --- diff -up bind-9.7.0b1/configure.in.dist-pkcs11 bind-9.7.0b1/configure.in --- bind-9.7.0b1/configure.in.dist-pkcs11 2009-11-03 11:37:25.481430279 +0100 +++ bind-9.7.0b1/configure.in 2009-11-03 11:41:04.573930858 +0100 @@ -721,15 +721,16 @@ AC_ARG_WITH(pkcs11, case "$use_pkcs11" in no|'') AC_MSG_RESULT(disabled) - USE_PKCS11='' PKCS11_TOOLS='' ;; yes|*) AC_MSG_RESULT(using OpenSSL with PKCS11 support) - USE_PKCS11='-DUSE_PKCS11' PKCS11_TOOLS=pkcs11 ;; esac +# We don't want to automatically load engine because it needs to have openct, +# opencryptoki and friends installed. +USE_PKCS11='' AC_SUBST(USE_PKCS11) AC_SUBST(PKCS11_TOOLS) Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- .cvsignore 16 Sep 2009 11:09:11 -0000 1.57 +++ .cvsignore 3 Nov 2009 11:06:15 -0000 1.58 @@ -1,2 +1,2 @@ -bind-9.7.0a3.tar.gz +bind-9.7.0b1.tar.gz config-4.tar.bz2 bind-9.5-libidn.patch: Makefile.in | 6 +- dighost.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 153 insertions(+), 5 deletions(-) Index: bind-9.5-libidn.patch =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.5-libidn.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- bind-9.5-libidn.patch 16 Sep 2009 11:09:12 -0000 1.4 +++ bind-9.5-libidn.patch 3 Nov 2009 11:06:15 -0000 1.5 @@ -1,6 +1,6 @@ -diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c ---- bind-9.7.0a3/bin/dig/dighost.c.libidn 2009-09-01 02:22:24.000000000 +0200 -+++ bind-9.7.0a3/bin/dig/dighost.c 2009-09-16 12:58:36.044643387 +0200 +diff -up bind-9.7.0b1/bin/dig/dighost.c.libidn bind-9.7.0b1/bin/dig/dighost.c +--- bind-9.7.0b1/bin/dig/dighost.c.libidn 2009-09-16 01:48:09.000000000 +0200 ++++ bind-9.7.0b1/bin/dig/dighost.c 2009-10-20 10:49:26.719056220 +0200 @@ -44,6 +44,11 @@ #include #endif @@ -13,7 +13,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. #include #ifdef DIG_SIGCHASE #include -@@ -147,6 +152,14 @@ static void idn_check_result(idn_result +@@ -153,6 +158,14 @@ static void idn_check_result(idn_result int idnoptions = 0; #endif @@ -28,7 +28,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. /*% * Exit Codes: * -@@ -1029,6 +1042,9 @@ setup_system(void) { +@@ -1184,6 +1197,9 @@ setup_system(void) { dig_searchlist_t *domain = NULL; lwres_result_t lwresult; unsigned int lwresflags; @@ -38,7 +38,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. debug("setup_system()"); -@@ -1087,8 +1103,15 @@ setup_system(void) { +@@ -1242,8 +1258,15 @@ setup_system(void) { #ifdef WITH_IDN initialize_idn(); @@ -55,7 +55,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. if (keyfile[0] != 0) setup_file_key(); else if (keysecret[0] != 0) -@@ -1789,12 +1812,18 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -1957,12 +1980,18 @@ setup_lookup(dig_lookup_t *lookup) { idn_result_t mr; char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME]; #endif @@ -75,7 +75,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. REQUIRE(lookup != NULL); INSIST(!free_now); -@@ -1831,6 +1860,16 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -1999,6 +2028,16 @@ setup_lookup(dig_lookup_t *lookup) { mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname, utf8_textname, sizeof(utf8_textname)); idn_check_result(mr, "convert textname to UTF-8"); @@ -92,7 +92,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. #endif /* -@@ -1850,6 +1889,15 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2018,6 +2057,15 @@ setup_lookup(dig_lookup_t *lookup) { lookup->origin = ISC_LIST_HEAD(search_list); lookup->need_search = ISC_FALSE; } @@ -108,7 +108,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. #else if ((count_dots(lookup->textname) >= ndots) || !usesearch) { lookup->origin = NULL; /* Force abs lookup */ -@@ -1876,6 +1924,20 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2044,6 +2092,20 @@ setup_lookup(dig_lookup_t *lookup) { IDN_IDNCONV | IDN_LENCHECK, utf8_textname, idn_textname, sizeof(idn_textname)); idn_check_result(mr, "convert UTF-8 textname to IDN encoding"); @@ -129,7 +129,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. #else if (lookup->origin != NULL) { debug("trying origin %s", lookup->origin->origin); -@@ -1931,6 +1993,13 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2099,6 +2161,13 @@ setup_lookup(dig_lookup_t *lookup) { result = dns_name_fromtext(lookup->name, &b, dns_rootname, 0, &lookup->namebuf); @@ -143,7 +143,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. #else len = strlen(lookup->textname); isc_buffer_init(&b, lookup->textname, len); -@@ -3449,7 +3518,7 @@ destroy_libs(void) { +@@ -3617,7 +3686,7 @@ destroy_libs(void) { void * ptr; dig_message_t *chase_msg; #endif @@ -152,7 +152,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. isc_result_t result; #endif -@@ -3488,6 +3557,10 @@ destroy_libs(void) { +@@ -3656,6 +3725,10 @@ destroy_libs(void) { result = dns_name_settotextfilter(NULL); check_result(result, "dns_name_settotextfilter"); #endif @@ -163,7 +163,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. dns_name_destroy(); if (commctx != NULL) { -@@ -3664,6 +3737,79 @@ idn_check_result(idn_result_t r, const c +@@ -3834,6 +3907,79 @@ idn_check_result(idn_result_t r, const c } } #endif /* WITH_IDN */ @@ -243,19 +243,19 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c. #ifdef DIG_SIGCHASE void -diff -up bind-9.7.0a3/bin/dig/Makefile.in.libidn bind-9.7.0a3/bin/dig/Makefile.in ---- bind-9.7.0a3/bin/dig/Makefile.in.libidn 2009-09-03 01:48:01.000000000 +0200 -+++ bind-9.7.0a3/bin/dig/Makefile.in 2009-09-16 12:59:00.314643312 +0200 +diff -up bind-9.7.0b1/bin/dig/Makefile.in.libidn bind-9.7.0b1/bin/dig/Makefile.in +--- bind-9.7.0b1/bin/dig/Makefile.in.libidn 2009-09-22 10:47:55.000000000 +0200 ++++ bind-9.7.0b1/bin/dig/Makefile.in 2009-10-20 10:50:06.201543709 +0200 @@ -46,10 +46,10 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${LWRESDEPLIBS} - LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \ -- ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -+ ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn - - NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCNOSYMLIBS} \ -- ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -+ ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn + LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ +- ${ISCLIBS} @IDNLIBS@ @LIBS@ ++ ${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn + + NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ +- ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ ++ ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn SUBDIRS = bind-9.5-sdb.patch: bin/Makefile.in | 4 +- bin/named-sdb/Makefile.in | 20 +++++--------- bin/named-sdb/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ bin/named/Makefile.in | 14 +++------- configure.in | 3 ++ 5 files changed, 79 insertions(+), 24 deletions(-) Index: bind-9.5-sdb.patch =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.5-sdb.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- bind-9.5-sdb.patch 16 Sep 2009 11:09:12 -0000 1.5 +++ bind-9.5-sdb.patch 3 Nov 2009 11:06:15 -0000 1.6 @@ -1,25 +1,26 @@ -diff -up bind-9.7.0a3/bin/Makefile.in.sdb bind-9.7.0a3/bin/Makefile.in ---- bind-9.7.0a3/bin/Makefile.in.sdb 2009-06-10 02:27:21.000000000 +0200 -+++ bind-9.7.0a3/bin/Makefile.in 2009-09-16 12:55:29.034655166 +0200 -@@ -19,7 +19,8 @@ srcdir = @srcdir@ +diff -up bind-9.7.0b1/bin/Makefile.in.sdb bind-9.7.0b1/bin/Makefile.in +--- bind-9.7.0b1/bin/Makefile.in.sdb 2009-10-05 14:07:08.000000000 +0200 ++++ bind-9.7.0b1/bin/Makefile.in 2009-10-20 11:01:21.011555584 +0200 +@@ -19,8 +19,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ --SUBDIRS = named rndc dig dnssec tests tools nsupdate check confgen -+SUBDIRS = named named-sdb rndc dig dnssec tests tools nsupdate check \ -+ confgen sdb_tools +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +- check confgen @PKCS11_TOOLS@ ++SUBDIRS = named named-sdb rndc dig dnssec tests tools nsupdate \ ++ check confgen @PKCS11_TOOLS@ sdb_tools TARGETS = @BIND9_MAKE_RULES@ -diff -up bind-9.7.0a3/bin/named/Makefile.in.sdb bind-9.7.0a3/bin/named/Makefile.in ---- bind-9.7.0a3/bin/named/Makefile.in.sdb 2009-09-16 12:55:28.994644340 +0200 -+++ bind-9.7.0a3/bin/named/Makefile.in 2009-09-16 12:56:40.424643332 +0200 +diff -up bind-9.7.0b1/bin/named/Makefile.in.sdb bind-9.7.0b1/bin/named/Makefile.in +--- bind-9.7.0b1/bin/named/Makefile.in.sdb 2009-10-20 11:01:20.971545269 +0200 ++++ bind-9.7.0b1/bin/named/Makefile.in 2009-10-20 11:01:35.191543713 +0200 @@ -45,7 +45,7 @@ CINCLUDES = -I${srcdir}/include -I${srcd ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} --CDEFINES = -DBIND9 @USE_DLZ@ -+CDEFINES = -DBIND9 +-CDEFINES = -DBIND9 @USE_DLZ@ @USE_PKCS11@ ++CDEFINES = -DBIND9 @USE_PKCS11@ CWARNINGS = @@ -63,9 +64,9 @@ diff -up bind-9.7.0a3/bin/named/Makefile ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5 - - at DLZ_DRIVER_RULES@ -diff -up bind-9.7.0a3/bin/named-sdb/main.c.sdb bind-9.7.0a3/bin/named-sdb/main.c ---- bind-9.7.0a3/bin/named-sdb/main.c.sdb 2009-09-16 12:55:29.014643786 +0200 -+++ bind-9.7.0a3/bin/named-sdb/main.c 2009-09-16 12:55:29.034655166 +0200 +diff -up bind-9.7.0b1/bin/named-sdb/main.c.sdb bind-9.7.0b1/bin/named-sdb/main.c +--- bind-9.7.0b1/bin/named-sdb/main.c.sdb 2009-10-20 11:01:20.991546005 +0200 ++++ bind-9.7.0b1/bin/named-sdb/main.c 2009-10-20 11:01:21.011555584 +0200 @@ -75,6 +75,9 @@ * Include header files for database drivers here. */ @@ -76,7 +77,7 @@ diff -up bind-9.7.0a3/bin/named-sdb/main /* * Include DLZ drivers if appropriate. -@@ -757,6 +760,10 @@ setup(void) { +@@ -766,6 +769,10 @@ setup(void) { ns_main_earlyfatal("isc_app_start() failed: %s", isc_result_totext(result)); @@ -87,7 +88,7 @@ diff -up bind-9.7.0a3/bin/named-sdb/main isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version, saved_command_line); -@@ -840,6 +847,57 @@ setup(void) { +@@ -849,6 +856,57 @@ setup(void) { isc_result_totext(result)); #endif @@ -145,7 +146,7 @@ diff -up bind-9.7.0a3/bin/named-sdb/main ns_server_create(ns_g_mctx, &ns_g_server); } -@@ -867,6 +925,10 @@ cleanup(void) { +@@ -876,6 +934,10 @@ cleanup(void) { dns_name_destroy(); @@ -156,9 +157,9 @@ diff -up bind-9.7.0a3/bin/named-sdb/main isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, ISC_LOG_NOTICE, "exiting"); ns_log_shutdown(); -diff -up bind-9.7.0a3/bin/named-sdb/Makefile.in.sdb bind-9.7.0a3/bin/named-sdb/Makefile.in ---- bind-9.7.0a3/bin/named-sdb/Makefile.in.sdb 2009-09-16 12:55:29.014643786 +0200 -+++ bind-9.7.0a3/bin/named-sdb/Makefile.in 2009-09-16 12:57:05.617143628 +0200 +diff -up bind-9.7.0b1/bin/named-sdb/Makefile.in.sdb bind-9.7.0b1/bin/named-sdb/Makefile.in +--- bind-9.7.0b1/bin/named-sdb/Makefile.in.sdb 2009-10-20 11:01:20.991546005 +0200 ++++ bind-9.7.0b1/bin/named-sdb/Makefile.in 2009-10-20 11:01:21.011555584 +0200 @@ -28,10 +28,10 @@ top_srcdir = @top_srcdir@ # # Add database drivers here. @@ -208,10 +209,10 @@ diff -up bind-9.7.0a3/bin/named-sdb/Make + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-sdb at EXEEXT@ ${DESTDIR}${sbindir} @DLZ_DRIVER_RULES@ -diff -up bind-9.7.0a3/configure.in.sdb bind-9.7.0a3/configure.in ---- bind-9.7.0a3/configure.in.sdb 2009-09-04 02:44:54.000000000 +0200 -+++ bind-9.7.0a3/configure.in 2009-09-16 12:55:29.044644803 +0200 -@@ -3144,6 +3144,8 @@ AC_CONFIG_FILES([ +diff -up bind-9.7.0b1/configure.in.sdb bind-9.7.0b1/configure.in +--- bind-9.7.0b1/configure.in.sdb 2009-10-16 06:16:17.000000000 +0200 ++++ bind-9.7.0b1/configure.in 2009-10-20 11:01:21.011555584 +0200 +@@ -3206,6 +3206,8 @@ AC_CONFIG_FILES([ bin/confgen/unix/Makefile bin/named/Makefile bin/named/unix/Makefile @@ -220,11 +221,11 @@ diff -up bind-9.7.0a3/configure.in.sdb b bin/rndc/Makefile bin/dig/Makefile bin/nsupdate/Makefile -@@ -3165,6 +3167,7 @@ AC_CONFIG_FILES([ +@@ -3227,6 +3229,7 @@ AC_CONFIG_FILES([ bin/tests/headerdep_test.sh bin/tools/Makefile bin/dnssec/Makefile + bin/sdb_tools/Makefile + bin/pkcs11/Makefile doc/Makefile doc/arm/Makefile - doc/misc/Makefile bind-96-dyndb.patch: bin/named/main.c | 3 bin/named/server.c | 102 ++++++++++ lib/dns/Makefile.in | 11 - lib/dns/dynamic_db.c | 364 +++++++++++++++++++++++++++++++++++++++ lib/dns/include/dns/Makefile.in | 2 lib/dns/include/dns/dynamic_db.h | 50 +++++ lib/dns/include/dns/log.h | 1 lib/dns/include/dns/types.h | 1 lib/dns/log.c | 1 lib/isccfg/namedconf.c | 36 +++ 10 files changed, 567 insertions(+), 4 deletions(-) Index: bind-96-dyndb.patch =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind-96-dyndb.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- bind-96-dyndb.patch 16 Sep 2009 11:09:12 -0000 1.11 +++ bind-96-dyndb.patch 3 Nov 2009 11:06:15 -0000 1.12 @@ -1,6 +1,6 @@ -diff -up bind-9.7.0a3/bin/named/main.c.dyndb bind-9.7.0a3/bin/named/main.c ---- bind-9.7.0a3/bin/named/main.c.dyndb 2009-09-01 20:40:25.000000000 +0200 -+++ bind-9.7.0a3/bin/named/main.c 2009-09-16 10:47:35.744643926 +0200 +diff -up bind-9.7.0b1/bin/named/main.c.dyndb bind-9.7.0b1/bin/named/main.c +--- bind-9.7.0b1/bin/named/main.c.dyndb 2009-10-05 19:30:49.000000000 +0200 ++++ bind-9.7.0b1/bin/named/main.c 2009-10-20 10:39:55.439045751 +0200 @@ -45,6 +45,7 @@ #include @@ -9,7 +9,7 @@ diff -up bind-9.7.0a3/bin/named/main.c.d #include #include #include -@@ -844,6 +845,8 @@ setup(void) { +@@ -853,6 +854,8 @@ setup(void) { static void cleanup(void) { @@ -18,9 +18,9 @@ diff -up bind-9.7.0a3/bin/named/main.c.d destroy_managers(); ns_server_destroy(&ns_g_server); -diff -up bind-9.7.0a3/bin/named/server.c.dyndb bind-9.7.0a3/bin/named/server.c ---- bind-9.7.0a3/bin/named/server.c.dyndb 2009-09-10 03:49:29.000000000 +0200 -+++ bind-9.7.0a3/bin/named/server.c 2009-09-16 10:47:35.744643926 +0200 +diff -up bind-9.7.0b1/bin/named/server.c.dyndb bind-9.7.0b1/bin/named/server.c +--- bind-9.7.0b1/bin/named/server.c.dyndb 2009-10-12 22:48:11.000000000 +0200 ++++ bind-9.7.0b1/bin/named/server.c 2009-10-20 10:39:55.439045751 +0200 @@ -58,6 +58,7 @@ #ifdef DLZ #include @@ -156,7 +156,7 @@ diff -up bind-9.7.0a3/bin/named/server.c /* * Parse the global default pseudo-config file. */ -@@ -4944,6 +5044,8 @@ loadconfig(ns_server_t *server) { +@@ -4945,6 +5045,8 @@ loadconfig(ns_server_t *server) { static isc_result_t reload(ns_server_t *server) { isc_result_t result; @@ -165,9 +165,9 @@ diff -up bind-9.7.0a3/bin/named/server.c CHECK(loadconfig(server)); result = load_zones(server, ISC_FALSE); -diff -up /dev/null bind-9.7.0a3/lib/dns/dynamic_db.c ---- /dev/null 2009-09-16 12:27:54.710000266 +0200 -+++ bind-9.7.0a3/lib/dns/dynamic_db.c 2009-09-16 10:47:35.744643926 +0200 +diff -up /dev/null bind-9.7.0b1/lib/dns/dynamic_db.c +--- /dev/null 2009-10-20 12:29:23.540001947 +0200 ++++ bind-9.7.0b1/lib/dns/dynamic_db.c 2009-10-20 10:39:55.439045751 +0200 @@ -0,0 +1,364 @@ +/* + * Copyright (C) 2008-2009 Red Hat, Inc. @@ -533,9 +533,9 @@ diff -up /dev/null bind-9.7.0a3/lib/dns/ + + return args->timermgr; +} -diff -up /dev/null bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h ---- /dev/null 2009-09-16 12:27:54.710000266 +0200 -+++ bind-9.7.0a3/lib/dns/include/dns/dynamic_db.h 2009-09-16 10:47:35.744643926 +0200 +diff -up /dev/null bind-9.7.0b1/lib/dns/include/dns/dynamic_db.h +--- /dev/null 2009-10-20 12:29:23.540001947 +0200 ++++ bind-9.7.0b1/lib/dns/include/dns/dynamic_db.h 2009-10-20 10:39:55.439045751 +0200 @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2008-2009 Red Hat, Inc. @@ -587,9 +587,9 @@ diff -up /dev/null bind-9.7.0a3/lib/dns/ +isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args); + +#endif -diff -up bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb bind-9.7.0a3/lib/dns/include/dns/log.h ---- bind-9.7.0a3/lib/dns/include/dns/log.h.dyndb 2009-01-18 00:47:43.000000000 +0100 -+++ bind-9.7.0a3/lib/dns/include/dns/log.h 2009-09-16 10:47:35.744643926 +0200 +diff -up bind-9.7.0b1/lib/dns/include/dns/log.h.dyndb bind-9.7.0b1/lib/dns/include/dns/log.h +--- bind-9.7.0b1/lib/dns/include/dns/log.h.dyndb 2009-01-18 00:47:43.000000000 +0100 ++++ bind-9.7.0b1/lib/dns/include/dns/log.h 2009-10-20 10:39:55.439045751 +0200 @@ -73,6 +73,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul #define DNS_LOGMODULE_HINTS (&dns_modules[24]) #define DNS_LOGMODULE_ACACHE (&dns_modules[25]) @@ -598,21 +598,21 @@ diff -up bind-9.7.0a3/lib/dns/include/dn ISC_LANG_BEGINDECLS -diff -up bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/include/dns/Makefile.in ---- bind-9.7.0a3/lib/dns/include/dns/Makefile.in.dyndb 2008-11-15 00:47:33.000000000 +0100 -+++ bind-9.7.0a3/lib/dns/include/dns/Makefile.in 2009-09-16 10:47:35.744643926 +0200 -@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ +diff -up bind-9.7.0b1/lib/dns/include/dns/Makefile.in.dyndb bind-9.7.0b1/lib/dns/include/dns/Makefile.in +--- bind-9.7.0b1/lib/dns/include/dns/Makefile.in.dyndb 2009-10-09 01:48:10.000000000 +0200 ++++ bind-9.7.0b1/lib/dns/include/dns/Makefile.in 2009-10-20 10:42:34.949043781 +0200 +@@ -22,7 +22,7 @@ top_srcdir = @top_srcdir@ + @BIND9_VERSION@ - HEADERS = acl.h adb.h byaddr.h cache.h callbacks.h \ - cert.h compress.h \ + HEADERS = acl.h adb.h byaddr.h cache.h callbacks.h cert.h compress.h \ - db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \ + db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \ - dnssec.h ds.h events.h fixedname.h iptable.h journal.h keyflags.h \ - keytable.h keyvalues.h lib.h log.h master.h masterdump.h \ - message.h name.h ncache.h \ -diff -up bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb bind-9.7.0a3/lib/dns/include/dns/types.h ---- bind-9.7.0a3/lib/dns/include/dns/types.h.dyndb 2009-09-01 02:22:27.000000000 +0200 -+++ bind-9.7.0a3/lib/dns/include/dns/types.h 2009-09-16 10:47:35.744643926 +0200 + dnssec.h ds.h events.h fixedname.h iptable.h journal.h \ + keyflags.h keytable.h keyvalues.h lib.h log.h \ + master.h masterdump.h message.h name.h ncache.h nsec.h \ +diff -up bind-9.7.0b1/lib/dns/include/dns/types.h.dyndb bind-9.7.0b1/lib/dns/include/dns/types.h +--- bind-9.7.0b1/lib/dns/include/dns/types.h.dyndb 2009-09-01 02:22:27.000000000 +0200 ++++ bind-9.7.0b1/lib/dns/include/dns/types.h 2009-10-20 10:39:55.439045751 +0200 @@ -60,6 +60,7 @@ typedef struct dns_dbtable dns_dbtable typedef void dns_dbversion_t; typedef struct dns_dlzimplementation dns_dlzimplementation_t; @@ -621,9 +621,9 @@ diff -up bind-9.7.0a3/lib/dns/include/dn typedef struct dns_sdlzimplementation dns_sdlzimplementation_t; typedef struct dns_decompress dns_decompress_t; typedef struct dns_dispatch dns_dispatch_t; -diff -up bind-9.7.0a3/lib/dns/log.c.dyndb bind-9.7.0a3/lib/dns/log.c ---- bind-9.7.0a3/lib/dns/log.c.dyndb 2007-06-19 01:47:40.000000000 +0200 -+++ bind-9.7.0a3/lib/dns/log.c 2009-09-16 10:47:35.744643926 +0200 +diff -up bind-9.7.0b1/lib/dns/log.c.dyndb bind-9.7.0b1/lib/dns/log.c +--- bind-9.7.0b1/lib/dns/log.c.dyndb 2007-06-19 01:47:40.000000000 +0200 ++++ bind-9.7.0b1/lib/dns/log.c 2009-10-20 10:39:55.439045751 +0200 @@ -79,6 +79,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns { "dns/hints", 0 }, { "dns/acache", 0 }, @@ -632,9 +632,9 @@ diff -up bind-9.7.0a3/lib/dns/log.c.dynd { NULL, 0 } }; -diff -up bind-9.7.0a3/lib/dns/Makefile.in.dyndb bind-9.7.0a3/lib/dns/Makefile.in ---- bind-9.7.0a3/lib/dns/Makefile.in.dyndb 2009-09-16 10:47:35.714664894 +0200 -+++ bind-9.7.0a3/lib/dns/Makefile.in 2009-09-16 10:47:35.744643926 +0200 +diff -up bind-9.7.0b1/lib/dns/Makefile.in.dyndb bind-9.7.0b1/lib/dns/Makefile.in +--- bind-9.7.0b1/lib/dns/Makefile.in.dyndb 2009-10-20 10:39:55.429046304 +0200 ++++ bind-9.7.0b1/lib/dns/Makefile.in 2009-10-20 10:43:14.571543754 +0200 @@ -57,8 +57,8 @@ DSTOBJS = @DST_EXTRA_OBJS@ \ DNSOBJS = acache. at O@ acl. at O@ adb. at O@ byaddr. at O@ \ cache. at O@ callbacks. at O@ compress. at O@ \ @@ -645,7 +645,7 @@ diff -up bind-9.7.0a3/lib/dns/Makefile.i + journal. at O@ keydata. at O@ keytable. at O@ lib. at O@ log. at O@ lookup. at O@ \ master. at O@ masterdump. at O@ message. at O@ \ name. at O@ ncache. at O@ nsec. at O@ nsec3. at O@ order. at O@ peer. at O@ \ - portlist. at O@ \ + portlist. at O@ private. at O@ \ @@ -84,7 +84,7 @@ DSTSRCS = @DST_EXTRA_SRCS@ \ DNSSRCS = acache.c acl.c adb.c byaddr.c \ cache.c callbacks.c compress.c \ @@ -667,9 +667,9 @@ diff -up bind-9.7.0a3/lib/dns/Makefile.i libdns. at SA@: ${OBJS} ${AR} ${ARFLAGS} $@ ${OBJS} ${RANLIB} $@ -diff -up bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb bind-9.7.0a3/lib/isccfg/namedconf.c ---- bind-9.7.0a3/lib/isccfg/namedconf.c.dyndb 2009-09-02 18:10:03.000000000 +0200 -+++ bind-9.7.0a3/lib/isccfg/namedconf.c 2009-09-16 10:52:11.257143715 +0200 +diff -up bind-9.7.0b1/lib/isccfg/namedconf.c.dyndb bind-9.7.0b1/lib/isccfg/namedconf.c +--- bind-9.7.0b1/lib/isccfg/namedconf.c.dyndb 2009-10-13 01:48:02.000000000 +0200 ++++ bind-9.7.0b1/lib/isccfg/namedconf.c 2009-10-20 10:39:55.439045751 +0200 @@ -87,6 +87,7 @@ static cfg_type_t cfg_type_controls; static cfg_type_t cfg_type_controls_sockaddr; static cfg_type_t cfg_type_destinationlist; @@ -678,7 +678,7 @@ diff -up bind-9.7.0a3/lib/isccfg/namedco static cfg_type_t cfg_type_ixfrdifftype; static cfg_type_t cfg_type_key; static cfg_type_t cfg_type_logfile; -@@ -791,6 +792,7 @@ namedconf_or_view_clauses[] = { +@@ -798,6 +799,7 @@ namedconf_or_view_clauses[] = { { "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI }, /* only 1 DLZ per view allowed */ { "dlz", &cfg_type_dynamically_loadable_zones, 0 }, @@ -686,7 +686,7 @@ diff -up bind-9.7.0a3/lib/isccfg/namedco { "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI }, { "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI }, { "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI }, -@@ -1561,6 +1563,40 @@ static cfg_type_t cfg_type_dialuptype = +@@ -1571,6 +1573,40 @@ static cfg_type_t cfg_type_dialuptype = &cfg_rep_string, dialup_enums }; Index: bind.spec =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v retrieving revision 1.329 retrieving revision 1.330 diff -u -p -r1.329 -r1.330 --- bind.spec 8 Oct 2009 14:40:32 -0000 1.329 +++ bind.spec 3 Nov 2009 11:06:16 -0000 1.330 @@ -5,7 +5,7 @@ #%define PATCHVER P1 #%define PREVER rc1 #%define VERSION %{version}-%{PATCHVER} -%define PREVER a3 +%define PREVER b1 %define VERSION %{version}%{PREVER} %{?!SDB: %define SDB 1} @@ -13,6 +13,7 @@ %{?!bind_uid: %define bind_uid 25} %{?!bind_gid: %define bind_gid 25} %{?!GSSTSIG: %define GSSTSIG 1} +%{?!PKCS11: %define PKCS11 1} %define bind_dir /var/named %define chroot_prefix %{bind_dir}/chroot # @@ -20,7 +21,7 @@ Summary: The Berkeley Internet Name Dom Name: bind License: ISC Version: 9.7.0 -Release: 0.5.%{PREVER}%{?dist} +Release: 0.6.%{PREVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,6 +52,7 @@ Patch99: bind-96-libtool2.patch Patch101:bind-96-old-api.patch Patch102:bind-95-rh452060.patch Patch106:bind93-rh490837.patch +Patch107:bind97-dist-pkcs11.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -94,6 +96,19 @@ which resolves host names to IP addresse (routines for applications to use when interfacing with DNS); and tools for verifying that the DNS server is operating properly. +%if %{PKCS11} +%package pkcs11 +Summary: Bind PKCS#11 tools for using DNSSEC +Group: System Environment/Daemons +Requires: engine_pkcs11 opensc +#BuildRequires: opensc-devel + +%description pkcs11 +This is a set of PKCS#11 utilities that when used together create rsa +keys in a PKCS11 keystore, such as provided by opencryptoki. The keys +will have a label of "zone,zsk|ksk,xxx" and an id of the keytag in hex. +%endif + %if %{SDB} %package sdb Summary: BIND server with database backends and DLZ support @@ -213,6 +228,7 @@ mkdir m4 %patch102 -p1 -b .rh452060 %patch106 -p0 -b .rh490837 +%patch107 -p1 -b .dist-pkcs11 # Sparc and s390 arches need to use -fPIE %ifarch sparcv9 sparc64 s390 s390x @@ -242,6 +258,9 @@ libtoolize -c -f; aclocal -I m4 --force; --with-pic \ --disable-static \ --disable-openssl-version-check \ +%if %{PKCS11} + --with-pkcs11=%{_libdir}/pkcs11/PKCS11_API.so \ +%endif %if %{SDB} --with-dlz-ldap=yes \ --with-dlz-postgres=yes \ @@ -592,7 +611,22 @@ rm -rf ${RPM_BUILD_ROOT} %ghost %{chroot_prefix}/dev/zero %ghost %{chroot_prefix}/etc/localtime +%if %{PKCS11} +%files pkcs11 +%defattr(-,root,root,-) +%doc README.pkcs11 NSEC3-NOTES +%{_sbindir}/pkcs11-destroy +%{_sbindir}/pkcs11-keygen +%{_sbindir}/pkcs11-list +%{_mandir}/man8/pkcs11* +%endif + %changelog +* Mon Nov 03 2009 Adam Tkac 32:9.7.0-0.6.b1 +- update to 9.7.0b1 +- add bind-pkcs11 subpackage to support PKCS11 compatible keystores for DNSSEC + keys + * Thu Oct 08 2009 Adam Tkac 32:9.7.0-0.5.a3 - don't package named-bootconf utility, it is very outdated and unneeded Index: named.sysconfig =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/named.sysconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- named.sysconfig 15 Sep 2009 15:34:00 -0000 1.12 +++ named.sysconfig 3 Nov 2009 11:06:16 -0000 1.13 @@ -36,3 +36,7 @@ # named process. If you set this option to "yes" then # /var/named/ directory become writable by named user # and named will be able to write core dumps there. +# +# OPTIONS="-E pkcs11" -- Enable loading of DNSSEC keys from PKCS11 compatible +# keystores. Make sure you have bind-pkcs11 package +# installed. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/bind/devel/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- sources 16 Sep 2009 11:09:13 -0000 1.66 +++ sources 3 Nov 2009 11:06:16 -0000 1.67 @@ -1,2 +1,2 @@ -ff61597579dcb629213c7421b26e9457 bind-9.7.0a3.tar.gz +da182c92166e63f0fe758e8e5a691053 bind-9.7.0b1.tar.gz de68e10e91e05ab100be879b5bcaa6cb config-4.tar.bz2 From pkgdb at fedoraproject.org Tue Nov 3 11:09:39 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:39 +0000 Subject: [pkgdb] pptp: jskala has requested watchcommits Message-ID: <20091103110940.124D310F87E@bastion2.fedora.phx.redhat.com> jskala has requested the watchcommits acl on pptp (Fedora 12) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:09:37 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:37 +0000 Subject: [pkgdb] pptp: jskala has requested watchbugzilla Message-ID: <20091103110937.6872010F874@bastion2.fedora.phx.redhat.com> jskala has requested the watchbugzilla acl on pptp (Fedora 12) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:09:41 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:41 +0000 Subject: [pkgdb] pptp: jskala has requested commit Message-ID: <20091103110941.F0EB510F87F@bastion2.fedora.phx.redhat.com> jskala has requested the commit acl on pptp (Fedora 12) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:09:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:44 +0000 Subject: [pkgdb] pptp: jskala has requested watchbugzilla Message-ID: <20091103110945.17BB310F888@bastion2.fedora.phx.redhat.com> jskala has requested the watchbugzilla acl on pptp (Fedora 11) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:09:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:46 +0000 Subject: [pkgdb] pptp: jskala has requested watchcommits Message-ID: <20091103110946.5D49B10F879@bastion2.fedora.phx.redhat.com> jskala has requested the watchcommits acl on pptp (Fedora 11) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:09:47 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:47 +0000 Subject: [pkgdb] pptp: jskala has requested commit Message-ID: <20091103110947.C6E6910F882@bastion2.fedora.phx.redhat.com> jskala has requested the commit acl on pptp (Fedora 11) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:09:50 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:50 +0000 Subject: [pkgdb] pptp: jskala has requested watchbugzilla Message-ID: <20091103110950.E4D1C10F880@bastion2.fedora.phx.redhat.com> jskala has requested the watchbugzilla acl on pptp (Fedora 10) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:09:52 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:52 +0000 Subject: [pkgdb] pptp: jskala has requested watchcommits Message-ID: <20091103110952.C212A10F879@bastion2.fedora.phx.redhat.com> jskala has requested the watchcommits acl on pptp (Fedora 10) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:09:54 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:54 +0000 Subject: [pkgdb] pptp: jskala has requested commit Message-ID: <20091103110954.57C0E10F887@bastion2.fedora.phx.redhat.com> jskala has requested the commit acl on pptp (Fedora 10) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:09:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:09:58 +0000 Subject: [pkgdb] pptp: jskala has requested watchbugzilla Message-ID: <20091103110959.11C3710F880@bastion2.fedora.phx.redhat.com> jskala has requested the watchbugzilla acl on pptp (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:10:00 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:10:00 +0000 Subject: [pkgdb] pptp: jskala has requested watchcommits Message-ID: <20091103111000.A6E2210F882@bastion2.fedora.phx.redhat.com> jskala has requested the watchcommits acl on pptp (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:10:03 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:10:03 +0000 Subject: [pkgdb] pptp: jskala has requested commit Message-ID: <20091103111003.36C9F10F887@bastion2.fedora.phx.redhat.com> jskala has requested the commit acl on pptp (Fedora EPEL 5) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:10:05 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:10:05 +0000 Subject: [pkgdb] pptp: jskala has requested watchbugzilla Message-ID: <20091103111005.9509E10F87E@bastion2.fedora.phx.redhat.com> jskala has requested the watchbugzilla acl on pptp (Fedora EPEL 4) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:10:06 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:10:06 +0000 Subject: [pkgdb] pptp: jskala has requested watchcommits Message-ID: <20091103111007.0CA5510F88E@bastion2.fedora.phx.redhat.com> jskala has requested the watchcommits acl on pptp (Fedora EPEL 4) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:10:09 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:10:09 +0000 Subject: [pkgdb] pptp: jskala has requested commit Message-ID: <20091103111009.D462110F87F@bastion2.fedora.phx.redhat.com> jskala has requested the commit acl on pptp (Fedora EPEL 4) To make changes to this package see: /pkgdb/packages/name/pptp From tbzatek at fedoraproject.org Tue Nov 3 11:18:00 2009 From: tbzatek at fedoraproject.org (Tomas Bzatek) Date: Tue, 3 Nov 2009 11:18:00 +0000 (UTC) Subject: rpms/gvfs/F-12 gvfs-1.4.2-handle-null-gdudevices.patch, NONE, 1.1 gvfs-1.4.2-remove-dead-code.patch, NONE, 1.1 gvfs.spec, 1.165, 1.166 Message-ID: <20091103111801.1052F11C00E8@cvs1.fedora.phx.redhat.com> Author: tbzatek Update of /cvs/extras/rpms/gvfs/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7613 Modified Files: gvfs.spec Added Files: gvfs-1.4.2-handle-null-gdudevices.patch gvfs-1.4.2-remove-dead-code.patch Log Message: * Tue Nov 3 2009 Tomas Bzatek - 1.4.1-3 - gdu-volume-monitor: don't crash on NULL devices (#529982) gvfs-1.4.2-handle-null-gdudevices.patch: ggduvolume.c | 109 +++++++++++++++++++++++++++++++++++----------------- ggduvolumemonitor.c | 86 +++++++++++++++++++++++++++-------------- 2 files changed, 132 insertions(+), 63 deletions(-) --- NEW FILE gvfs-1.4.2-handle-null-gdudevices.patch --- >From 48cf9c174f347f92c3fab7ff50b38effda0eb78a Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 30 Oct 2009 17:06:26 +0000 Subject: Gently handle NULL GduDevice objects This patch adds bunch of tests for NULL GduDevice objects. According to gdu docs, there's a possibility to have GduPresentable and no associated GduDevice. It's not common but true for several special cases - like GduLinuxMdDrive. Signed-off-by: David Zeuthen --- diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c index 865a7b7..28839fd 100644 --- a/monitor/gdu/ggduvolume.c +++ b/monitor/gdu/ggduvolume.c @@ -172,7 +172,7 @@ static gboolean update_volume (GGduVolume *volume) { GduDevice *device; - GduPool *pool; + GduPool *pool = NULL; time_t now; gboolean changed; gboolean old_can_mount; @@ -217,10 +217,11 @@ update_volume (GGduVolume *volume) /* in with the new */ device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume)); - pool = gdu_device_get_pool (device); + if (device != NULL) + pool = gdu_device_get_pool (device); keep_cleartext_volume = FALSE; - if (gdu_device_is_luks (device)) + if (device != NULL && gdu_device_is_luks (device)) { const gchar *holder_objpath; @@ -287,13 +288,17 @@ update_volume (GGduVolume *volume) volume->name = gdu_presentable_get_name (GDU_PRESENTABLE (volume->cleartext_gdu_volume)); g_free (volume->device_file); - volume->device_file = g_strdup (gdu_device_get_device_file (luks_cleartext_volume_device)); + if (luks_cleartext_volume_device != NULL) + volume->device_file = g_strdup (gdu_device_get_device_file (luks_cleartext_volume_device)); + else + volume->device_file = NULL; volume->can_mount = TRUE; volume->should_automount = FALSE; - g_object_unref (luks_cleartext_volume_device); + if (luks_cleartext_volume_device != NULL) + g_object_unref (luks_cleartext_volume_device); } else { @@ -321,7 +326,10 @@ update_volume (GGduVolume *volume) } g_free (volume->device_file); - volume->device_file = g_strdup (gdu_device_get_device_file (device)); + if (device != NULL) + volume->device_file = g_strdup (gdu_device_get_device_file (device)); + else + volume->device_file = NULL; volume->can_mount = TRUE; @@ -341,14 +349,16 @@ update_volume (GGduVolume *volume) * nopolicy is only FALSE for "physical" devices - e.g. only "physical" devices will * be set to be automounted. */ - if (gdu_device_get_presentation_nopolicy (device)) + if (device != NULL && gdu_device_get_presentation_nopolicy (device)) volume->should_automount = FALSE; g_free (activation_uri); } - g_object_unref (pool); - g_object_unref (device); + if (pool != NULL) + g_object_unref (pool); + if (device != NULL) + g_object_unref (device); /* ---------------------------------------------------------------------------------------------------- */ @@ -1082,6 +1092,20 @@ g_gdu_volume_mount (GVolume *_volume, } device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume)); + + if (device == NULL) + { + simple = g_simple_async_result_new_error (G_OBJECT (volume), + callback, + user_data, + G_IO_ERROR, + G_IO_ERROR_FAILED, + "Underlying device missing"); + g_simple_async_result_complete (simple); + g_object_unref (simple); + goto out; + } + pool = gdu_device_get_pool (device); /* Makes no sense to mount @@ -1129,11 +1153,14 @@ g_gdu_volume_mount (GVolume *_volume, luks_cleartext_volume_device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->cleartext_gdu_volume)); - object_path_of_cleartext_device = gdu_device_get_object_path (luks_cleartext_volume_device); + if (luks_cleartext_volume_device != NULL) + { + object_path_of_cleartext_device = gdu_device_get_object_path (luks_cleartext_volume_device); - mount_cleartext_device (data, object_path_of_cleartext_device); + mount_cleartext_device (data, object_path_of_cleartext_device); - g_object_unref (luks_cleartext_volume_device); + g_object_unref (luks_cleartext_volume_device); + } goto out; } @@ -1551,17 +1578,20 @@ g_gdu_volume_get_identifier (GVolume *_volume, { device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume)); - label = gdu_device_id_get_label (device); - uuid = gdu_device_id_get_uuid (device); + if (device != NULL) + { + label = gdu_device_id_get_label (device); + uuid = gdu_device_id_get_uuid (device); - g_object_unref (device); + g_object_unref (device); - if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0) - id = g_strdup (volume->device_file); - else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_LABEL) == 0) - id = strlen (label) > 0 ? g_strdup (label) : NULL; - else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0) - id = strlen (uuid) > 0 ? g_strdup (uuid) : NULL; + if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0) + id = g_strdup (volume->device_file); + else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_LABEL) == 0) + id = strlen (label) > 0 ? g_strdup (label) : NULL; + else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0) + id = strlen (uuid) > 0 ? g_strdup (uuid) : NULL; + } } return id; @@ -1577,19 +1607,24 @@ g_gdu_volume_enumerate_identifiers (GVolume *_volume) const gchar *uuid; p = g_ptr_array_new (); + label = NULL; if (volume->gdu_volume != NULL) { device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume)); - label = gdu_device_id_get_label (device); - uuid = gdu_device_id_get_uuid (device); - g_object_unref (device); - - g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE)); - if (strlen (label) > 0) - g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_LABEL)); - if (strlen (uuid) > 0) - g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UUID)); + + if (device != NULL) + { + label = gdu_device_id_get_label (device); + uuid = gdu_device_id_get_uuid (device); + g_object_unref (device); + + g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE)); + if (strlen (label) > 0) + g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_LABEL)); + if (strlen (uuid) > 0) + g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UUID)); + } } g_ptr_array_add (p, NULL); @@ -1638,8 +1673,11 @@ g_gdu_volume_has_device_file (GGduVolume *volume, { GduDevice *luks_cleartext_volume_device; luks_cleartext_volume_device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->cleartext_gdu_volume)); - _device_file = gdu_device_get_device_file (luks_cleartext_volume_device); - g_object_unref (luks_cleartext_volume_device); + if (luks_cleartext_volume_device != NULL) + { + _device_file = gdu_device_get_device_file (luks_cleartext_volume_device); + g_object_unref (luks_cleartext_volume_device); + } } return g_strcmp0 (_device_file, device_file) == 0; @@ -1682,8 +1720,11 @@ g_gdu_volume_has_uuid (GGduVolume *volume, { GduDevice *luks_cleartext_volume_device; luks_cleartext_volume_device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->cleartext_gdu_volume)); - _uuid = gdu_device_id_get_uuid (luks_cleartext_volume_device); - g_object_unref (luks_cleartext_volume_device); + if (luks_cleartext_volume_device != NULL) + { + _uuid = gdu_device_id_get_uuid (luks_cleartext_volume_device); + g_object_unref (luks_cleartext_volume_device); + } } return g_strcmp0 (_uuid, uuid) == 0; diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c index e81dce2..398fed4 100644 --- a/monitor/gdu/ggduvolumemonitor.c +++ b/monitor/gdu/ggduvolumemonitor.c @@ -779,9 +779,10 @@ should_volume_be_ignored (GduPool *pool, GduVolume *volume, GList *fstab_mount_p const gchar *type; ret = TRUE; - device = NULL; device = gdu_presentable_get_device (GDU_PRESENTABLE (volume)); + if (device == NULL) + goto out; if (gdu_device_get_presentation_hide (device)) goto out; @@ -827,7 +828,8 @@ should_volume_be_ignored (GduPool *pool, GduVolume *volume, GList *fstab_mount_p out: - g_object_unref (device); + if (device != NULL) + g_object_unref (device); return ret; } @@ -1269,15 +1271,18 @@ update_volumes (GGduVolumeMonitor *monitor, d = gdu_presentable_get_device (p); - volume = find_volume_for_device_file (monitor, gdu_device_get_device_file (d)); - if (volume != NULL) + if (d != NULL) { - /*g_debug ("removing volume %s", gdu_device_get_device_file (d));*/ - g_gdu_volume_removed (volume); - monitor->volumes = g_list_remove (monitor->volumes, volume); - *removed_volumes = g_list_prepend (*removed_volumes, volume); + volume = find_volume_for_device_file (monitor, gdu_device_get_device_file (d)); + if (volume != NULL) + { + /*g_debug ("removing volume %s", gdu_device_get_device_file (d));*/ + g_gdu_volume_removed (volume); + monitor->volumes = g_list_remove (monitor->volumes, volume); + *removed_volumes = g_list_prepend (*removed_volumes, volume); + } + g_object_unref (d); } - g_object_unref (d); } for (l = added; l != NULL; l = l->next) @@ -1285,9 +1290,12 @@ update_volumes (GGduVolumeMonitor *monitor, GduPresentable *p = GDU_PRESENTABLE (l->data); GduDevice *d; + volume = NULL; d = gdu_presentable_get_device (p); - volume = find_volume_for_device_file (monitor, gdu_device_get_device_file (d)); + if (d != NULL) + volume = find_volume_for_device_file (monitor, gdu_device_get_device_file (d)); + if (volume == NULL) { GduPresentable *toplevel_presentable; @@ -1297,12 +1305,16 @@ update_volumes (GGduVolumeMonitor *monitor, { GduDevice *toplevel_device; + drive = NULL; toplevel_device = gdu_presentable_get_device (toplevel_presentable); - drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device)); - /*g_debug ("adding volume %s (drive %s)", - gdu_device_get_device_file (d), - gdu_device_get_device_file (toplevel_device));*/ - g_object_unref (toplevel_device); + if (toplevel_device != NULL) + { + drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device)); + /*g_debug ("adding volume %s (drive %s)", + gdu_device_get_device_file (d), + gdu_device_get_device_file (toplevel_device));*/ + g_object_unref (toplevel_device); + } g_object_unref (toplevel_presentable); } else @@ -1320,9 +1332,10 @@ update_volumes (GGduVolumeMonitor *monitor, monitor->volumes = g_list_prepend (monitor->volumes, volume); *added_volumes = g_list_prepend (*added_volumes, g_object_ref (volume)); } - } + } - g_object_unref (d); + if (d != NULL) + g_object_unref (d); } g_list_free (added); @@ -1579,10 +1592,15 @@ update_discs (GGduVolumeMonitor *monitor, GduPresentable *p = GDU_PRESENTABLE (l->data); GduDevice *d; + volume = NULL; + mount = NULL; d = gdu_presentable_get_device (p); - volume = find_disc_volume_for_device_file (monitor, gdu_device_get_device_file (d)); - mount = find_disc_mount_for_volume (monitor, volume); + if (d != NULL) + { + volume = find_disc_volume_for_device_file (monitor, gdu_device_get_device_file (d)); + mount = find_disc_mount_for_volume (monitor, volume); + } if (mount != NULL) { @@ -1600,7 +1618,8 @@ update_discs (GGduVolumeMonitor *monitor, *removed_volumes = g_list_prepend (*removed_volumes, volume); } - g_object_unref (d); + if (d != NULL) + g_object_unref (d); } for (l = added; l != NULL; l = l->next) @@ -1609,11 +1628,16 @@ update_discs (GGduVolumeMonitor *monitor, GduDevice *d; gboolean is_blank; + volume = NULL; + is_blank = TRUE; d = gdu_presentable_get_device (p); - is_blank = gdu_device_optical_disc_get_is_blank (d); + if (d != NULL) + { + is_blank = gdu_device_optical_disc_get_is_blank (d); + volume = find_disc_volume_for_device_file (monitor, gdu_device_get_device_file (d)); + } - volume = find_disc_volume_for_device_file (monitor, gdu_device_get_device_file (d)); if (volume == NULL) { GduPresentable *toplevel_presentable; @@ -1623,12 +1647,16 @@ update_discs (GGduVolumeMonitor *monitor, { GduDevice *toplevel_device; + drive = NULL; toplevel_device = gdu_presentable_get_device (toplevel_presentable); - drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device)); - /*g_debug ("adding volume %s (drive %s)", - gdu_device_get_device_file (d), - gdu_device_get_device_file (toplevel_device));*/ - g_object_unref (toplevel_device); + if (toplevel_device != NULL) + { + drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device)); + /*g_debug ("adding volume %s (drive %s)", + gdu_device_get_device_file (d), + gdu_device_get_device_file (toplevel_device));*/ + g_object_unref (toplevel_device); + } g_object_unref (toplevel_presentable); } else @@ -1682,7 +1710,8 @@ update_discs (GGduVolumeMonitor *monitor, } } - g_object_unref (d); + if (d != NULL) + g_object_unref (d); } g_list_free (added); -- cgit v0.8.2 gvfs-1.4.2-remove-dead-code.patch: ggduvolumemonitor.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) --- NEW FILE gvfs-1.4.2-remove-dead-code.patch --- >From cd2afbd07bbcf4e7caee1dd0ca1c65d74974884d Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 30 Oct 2009 17:03:35 +0000 Subject: Remove dead code Signed-off-by: David Zeuthen --- diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c index 83d8fc2..e81dce2 100644 --- a/monitor/gdu/ggduvolumemonitor.c +++ b/monitor/gdu/ggduvolumemonitor.c @@ -842,7 +842,6 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points) GList *l; ignored = FALSE; - device = NULL; enclosed = NULL; device = gdu_presentable_get_device (GDU_PRESENTABLE (d)); @@ -1074,7 +1073,7 @@ find_disc_volume_for_device_file (GGduVolumeMonitor *monitor, static GGduVolume * find_volume_for_device_file (GGduVolumeMonitor *monitor, - const gchar *device_file) + const gchar *device_file) { GList *l; GGduVolume *ret; @@ -1183,9 +1182,6 @@ update_drives (GGduVolumeMonitor *monitor, for (l = removed; l != NULL; l = l->next) { GduPresentable *p = GDU_PRESENTABLE (l->data); - GduDevice *d; - - d = gdu_presentable_get_device (p); drive = find_drive_by_presentable (monitor, p); if (drive != NULL) @@ -1195,16 +1191,11 @@ update_drives (GGduVolumeMonitor *monitor, monitor->drives = g_list_remove (monitor->drives, drive); *removed_drives = g_list_prepend (*removed_drives, drive); } - if (d != NULL) - g_object_unref (d); } for (l = added; l != NULL; l = l->next) { GduPresentable *p = GDU_PRESENTABLE (l->data); - GduDevice *d; - - d = gdu_presentable_get_device (p); drive = find_drive_by_presentable (monitor, p); if (drive == NULL) @@ -1217,8 +1208,6 @@ update_drives (GGduVolumeMonitor *monitor, *added_drives = g_list_prepend (*added_drives, g_object_ref (drive)); } } - if (d != NULL) - g_object_unref (d); } g_list_free (added); -- cgit v0.8.2 Index: gvfs.spec =================================================================== RCS file: /cvs/extras/rpms/gvfs/F-12/gvfs.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -p -r1.165 -r1.166 --- gvfs.spec 2 Nov 2009 17:07:41 -0000 1.165 +++ gvfs.spec 3 Nov 2009 11:17:58 -0000 1.166 @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -20,7 +20,7 @@ BuildRequires: gnome-keyring-devel BuildRequires: intltool BuildRequires: gettext-devel BuildRequires: GConf2-devel -BuildRequires: gnome-disk-utility-devel >= 2.28.0 +BuildRequires: gnome-disk-utility-devel >= 2.28.1-1 BuildRequires: PolicyKit-devel # This is a hack until the xfce4-notifyd dependency issue is fixed # https://fedorahosted.org/rel-eng/ticket/1788 @@ -42,6 +42,8 @@ Patch2: http-icons.patch # from upstream Patch12: gvfs-1.4.1-http-suport-stream-query-info.patch Patch13: gvfs-1.4.1-http-soup-header-parsing.patch +Patch14: gvfs-1.4.2-remove-dead-code.patch +Patch15: gvfs-1.4.2-handle-null-gdudevices.patch %description The gvfs package provides backend implementations for the gio @@ -138,6 +140,8 @@ and iPod Touches to applications using g %patch2 -p1 -b .http-icons %patch12 -p1 -b .http-query-info %patch13 -p1 -b .http-headers +%patch14 -p1 -b .dead-code +%patch15 -p1 -b .gdu-null-devices %build @@ -303,6 +307,9 @@ killall -USR1 gvfsd >&/dev/null || : %{_datadir}/gvfs/remote-volume-monitors/afc.monitor %changelog +* Tue Nov 3 2009 Tomas Bzatek - 1.4.1-3 +- gdu-volume-monitor: don't crash on NULL devices (#529982) + * Mon Nov 2 2009 Tomas Bzatek - 1.4.1-2 - Reload .mount files when single package is installed From pkgdb at fedoraproject.org Tue Nov 3 11:38:30 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:38:30 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113830.B65E810F874@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchbugzilla acl on pptp (Fedora EPEL 5) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:38:33 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:38:33 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113833.17AD010F87E@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchcommits acl on pptp (Fedora EPEL 5) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:38:38 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:38:38 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113838.B2B7F10F874@bastion2.fedora.phx.redhat.com> pghmcfc has set the commit acl on pptp (Fedora EPEL 5) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:38:44 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:38:44 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113844.A17E710F87D@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchbugzilla acl on pptp (Fedora EPEL 4) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:38:46 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:38:46 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113846.A846E10F87F@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchcommits acl on pptp (Fedora EPEL 4) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:38:49 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:38:49 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113849.8FB4210F879@bastion2.fedora.phx.redhat.com> pghmcfc has set the commit acl on pptp (Fedora EPEL 4) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:38:56 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:38:56 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113856.E789C10F874@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchbugzilla acl on pptp (Fedora 10) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:38:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:38:58 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113859.08A3B10F87F@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchcommits acl on pptp (Fedora 10) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:39:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:39:01 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113901.B8BF910F874@bastion2.fedora.phx.redhat.com> pghmcfc has set the commit acl on pptp (Fedora 10) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:39:10 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:39:10 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113910.5079A10F879@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchbugzilla acl on pptp (Fedora 11) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:39:13 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:39:13 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113913.3A11810F882@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchcommits acl on pptp (Fedora 11) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:39:16 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:39:16 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113916.DA30910F879@bastion2.fedora.phx.redhat.com> pghmcfc has set the commit acl on pptp (Fedora 11) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:39:22 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:39:22 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113922.2015310F87D@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchbugzilla acl on pptp (Fedora 12) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:39:24 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:39:24 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113924.1760110F87E@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchcommits acl on pptp (Fedora 12) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:39:26 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:39:26 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103113926.825A710F87D@bastion2.fedora.phx.redhat.com> pghmcfc has set the commit acl on pptp (Fedora 12) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:46:18 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:46:18 +0000 Subject: [pkgdb] pptp: jskala has requested watchbugzilla Message-ID: <20091103114618.C6E2310F874@bastion2.fedora.phx.redhat.com> jskala has requested the watchbugzilla acl on pptp (Fedora devel) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:46:21 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:46:21 +0000 Subject: [pkgdb] pptp: jskala has requested watchcommits Message-ID: <20091103114621.9976410F87E@bastion2.fedora.phx.redhat.com> jskala has requested the watchcommits acl on pptp (Fedora devel) To make changes to this package see: /pkgdb/packages/name/pptp From prajnoha at fedoraproject.org Tue Nov 3 11:46:21 2009 From: prajnoha at fedoraproject.org (Peter Rajnoha) Date: Tue, 3 Nov 2009 11:46:21 +0000 (UTC) Subject: rpms/lvm2/devel lvm2.spec,1.185,1.186 Message-ID: <20091103114621.B73EC11C00E8@cvs1.fedora.phx.redhat.com> Author: prajnoha Update of /cvs/pkgs/rpms/lvm2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13278 Modified Files: lvm2.spec Log Message: Enable udev synchronisation code and install default udev rules. Index: lvm2.spec =================================================================== RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v retrieving revision 1.185 retrieving revision 1.186 diff -u -p -r1.185 -r1.186 --- lvm2.spec 27 Oct 2009 01:12:38 -0000 1.185 +++ lvm2.spec 3 Nov 2009 11:46:20 -0000 1.186 @@ -9,7 +9,7 @@ Summary: Userland logical volume management tools Name: lvm2 Version: 2.02.54 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -26,6 +26,7 @@ BuildRequires: openaislib-devel >= %{ope BuildRequires: clusterlib-devel >= %{clusterlib_version} BuildRequires: module-init-tools BuildRequires: pkgconfig +BuildRequires: libudev-devel Requires: device-mapper >= %{device_mapper_version}-%{release} Requires: device-mapper-event >= %{device_mapper_version}-%{release} Requires: %{name}-libs = %{version}-%{release} @@ -52,8 +53,10 @@ or more physical volumes and creating on %define _bindir /bin %define _sbindir /sbin %define _libdir /%{_lib} +%define _udevbasedir /lib/udev +%define _udevdir %{_udevbasedir}/rules.d -%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,openais,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd +%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,openais,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-udevdir=%{_udevdir} --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-udev_sync make %{?_smp_mflags} @@ -176,6 +179,7 @@ fi %{_mandir}/man8/vgs.8.gz %{_mandir}/man8/vgscan.8.gz %{_mandir}/man8/vgsplit.8.gz +%{_udevdir}/11-dm-lvm.rules %dir /etc/lvm %ghost /etc/lvm/cache/.cache %config(noreplace) /etc/lvm/lvm.conf @@ -278,6 +282,11 @@ License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/dm Requires: device-mapper-libs = %{device_mapper_version}-%{release} +Requires: libudev +Requires: util-linux-ng >= 2.15 +# We need dracut to install required udev rules if udev_sync +# feature is turned on so we don't lose required notifications. +Conflicts: dracut < 002-18 %description -n device-mapper This package contains the supporting userspace utility, dmsetup, @@ -285,9 +294,14 @@ for the kernel device-mapper. %files -n device-mapper %defattr(-,root,root,-) -%doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL +%doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL udev/12-dm-permissions.rules %attr(755,root,root) /sbin/dmsetup %{_mandir}/man8/dmsetup.8.gz +%dir %{_udevbasedir} +%dir %{_udevdir} +%{_udevdir}/10-dm.rules +%{_udevdir}/13-dm-disk.rules +%{_udevdir}/95-dm-notify.rules %package -n device-mapper-devel Summary: Development libraries and headers for device-mapper @@ -382,6 +396,14 @@ the device-mapper event library. %changelog +* Tue Nov 3 2009 Peter Rajnoha - 2.02.54-2 +- Enable udev synchronisation code. +- Install default udev rules for device-mapper and LVM2. +- Add BuildRequires: libudev-devel. +- Add Requires: libudev (to check udev is running). +- Add Requires: util-linux-ng (blkid used in udev rules). +- Add Conflicts: dracut < 002-18 (for dracut to install required udev rules) + * Tue Oct 27 2009 Alasdair Kergon - 2.02.54-1 - Add implict pvcreate support to vgcreate and vgextend. - Add --pvmetadatacopies for pvcreate, vgcreate, vgextend, vgconvert. From pkgdb at fedoraproject.org Tue Nov 3 11:46:28 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:46:28 +0000 Subject: [pkgdb] pptp: jskala has requested commit Message-ID: <20091103114628.A49CA10F874@bastion2.fedora.phx.redhat.com> jskala has requested the commit acl on pptp (Fedora devel) To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:46:55 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:46:55 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103114655.C5F7510F874@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchbugzilla acl on pptp (Fedora devel) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:46:58 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:46:58 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103114658.B02D510F87E@bastion2.fedora.phx.redhat.com> pghmcfc has set the watchcommits acl on pptp (Fedora devel) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From pkgdb at fedoraproject.org Tue Nov 3 11:47:01 2009 From: pkgdb at fedoraproject.org (Fedora PackageDB) Date: Tue, 03 Nov 2009 11:47:01 +0000 Subject: [pkgdb] pptp had acl change status Message-ID: <20091103114701.1D66A10F880@bastion2.fedora.phx.redhat.com> pghmcfc has set the commit acl on pptp (Fedora devel) to Approved for jskala To make changes to this package see: /pkgdb/packages/name/pptp From hadess at fedoraproject.org Tue Nov 3 11:49:57 2009 From: hadess at fedoraproject.org (Bastien Nocera) Date: Tue, 3 Nov 2009 11:49:57 +0000 (UTC) Subject: rpms/rhythmbox/F-12 0001-Fix-audio-tags-in-Brasero-project-files.patch, NONE, 1.1 rhythmbox.spec, 1.272, 1.273 Message-ID: <20091103114957.19E8011C00E8@cvs1.fedora.phx.redhat.com> Author: hadess Update of /cvs/pkgs/rpms/rhythmbox/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14759 Modified Files: rhythmbox.spec Added Files: 0001-Fix-audio-tags-in-Brasero-project-files.patch Log Message: * Tue Nov 03 2009 Bastien Nocera 0.12.5-8 - Fix brasero project generation 0001-Fix-audio-tags-in-Brasero-project-files.patch: rb-disc-recorder-plugin.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) --- NEW FILE 0001-Fix-audio-tags-in-Brasero-project-files.patch --- >From bce5ee67e4b46443ab42a6a18d76b26ea61296df Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 3 Nov 2009 11:45:24 +0000 Subject: [PATCH] Fix