summaryrefslogtreecommitdiffstats
path: root/redhat/extras
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/extras')
-rw-r--r--redhat/extras/akode/akode-autotools.patch73
-rw-r--r--redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch35
-rw-r--r--redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch35
-rw-r--r--redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch26
-rw-r--r--redhat/extras/libkarma/karma-sharp.dll.config3
-rw-r--r--redhat/extras/libkarma/libkarma-0.1.2-fix_installation.patch85
-rw-r--r--redhat/extras/libkarma/libkarma-0.1.2.tar.gzbin81447 -> 0 bytes
-rw-r--r--redhat/extras/libkarma/multimedia-player-rio-karma.pngbin1760 -> 0 bytes
-rw-r--r--redhat/extras/libkarma/preferences.fdi19
-rw-r--r--redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch35
-rw-r--r--redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo9
-rw-r--r--redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo9
12 files changed, 193 insertions, 136 deletions
diff --git a/redhat/extras/akode/akode-autotools.patch b/redhat/extras/akode/akode-autotools.patch
index aa54459ce..d08ac3446 100644
--- a/redhat/extras/akode/akode-autotools.patch
+++ b/redhat/extras/akode/akode-autotools.patch
@@ -1,14 +1,3 @@
---- akode-2.0.2/admin/cvs.sh.ORI 2012-01-13 20:29:38.576590872 +0100
-+++ akode-2.0.2/admin/cvs.sh 2012-01-13 20:30:45.972837972 +0100
-@@ -68,7 +68,7 @@
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
-- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*)
- echo "*** $AUTOMAKE_STRING found."
- UNSERMAKE=no
- ;;
--- akode-2.0.2/akode/lib/Makefile.am.ORI 2012-01-16 19:17:09.849211160 +0100
+++ akode-2.0.2/akode/lib/Makefile.am 2012-01-16 19:17:24.496410002 +0100
@@ -12,6 +12,7 @@
@@ -19,3 +8,65 @@
libakode_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries)
libakode_la_LIBADD = $(LIBPTHREAD) $(AKODE_LIBDL) $(LIBSEM)
+--- akode-2.0.2/configure.in.in.ORI 2013-05-19 23:25:31.450512262 +0200
++++ akode-2.0.2/configure.in.in 2013-05-19 23:25:37.156390421 +0200
+@@ -55,7 +55,7 @@
+
+ dnl without this order in this file, automake will be confused!
+ dnl
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+
+ dnl checks for programs.
+ dnl first check for c/c++ compilers
+--- akode-2.0.2/admin/configure.in.min~ 2013-05-19 23:35:21.532965131 +0200
++++ akode-2.0.2/admin/configure.in.min 2013-05-19 23:34:19.011289846 +0200
+@@ -41,7 +41,7 @@
+ KDE_SET_PREFIX
+
+ dnl generate the config header
+-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
++AC_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
+ AC_CHECK_COMPILERS
+--- akode-2.0.2/admin/cvs.sh.autotools 2007-01-15 10:06:45.000000000 +0100
++++ akode-2.0.2/admin/cvs.sh 2013-05-19 23:37:14.145581582 +0200
+@@ -68,7 +68,7 @@
+ echo "*** KDE requires automake $required_automake_version"
+ exit 1
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
+ echo "*** $AUTOMAKE_STRING found."
+ UNSERMAKE=no
+ ;;
+@@ -128,7 +128,7 @@
+ echo "*** Creating configure"
+ call_and_fix_autoconf
+
+-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
++if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
+ touch config.h.in
+@@ -184,7 +184,7 @@
+ fi
+ fi
+ $ACLOCAL $ACLOCALFLAGS
+-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
++if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
+ touch config.h.in
+--- akode-2.0.2/akode/configure.in.in.ORI 2013-05-19 23:39:02.874283156 +0200
++++ akode-2.0.2/akode/configure.in.in 2013-05-19 23:39:13.381061201 +0200
+@@ -2,7 +2,7 @@
+ dnl AC_OUTPUT(akode/akode-config)
+ dnl AC_OUTPUT(akode/akode.pc)
+
+-AM_CONFIG_HEADER(akode/lib/akode_export.h)
++AC_CONFIG_HEADER(akode/lib/akode_export.h)
+
+ AC_DEFUN([AC_CHECK_LIBFLAC],
+ [
diff --git a/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch
index 15e49692c..034caa068 100644
--- a/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch
+++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch
@@ -1,5 +1,5 @@
---- kasablanca-0.4.0.2/admin/cvs.sh.ORI 2011-12-04 15:24:44.405943353 +0100
-+++ kasablanca-0.4.0.2/admin/cvs.sh 2011-12-04 15:33:50.829581434 +0100
+--- kasablanca-0.4.0.2/admin/cvs.sh.autotools 2004-06-11 14:04:39.000000000 +0200
++++ kasablanca-0.4.0.2/admin/cvs.sh 2013-06-04 21:13:20.169314990 +0200
@@ -30,7 +30,7 @@
required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
@@ -23,10 +23,39 @@
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* ) : ;;
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.1[012]* ) : ;;
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.1[0-9]* ) : ;;
"" )
echo "*** AUTOMAKE NOT FOUND!."
echo "*** KDE requires automake $required_automake_version"
+@@ -122,7 +122,7 @@
+ echo "*** Creating configure"
+ call_and_fix_autoconf
+
+-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
+ fi
+@@ -176,7 +176,7 @@
+ fi
+ fi
+ $ACLOCAL $ACLOCALFLAGS
+-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
+ fi
+--- kasablanca-0.4.0.2/admin/configure.in.min.ORI 2013-06-04 21:14:53.495416780 +0200
++++ kasablanca-0.4.0.2/admin/configure.in.min 2013-06-04 21:15:00.293278499 +0200
+@@ -41,7 +41,7 @@
+ KDE_SET_PREFIX
+
+ dnl generate the config header
+-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
++AC_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
+ AC_CHECK_COMPILERS
--- kasablanca-0.4.0.2/admin/acinclude.m4.in.ORI 2011-12-04 15:37:05.013464315 +0100
+++ kasablanca-0.4.0.2/admin/acinclude.m4.in 2011-12-04 15:40:40.722904947 +0100
@@ -468,14 +468,14 @@
diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch b/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch
index 3f8ec4139..36ac3d807 100644
--- a/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch
+++ b/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch
@@ -1,11 +1,40 @@
---- kickoff-i18n-1.0/admin/cvs.sh.ORI 2012-08-03 21:16:36.104888893 +0200
-+++ kickoff-i18n-1.0/admin/cvs.sh 2012-08-03 21:16:54.488505909 +0200
+--- kickoff-i18n-1.0/admin/configure.in.min.ORI 2013-06-04 21:34:45.145197643 +0200
++++ kickoff-i18n-1.0/admin/configure.in.min 2013-06-04 21:34:54.004020422 +0200
+@@ -41,7 +41,7 @@
+ KDE_SET_PREFIX
+
+ dnl generate the config header
+-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
++AC_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
+ AC_CHECK_COMPILERS
+--- kickoff-i18n-1.0/admin/cvs.sh.automake 2007-01-15 10:06:45.000000000 +0100
++++ kickoff-i18n-1.0/admin/cvs.sh 2013-06-04 21:34:39.471311140 +0200
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
+@@ -128,7 +128,7 @@
+ echo "*** Creating configure"
+ call_and_fix_autoconf
+
+-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
+ touch config.h.in
+@@ -184,7 +184,7 @@
+ fi
+ fi
+ $ACLOCAL $ACLOCALFLAGS
+-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
+ touch config.h.in
diff --git a/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch b/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch
index 6cb76f8a3..04b393095 100644
--- a/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch
+++ b/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch
@@ -1,11 +1,31 @@
---- ksensors-0.7.3/admin/cvs.sh.ORI 2012-10-07 11:06:41.616636004 +0200
-+++ ksensors-0.7.3/admin/cvs.sh 2012-10-07 11:07:55.975129334 +0200
+--- ksensors-0.7.3/admin/cvs.sh.autotools 2013-06-04 21:59:18.325691011 +0200
++++ ksensors-0.7.3/admin/cvs.sh 2013-06-04 21:58:49.715264098 +0200
@@ -64,7 +64,7 @@
echo "*** KDE requires automake 1.6.1 or newer"
exit 1
;;
- automake*1.6.* | automake*1.7* ) : ;;
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* ) : ;;
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* ) : ;;
"" )
echo "*** AUTOMAKE NOT FOUND!."
echo "*** KDE requires automake 1.6.1 or newer"
+@@ -123,7 +123,7 @@
+ echo "*** Creating configure"
+ call_and_fix_autoconf
+
+-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
+ fi
+--- ksensors-0.7.3/admin/configure.in.min.ORI 2013-06-04 21:59:24.783561656 +0200
++++ ksensors-0.7.3/admin/configure.in.min 2013-06-04 21:59:33.526386508 +0200
+@@ -41,7 +41,7 @@
+ KDE_SET_PREFIX
+
+ dnl generate the config header
+-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
++AC_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
+ AC_CHECK_COMPILERS
diff --git a/redhat/extras/libkarma/karma-sharp.dll.config b/redhat/extras/libkarma/karma-sharp.dll.config
deleted file mode 100644
index 180d8b4fb..000000000
--- a/redhat/extras/libkarma/karma-sharp.dll.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<configuration>
- <dllmap dll="karma" target="libkarma.so.0" />
-</configuration> \ No newline at end of file
diff --git a/redhat/extras/libkarma/libkarma-0.1.2-fix_installation.patch b/redhat/extras/libkarma/libkarma-0.1.2-fix_installation.patch
deleted file mode 100644
index ef8b61fa1..000000000
--- a/redhat/extras/libkarma/libkarma-0.1.2-fix_installation.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- libkarma-0.1.2/karma-sharp/karma-sharp.pc.in.ORI 2012-08-03 13:00:49.786984296 +0200
-+++ libkarma-0.1.2/karma-sharp/karma-sharp.pc.in 2012-08-03 13:02:39.714283226 +0200
-@@ -1,8 +1,8 @@
- prefix=@prefix@
--exec_prefix=${prefix}
--libdir=${prefix}/lib
--includedir=${prefix}/include
--Libraries=${prefix}/lib/karma-sharp/karma-sharp.dll
-+exec_prefix=@prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+Libraries=${libdir}/karma-sharp/karma-sharp.dll
-
- Name: karma-sharp
- Description: karma-sharp - Library for interfacing with Rio Karma devices
---- libkarma-0.1.2/src/Makefile.ORI 2012-08-03 13:14:57.231632405 +0200
-+++ libkarma-0.1.2/src/Makefile 2012-08-03 13:16:05.653554314 +0200
-@@ -7,6 +7,7 @@
- INST_HEADERS=lkarma.h utf8.h
-
- LIBDIR=../lib
-+LIB=lib
-
- CC?=gcc
- AR?=ar
-@@ -37,19 +38,19 @@
- default: all
-
- install: shared-lib-stamp static-lib-stamp
-- ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/lib
-+ ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/$(LIB)
- ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include
- ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include/libkarma
-- ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(TARGET).a
-- ../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(OUT_VERSION)
-- $(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR)
-- $(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE)
-- $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR)
-- $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE)
-+ ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/$(LIB)/ $(LIBDIR)/$(TARGET).a
-+ ../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/$(LIB)/ $(LIBDIR)/$(OUT_VERSION)
-+ $(RM) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_MAJOR)
-+ $(RM) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_BASE)
-+ $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_MAJOR)
-+ $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_BASE)
- ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/include/libkarma/ $(INST_HEADERS)
-
- uninstall:
-- $(RM) $(PREFIX)/lib/$(TARGET).a $(PREFIX)/lib/$(OUT_MAJOR) $(PREFIX)/lib/$(OUT_BASE) $(PREFIX)/lib/$(OUT_VERSION)
-+ $(RM) $(PREFIX)/$(LIB)/$(TARGET).a $(PREFIX)/$(LIB)/$(OUT_MAJOR) $(PREFIX)/$(LIB)/$(OUT_BASE) $(PREFIX)/$(LIB)/$(OUT_VERSION)
- $(RM) -r $(PREFIX)/include/libkarma
-
- OBJS = $(SRCS:.c=.o)
---- libkarma-0.1.2/karma-sharp/Makefile.ORI 2012-08-03 13:21:02.657679440 +0200
-+++ libkarma-0.1.2/karma-sharp/Makefile 2012-08-03 13:21:07.144597685 +0200
-@@ -22,22 +22,23 @@
-
- karma-sharp.pc: FORCE
- sed -e 's,@prefix@,$(PREFIX),g; s,@VERSION@,$(VERSION),g' \
-+ -e 's,@libdir@,$(PREFIX)/$(LIB),g; s,@includedir@,$(PREFIX)/include,g;' \
- karma-sharp.pc.in > karma-sharp.pc
-
- ifdef HAS_MONO
- install: $(ASSEMBLY) karma-sharp.pc $(ASSEMBLY).config
-- ../install-sh -d $(DESTDIR)$(PREFIX)/lib/karma-sharp
-- ../install-sh -d $(DESTDIR)$(PREFIX)/lib/pkgconfig
-- ../install-sh -t $(DESTDIR)$(PREFIX)/lib/karma-sharp $(ASSEMBLY) $(ASSEMBLY).config
-- ../install-sh -t $(DESTDIR)$(PREFIX)/lib/pkgconfig -m 0644 karma-sharp.pc
-+ ../install-sh -d $(DESTDIR)$(PREFIX)/$(LIB)/karma-sharp
-+ ../install-sh -d $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
-+ ../install-sh -t $(DESTDIR)$(PREFIX)/$(LIB)/karma-sharp $(ASSEMBLY) $(ASSEMBLY).config
-+ ../install-sh -t $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig -m 0644 karma-sharp.pc
- else
- install:
-
- endif
-
- uninstall: FORCE
-- $(RM) -r $(PREFIX)/lib/karma-sharp
-- $(RM) $(PREFIX)/lib/pkgconfig/karma-sharp.pc
-+ $(RM) -r $(PREFIX)/$(LIB)/karma-sharp
-+ $(RM) $(PREFIX)/$(LIB)/pkgconfig/karma-sharp.pc
-
- $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES)
- $(MCS) $(MCS_FLAGS) -unsafe -target:library -out:$@ $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES:%=-resource:%) -r:Mono.Posix
diff --git a/redhat/extras/libkarma/libkarma-0.1.2.tar.gz b/redhat/extras/libkarma/libkarma-0.1.2.tar.gz
deleted file mode 100644
index 3060acf72..000000000
--- a/redhat/extras/libkarma/libkarma-0.1.2.tar.gz
+++ /dev/null
Binary files differ
diff --git a/redhat/extras/libkarma/multimedia-player-rio-karma.png b/redhat/extras/libkarma/multimedia-player-rio-karma.png
deleted file mode 100644
index 79cc980ad..000000000
--- a/redhat/extras/libkarma/multimedia-player-rio-karma.png
+++ /dev/null
Binary files differ
diff --git a/redhat/extras/libkarma/preferences.fdi b/redhat/extras/libkarma/preferences.fdi
deleted file mode 100644
index 7e1021711..000000000
--- a/redhat/extras/libkarma/preferences.fdi
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
- <device>
- <match key="info.udi" string="/org/freedesktop/Hal/devices/storage_serial_Rio_Rio_Karma_0000000000000000">
- <merge key="storage.policy.should_mount" type="bool">true</merge>
- <merge key="storage.policy.is_removable" type="bool">true</merge>
- <merge key="storage.policy.default.mount_root" type="string">/media</merge>
- </match>
-</device>
-
-<device>
- <match key="info.udi" string="/org/freedesktop/Hal/devices/volume_part2_size_19919976960">
- <merge key="volume.policy.desired_mount_point" type="string">karma</merge>
- <merge key="volume.policy.mount_filesystem" type="string">omfs</merge>
- </match>
-</device>
-</deviceinfo>
-
diff --git a/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch b/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch
index 0d3190cef..0523b9e9d 100644
--- a/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch
+++ b/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch
@@ -1,11 +1,40 @@
---- ia_ora-kde-1.0.8/admin/cvs.sh.ORI 2012-08-03 22:52:42.259238606 +0200
-+++ ia_ora-kde-1.0.8/admin/cvs.sh 2012-08-03 22:52:49.735803751 +0200
+--- ia_ora-kde-1.0.8/admin/configure.in.min.ORI 2013-06-04 22:06:43.320769735 +0200
++++ ia_ora-kde-1.0.8/admin/configure.in.min 2013-06-04 22:06:49.748640759 +0200
+@@ -41,7 +41,7 @@
+ KDE_SET_PREFIX
+
+ dnl generate the config header
+-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
++AC_CONFIG_HEADER(config.h) dnl at the distribution this done
+
+ dnl Checks for programs.
+ AC_CHECK_COMPILERS
+--- ia_ora-kde-1.0.8/admin/cvs.sh.automake11 2007-08-23 21:48:58.000000000 +0200
++++ ia_ora-kde-1.0.8/admin/cvs.sh 2013-06-04 22:06:38.413868181 +0200
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* )
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* )
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* )
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
+@@ -128,7 +128,7 @@
+ echo "*** Creating configure"
+ call_and_fix_autoconf
+
+-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
+ touch config.h.in
+@@ -184,7 +184,7 @@
+ fi
+ fi
+ $ACLOCAL $ACLOCALFLAGS
+-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+ echo "*** Creating config.h template"
+ $AUTOHEADER || exit 1
+ touch config.h.in
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
index bf099f4a2..f3cb8e34f 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
@@ -3,18 +3,21 @@ name=trinity-3.5.13
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
enabled=1
-gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
[trinity-3.5.13-noarch]
name=trinity-3.5.13-noarch
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
enabled=1
-gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
[trinity-3.5.13-source]
name=trinity-3.5.13-source
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
enabled=0
-gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
index 6f8312cdd..c3450eaed 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
@@ -3,18 +3,21 @@ name=trinity-3.5.13
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
enabled=1
-gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
[trinity-3.5.13-noarch]
name=trinity-3.5.13-noarch
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
enabled=1
-gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
[trinity-3.5.13-source]
name=trinity-3.5.13-noarch
#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
enabled=0
-gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-20 16:35:18 +0000