rpms/joe/devel joe-3.4-selinux.patch,1.1,1.2 joe.spec,1.40,1.41

Sat Feb 14 22:01:40 UTC 2009

Author: jwrdegoede

Update of /cvs/extras/rpms/joe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28758

Modified Files:
	joe-3.4-selinux.patch joe.spec 
Log Message:
* Sat Feb 14 2009 Hans de Goede <hdegoede at redhat.com> - 3.7-2
- Install translations
- Fix selinux patch so that it will apply to the new version
- Convert HACKING and ChangeLog files to UTF-8
- Fix Source0 URL to match guidelines for sf.net URL's
- Remove guideline violating explicit require for ncurses


joe-3.4-selinux.patch:

Index: joe-3.4-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/joe/devel/joe-3.4-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- joe-3.4-selinux.patch	31 May 2006 12:01:56 -0000	1.1
+++ joe-3.4-selinux.patch	14 Feb 2009 22:01:39 -0000	1.2
@@ -1,26 +1,7 @@
---- joe-3.4/ufile.c.selinux	2006-05-26 19:42:31.000000000 +0200
-+++ joe-3.4/ufile.c	2006-05-31 11:37:29.000000000 +0200
-@@ -17,7 +17,7 @@
- #endif
- #endif
- 
--#ifdef WITH_SELINUX
-+#ifdef HAVE_SELINUX
- int copy_security_context(const char *from_file, const char *to_file);
- #endif
- 
-@@ -159,7 +159,7 @@
- 	utime(to, &utbuf);
- #endif
- 
--#ifdef WITH_SELINUX
-+#ifdef HAVE_SELINUX
- 	copy_security_context(from,to);
- #endif
- 
---- joe-3.4/configure.selinux	2006-05-30 20:05:13.000000000 +0200
-+++ joe-3.4/configure	2006-05-31 11:39:15.000000000 +0200
-@@ -5659,7 +5659,7 @@
+diff -up joe-3.7/configure.selinux joe-3.7/configure
+--- joe-3.7/configure.selinux	2008-10-30 04:07:22.000000000 +0100
++++ joe-3.7/configure	2009-02-02 11:13:50.000000000 +0100
+@@ -6531,7 +6531,7 @@ if test "$ac_cv_header_selinux_selinux_h
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SELINUX 1
  _ACEOF
@@ -29,8 +10,9 @@
  fi
  
  # Checks for typedefs, structures, and compiler characteristics.
---- joe-3.4/selinux.c.selinux	2006-05-22 15:33:09.000000000 +0200
-+++ joe-3.4/selinux.c	2006-05-31 11:36:50.000000000 +0200
+diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c
+--- joe-3.7/selinux.c.selinux	2006-05-22 06:15:41.000000000 +0200
++++ joe-3.7/selinux.c	2009-02-02 11:13:50.000000000 +0100
 @@ -4,7 +4,9 @@
   */
  #include "types.h"
@@ -42,7 +24,7 @@
  #include <selinux/selinux.h>
  static int selinux_enabled = -1;
  #endif
-@@ -13,7 +15,7 @@
+@@ -13,7 +15,7 @@ int
  copy_security_context(const char *from_file, const char *to_file)
  {
  	int status = 0;
@@ -51,7 +33,7 @@
  	security_context_t from_context;
  	security_context_t to_context;
  
-@@ -38,9 +40,7 @@
+@@ -38,9 +40,7 @@ copy_security_context(const char *from_f
  	}
  
  	if (getfilecon(to_file, &to_context) < 0) {
@@ -62,7 +44,7 @@
  		freecon(from_context);
  		return 1;
  	}
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ copy_security_context(const char *from_f
  int
  match_default_security_context(const char *from_file)
  {
@@ -71,7 +53,7 @@
  	security_context_t scontext;
  
  	if (selinux_enabled == -1)
-@@ -102,7 +102,7 @@
+@@ -102,7 +102,7 @@ match_default_security_context(const cha
  int
  reset_default_security_context()
  {
@@ -80,7 +62,7 @@
  	if (selinux_enabled == -1)
  		selinux_enabled = (is_selinux_enabled() > 0);
  
-@@ -121,7 +121,7 @@
+@@ -121,7 +121,7 @@ reset_default_security_context()
  int
  output_security_context(char *from_file)
  {
@@ -89,7 +71,7 @@
  	security_context_t scontext;
  
  	if (selinux_enabled == -1)
-@@ -153,7 +153,7 @@
+@@ -153,7 +153,7 @@ output_security_context(char *from_file)
  
  /*
    Test program compile using the following command
@@ -98,3 +80,24 @@
   */
  
  #include <stdio.h>
+diff -up joe-3.7/ufile.c.selinux joe-3.7/ufile.c
+--- joe-3.7/ufile.c.selinux	2008-11-02 21:39:52.000000000 +0100
++++ joe-3.7/ufile.c	2009-02-02 11:13:50.000000000 +0100
+@@ -15,7 +15,7 @@
+ #endif
+ #endif
+ 
+-#ifdef WITH_SELINUX
++#ifdef HAVE_SELINUX
+ int copy_security_context(const char *from_file, const char *to_file);
+ #endif
+ 
+@@ -157,7 +157,7 @@ static int cp(unsigned char *from, unsig
+ 	utime((char *)to, &utbuf);
+ #endif
+ 
+-#ifdef WITH_SELINUX
++#ifdef HAVE_SELINUX
+ 	copy_security_context(from,to);
+ #endif
+ 


Index: joe.spec
===================================================================
RCS file: /cvs/extras/rpms/joe/devel/joe.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- joe.spec	3 Feb 2009 11:39:29 -0000	1.40
+++ joe.spec	14 Feb 2009 22:01:39 -0000	1.41
@@ -1,12 +1,11 @@
 Summary: An easy to use, modeless text editor
 Name: joe
 Version: 3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Editors
-Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
 URL: http://sourceforge.net/projects/joe-editor/
-Requires: ncurses
 BuildRequires: ncurses-devel libselinux-devel
 Patch0: joe-3.7-joerc.patch
 Patch2: joe-3.4-selinux.patch
@@ -24,7 +23,14 @@
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .time
 iconv -f koi8-r -t utf-8 ./man/ru/joe.1.in >./man/ru/joe.1.in.aux
+touch -r ./man/ru/joe.1.in ./man/ru/joe.1.in.aux
 mv ./man/ru/joe.1.in.aux ./man/ru/joe.1.in
+iconv -f ISO_8859-1 -t UTF-8 HACKING > HACKING.tmp
+touch -r HACKING HACKING.tmp 
+mv HACKING.tmp HACKING
+iconv -f ISO_8859-1 -t UTF-8 ChangeLog > ChangeLog.tmp
+touch -r ChangeLog ChangeLog.tmp 
+mv ChangeLog.tmp ChangeLog
 
 %build
 %configure
@@ -42,28 +48,28 @@
 ln -s joe.1 rjoe.1 
 popd
 
-# Have to be fixed - compiled to .mo format and put to /usr/share/locale
-rm $RPM_BUILD_ROOT/%{_datadir}/joe/lang/*.po
 
 %files
 %defattr(-,root,root,-)
 %doc README TODO HINTS NEWS LIST COPYING
 %{_bindir}/*
 %dir /etc/joe
-%dir %{_datadir}/joe
-%dir %{_datadir}/joe/syntax
-%dir %{_datadir}/joe/charmaps
-%{_datadir}/joe/syntax/*
-%{_datadir}/joe/charmaps
-
 %config(noreplace) /etc/joe/*
 %{_mandir}/man1/*
 %{_mandir}/ru/man1/*
+%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Feb 14 2009 Hans de Goede <hdegoede at redhat.com> - 3.7-2
+- Install translations
+- Fix selinux patch so that it will apply to the new version
+- Convert HACKING and ChangeLog files to UTF-8
+- Fix Source0 URL to match guidelines for sf.net URL's
+- Remove guideline violating explicit require for ncurses
+
 * Tue Feb  3 2009 Ivana Varekova <varekova at redhat.com> - 3.7-1
 - update to 3.7
 


