From 9409430affa88916144d82702d2daf06edc4a5d8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Jan 13 2009 02:47:33 +0000 Subject: Update to 0.3.92 Add hal-devel Requires to devel package --- diff --git a/.cvsignore b/.cvsignore index 7e8e4db..57101c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -exo-0.3.4.tar.bz2 +exo-0.3.92.tar.bz2 diff --git a/exo-0.3.4-fix_broken_regexp.patch b/exo-0.3.4-fix_broken_regexp.patch deleted file mode 100644 index d4740cc..0000000 --- a/exo-0.3.4-fix_broken_regexp.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: exo-0.3.4/exo/exo-url.c -=================================================================== ---- exo-0.3.4.orig/exo/exo-url.c 2008-10-02 09:51:44.000000000 -0300 -+++ exo-0.3.4/exo/exo-url.c 2008-10-02 09:52:05.000000000 -0300 -@@ -56,14 +56,14 @@ - #define PASSCHARS "-A-Za-z0-9,?;.:/!%$^*&~\"#'" - #define HOSTCHARS "-A-Za-z0-9" - #define USER "[" USERCHARS "]+(:["PASSCHARS "]+)?" --#define MATCH_BROWSER1 "((file|https?|ftps?)://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" \ -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?" --#define MATCH_BROWSER2 "(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" \ -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?" -+#define MATCH_BROWSER1 "^((file|https?|ftps?)://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" \ -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?$" -+#define MATCH_BROWSER2 "^(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" \ -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?$" - #if !defined(__GLIBC__) --#define MATCH_MAILER "[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+" -+#define MATCH_MAILER "^[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+$" - #else --#define MATCH_MAILER "\\<[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>" -+#define MATCH_MAILER "^\\<[a-z0-9][a-z0-9_.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>$" - #endif - - diff --git a/exo-0.3.4-gcc_hardening_fix.patch b/exo-0.3.4-gcc_hardening_fix.patch deleted file mode 100644 index d92178a..0000000 --- a/exo-0.3.4-gcc_hardening_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: exo-0.3.4/exo/exo-utils.h -=================================================================== ---- exo-0.3.4.orig/exo/exo-utils.h 2008-06-24 06:22:05.000000000 +0200 -+++ exo-0.3.4/exo/exo-utils.h 2008-06-24 06:22:10.000000000 +0200 -@@ -35,8 +35,6 @@ - gpointer exo_noop_null (void) G_GNUC_PURE; - gboolean exo_noop_true (void) G_GNUC_PURE; - gboolean exo_noop_false (void) G_GNUC_PURE; --G_INLINE_FUNC void exo_atomic_inc (gint *value); --G_INLINE_FUNC gboolean exo_atomic_dec (gint *value); - - /* inline function implementations */ - #if (defined(G_CAN_INLINE) && defined(__GNUC__) && defined(__i386__) && defined(__OPTIMIZE__)) || defined(__EXO_UTILS_C__) diff --git a/exo.spec b/exo.spec index 3f55fe1..54ce692 100644 --- a/exo.spec +++ b/exo.spec @@ -2,16 +2,14 @@ Summary: Application library for the Xfce desktop environment Name: exo -Version: 0.3.4 -Release: 4%{?dist} +Version: 0.3.92 +Release: 1%{?dist} # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+ # everything else is LGPLv2+ License: LGPLv2+ and GPLv2+ URL: http://xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.2/src/exo-%{version}.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.5.92/src/exo-%{version}.tar.bz2 Patch0: exo-0.3.0-x86_64-build.patch -Patch1: exo-0.3.4-fix_broken_regexp.patch -Patch2: exo-0.3.4-gcc_hardening_fix.patch Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: dbus-glib >= 0.22 @@ -23,9 +21,10 @@ BuildRequires: python-devel BuildRequires: imake BuildRequires: libXt-devel BuildRequires: perl-URI -BuildRequires: xfce-mcs-manager-devel BuildRequires: libxfce4util-devel BuildRequires: hal-devel libnotify-devel +BuildRequires: intltool >= 0.31 +BuildRequires: chrpath %description Extension library for Xfce, targeted at application development. @@ -35,6 +34,7 @@ Summary: Development tools for exo library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libxfce4util-devel +Requires: hal-devel %description devel Static libraries and header files for the exo library. @@ -51,11 +51,10 @@ Python libraries and header files for the exo library. %setup -q %patch0 -p1 -b .x86_64-build -%patch1 -p1 -b .broken-regex -%patch2 -p1 -b .gcc-hardening %build %configure --enable-gtk-doc --disable-static + make %{?_smp_mflags} %install @@ -65,6 +64,12 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-mount +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-desktop-item-edit +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-open +chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3 +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so + %find_lang libexo-0.3 %clean @@ -106,7 +111,6 @@ fi %{_libexecdir}/exo-mount-notify-0.3 %{_libexecdir}/exo-compose-mail-0.3 %{_datadir}/applications/exo-preferred-applications.desktop -%{_libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so %{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png @@ -127,6 +131,12 @@ fi %{python_sitearch}/pyexo.* %changelog +* Tue Dec 23 2008 Kevin Fenzi 0.3.92-1 +- Update to 0.3.92 + +* Tue Dec 16 2008 Kevin Fenzi 0.3.4-5 +- Add hal-devel Requires to devel package. + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.3.4-4 - Rebuild for Python 2.6 diff --git a/sources b/sources index e9c8f1e..268ac10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a1af943b1df32b6f89ae91823118a22 exo-0.3.4.tar.bz2 +42f7e60ce8d8a6ba233a91c62a5d78bb exo-0.3.92.tar.bz2