[packages/roxterm] - up to 2.7.2 - flags patch not needed

[baggins]

commit 62a4cab1cdc4f052c0c7ce50d6179638d7e23d88
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Dec 6 13:31:46 2013 +0100

    - up to 2.7.2
    - flags patch not needed

 roxterm-flags.patch | 50 --------------------------------------------------
 roxterm.spec        | 21 +++++++++++++--------
 2 files changed, 13 insertions(+), 58 deletions(-)
---
diff --git a/roxterm.spec b/roxterm.spec
index 2991935..aef1ccf 100644
--- a/roxterm.spec
+++ b/roxterm.spec
@@ -1,6 +1,3 @@
-#
-# TODO: why fr and gl locales are not packaged by find_lang macro?
-#
 # Conditional build:
 %bcond_with	gnomecontrol	# register with GNOME as a default terminal application
 #
@@ -8,13 +5,12 @@ Summary:	ROXTerm - a terminal emulator
 Summary(hu.UTF-8):	ROXTerm egy terminál emulátor
 Summary(pl.UTF-8):	ROXTerm - emulator terminala
 Name:		roxterm
-Version:	2.4.2
+Version:	2.7.2
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/roxterm/%{name}-%{version}.tar.bz2
-# Source0-md5:	7c3bb1471f814a8bfdfcf169ad18e425
-Patch0:		%{name}-flags.patch
+# Source0-md5:	8ef80f9a5e0aea659b1f9cd6de9869b4
 URL:		http://roxterm.sourceforge.net/
 BuildRequires:	ImageMagick-coder-png
 BuildRequires:	dbus-devel
@@ -64,7 +60,6 @@ używany z dowolnym innym środowiskiem X.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__python} mscript.py configure \
@@ -75,7 +70,7 @@ używany z dowolnym innym środowiskiem X.
 
 %{__python} mscript.py build \
 	CC="%{__cc}" \
-	OPTFLAGS="%{rpmcflags}"
+	CPPFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -109,3 +104,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/roxterm.1*
 %lang(es) %{_mandir}/es/man1/roxterm-config.1*
 %lang(es) %{_mandir}/es/man1/roxterm.1*
+%lang(fr) %{_mandir}/fr/man1/roxterm-config.1*
+%lang(fr) %{_mandir}/fr/man1/roxterm.1*
+%lang(pt) %{_mandir}/pt/man1/roxterm-config.1*
+%lang(pt) %{_mandir}/pt/man1/roxterm.1*
+%lang(pt_BR) %{_mandir}/pt_BR/man1/roxterm-config.1*
+%lang(pt_BR) %{_mandir}/pt_BR/man1/roxterm.1*
+%lang(ru) %{_mandir}/ru/man1/roxterm-config.1*
+%lang(ru) %{_mandir}/ru/man1/roxterm.1*
+%lang(uk) %{_mandir}/uk/man1/roxterm-config.1*
+%lang(uk) %{_mandir}/uk/man1/roxterm.1*
diff --git a/roxterm-flags.patch b/roxterm-flags.patch
deleted file mode 100644
index 0b8c66c..0000000
--- a/roxterm-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- roxterm-2.4.2/maitch.py~	2012-01-04 18:03:30.000000000 +0100
-+++ roxterm-2.4.2/maitch.py	2012-02-07 14:16:43.209307382 +0100
-@@ -1588,7 +1588,7 @@
-         set_default(kwargs, 'targets', ".lo")
-         set_default(kwargs, 'rule',
-                 "${LIBTOOL} --mode=compile --tag=CC ${LIBTOOL_FLAGS_} "
--                "gcc ${LIBTOOL_MODE_ARG_} ${CFLAGS_} -c -o ${TGT} ${SRC}")
-+                "${CC} ${LIBTOOL_MODE_ARG_} ${CFLAGS_} -c -o ${TGT} ${SRC}")
-         CRule.__init__(self, **kwargs)
- 
- 
-@@ -1630,7 +1630,7 @@
-         self.init_var(kwargs, 'libtool_mode_arg')
-         set_default(kwargs, 'rule',
-                 "${LIBTOOL} --mode=link ${LIBTOOL_FLAGS_} "
--                "gcc ${LIBTOOL_MODE_ARG_} "
-+                "${CC} ${LIBTOOL_MODE_ARG_} "
-                 "${CFLAGS_} ${LIBS_} ${LDFLAGS_} -o ${TGT} ${SRC}")
-         ProgramRule.__init__(self, **kwargs)
- 
---- roxterm-2.4.2/mscript.py~	2012-01-04 18:03:30.000000000 +0100
-+++ roxterm-2.4.2/mscript.py	2012-02-07 14:31:06.993247782 +0100
-@@ -5,7 +5,7 @@
- from maitch import *
- 
- ctx = Context(PACKAGE = "roxterm", SRC_DIR = "${TOP_DIR}/src",
--        CFLAGS = "-O2 -g -Wall -I. -I${SRC_DIR} -D_GNU_SOURCE -DHAVE_CONFIG_H")
-+        CFLAGS = "-I. -I${SRC_DIR} -D_GNU_SOURCE -DHAVE_CONFIG_H")
- 
- 
- MINILIB_SOURCES = "colourscheme.c dlg.c display.c dragrcv.c dynopts.c " \
-@@ -186,15 +186,15 @@
-             "${CFLAGS} ${VTE_CFLAGS}", "${LIBS} ${VTE_LIBS}")
-     
-     ctx.setenv('CORE_CFLAGS',
--            "${CFLAGS} ${GTK_CFLAGS} ${DBUS_CFLAGS}")
-+            "${OPTFLAGS} ${CFLAGS} ${GTK_CFLAGS} ${DBUS_CFLAGS}")
-     ctx.setenv('CORE_LIBS',
-             "${LIBS} ${GTK_LIBS} ${DBUS_LIBS}")
-     ctx.setenv('ROXTERM_CFLAGS',
--            "${CFLAGS} ${VTE_CFLAGS} ${SM_CFLAGS} ${DBUS_CFLAGS}")
-+            "${OPTFLAGS} ${CFLAGS} ${VTE_CFLAGS} ${SM_CFLAGS} ${DBUS_CFLAGS}")
-     ctx.setenv('ROXTERM_LIBS',
-             "${LIBS} ${VTE_LIBS} ${SM_LIBS} ${DBUS_LIBS}")
-     ctx.setenv('ROXTERM_CONFIG_CFLAGS',
--            "${CFLAGS} ${GTK_CFLAGS} ${DBUS_CFLAGS} ${GMODULE_CFLAGS} "
-+            "${OPTFLAGS} ${CFLAGS} ${GTK_CFLAGS} ${DBUS_CFLAGS} ${GMODULE_CFLAGS} "
-             "-DROXTERM_CAPPLET")
-     ctx.setenv('ROXTERM_CONFIG_LIBS',
-             "${LIBS} ${GTK_LIBS} ${DBUS_LIBS} ${GMODULE_LIBS}")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/roxterm.git/commitdiff/62a4cab1cdc4f052c0c7ce50d6179638d7e23d88