rpms/exo/devel exo-0.3.4-fix_broken_regexp.patch, NONE, 1.1 exo-0.3.4-gcc_hardening_fix.patch, NONE, 1.1 exo.spec, 1.26, 1.27

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26678

Modified Files:
	exo.spec 
Added Files:
	exo-0.3.4-fix_broken_regexp.patch 
	exo-0.3.4-gcc_hardening_fix.patch 
Log Message:
* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.4-3
- Add two Debian patches to fix broken regex and gcc_hardening
- Fix rpm group
- Update gtk-update-icon-cache scriptlets
- Configure with --disable-static


exo-0.3.4-fix_broken_regexp.patch:

--- NEW FILE exo-0.3.4-fix_broken_regexp.patch ---
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
 
 

exo-0.3.4-gcc_hardening_fix.patch:

--- NEW FILE exo-0.3.4-gcc_hardening_fix.patch ---
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__)


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- exo.spec	10 Feb 2008 21:06:17 -0000	1.26
+++ exo.spec	27 Oct 2008 17:16:50 -0000	1.27
@@ -3,14 +3,16 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.4
-Release: 2%{?dist}
+Release: 3%{?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-0.3.4.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.4.2/src/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
-Group: Development/Libraries
+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
 BuildRequires: dbus-devel >= 0.22
@@ -48,22 +50,20 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b x86_64-build
+%patch0 -p1 -b .x86_64-build
+%patch1 -p1 -b .broken-regex
+%patch2 -p1 -b .gcc-hardening
 
 %build
-%configure --enable-gtk-doc
+%configure --enable-gtk-doc --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
 rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
-rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.a
-rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*/*.a
 
 %find_lang libexo-0.3
 
@@ -71,13 +71,17 @@
 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
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
 %files -f libexo-0.3.lang
@@ -123,6 +127,12 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.4-3
+- Add two Debian patches to fix broken regex and gcc_hardening
+- Fix rpm group
+- Update gtk-update-icon-cache scriptlets
+- Configure with --disable-static
+
 * Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 0.3.4-2
 - Rebuild for gcc43