a8f65b55 | 2014-09-20 16:23:49 | François Andriot |
RPM Packaging: update ia_ora |
||
A redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec R redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch R redhat/extras/style-ia-ora/ia_ora-1.08-fix_trinity_directories.patch R redhat/extras/style-ia-ora/ia_ora-kde-1.0.8.tar.bz2 R redhat/extras/style-ia-ora/style-ia-ora-1.0.8.tar.gz R redhat/extras/style-ia-ora/style-ia-ora-3.5.13.1.spec R redhat/extras/style-ia-ora/style-ia-ora-3.5.13.2.spec R redhat/extras/style-ia-ora/style-ia-ora-3.5.13.spec |
||
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 deleted file mode 100644 index 0523b9e..0000000 --- a/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- 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[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/style-ia-ora/ia_ora-1.08-fix_trinity_directories.patch b/redhat/extras/style-ia-ora/ia_ora-1.08-fix_trinity_directories.patch deleted file mode 100644 index ecc9fa7..0000000 --- a/redhat/extras/style-ia-ora/ia_ora-1.08-fix_trinity_directories.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- ia_ora-kde-1.0.8/admin/acinclude.m4.in.trinity 2007-08-09 20:02:44.000000000 +0200 -+++ ia_ora-kde-1.0.8/admin/acinclude.m4.in 2012-08-04 00:32:21.839347500 +0200 -@@ -428,7 +428,7 @@ - if test "$1" = "default"; then - - if test -z "$kde_htmldir"; then -- kde_htmldir='\${datadir}/doc/HTML' -+ kde_htmldir='%{tde_tdedocdir}/HTML' - fi - if test -z "$kde_appsdir"; then - kde_appsdir='\${datadir}/applnk' -@@ -479,14 +479,14 @@ - if test "$kde_qtver" = "2"; then - kde_moduledir='\${libdir}/kde2' - else -- kde_moduledir='\${libdir}/kde3' -+ kde_moduledir='\${libdir}/trinity' - fi - fi - if test -z "$kde_styledir"; then -- kde_styledir='\${libdir}/kde3/plugins/styles' -+ kde_styledir='\${libdir}/trinity/plugins/styles' - fi - if test -z "$kde_widgetdir"; then -- kde_widgetdir='\${libdir}/kde3/plugins/designer' -+ kde_widgetdir='\${libdir}/trinity/plugins/designer' - fi - if test -z "$xdg_appsdir"; then - xdg_appsdir='\${datadir}/applications/kde' -@@ -546,7 +546,7 @@ - - AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], - [ -- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" -+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then - kde_save_IFS=$IFS -@@ -612,7 +612,7 @@ - KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) - - if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then -- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" -+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" - AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) - if test "$KDE_XSL_STYLESHEET" = "NO"; then -@@ -1793,7 +1793,7 @@ - - if test -z "$1"; then - --kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/trinity/include/kde /opt/kde/include $x_includes $qt_includes" - test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" - kde_incdirs="$ac_kde_includes $kde_incdirs" - AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) -@@ -1805,7 +1805,7 @@ - So, check this please and use another prefix!]) - fi - --kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" - test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" - kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" - AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) -@@ -1813,7 +1813,7 @@ - - kde_widgetdir=NO - dnl this might be somewhere else --AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) -+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) - - if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then - AC_MSG_ERROR([ -@@ -1821,14 +1821,14 @@ - So, check this please and use another prefix!]) - fi - --if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then -+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then - AC_MSG_ERROR([ - I can't find the designer plugins. These are required and should have been installed - by kdelibs]) - fi - - if test -n "$kde_widgetdir"; then -- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" -+ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" - fi - - diff --git a/redhat/extras/style-ia-ora/ia_ora-kde-1.0.8.tar.bz2 b/redhat/extras/style-ia-ora/ia_ora-kde-1.0.8.tar.bz2 deleted file mode 100644 index bd3319b..0000000 --- a/redhat/extras/style-ia-ora/ia_ora-kde-1.0.8.tar.bz2 +++ /dev/null Binary files differ diff --git a/redhat/extras/style-ia-ora/style-ia-ora-1.0.8.tar.gz b/redhat/extras/style-ia-ora/style-ia-ora-1.0.8.tar.gz deleted file mode 100644 index e69de29..0000000 --- a/redhat/extras/style-ia-ora/style-ia-ora-1.0.8.tar.gz +++ /dev/null diff --git a/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec b/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec new file mode 100644 index 0000000..bdf0098 --- /dev/null +++ b/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec @@ -0,0 +1,116 @@ +# Default version for this component +%define tde_pkg style-ia-ora +%define tde_version 14.0.0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{tde_pkg} +Summary: Mandriva theme for TDE - Widget design +Version: 1.0.8 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} + +License: GPL +Group: Environment/Desktop +URL: http://www.mandrivalinux.com/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{tde_pkg}-%{tde_version}.tar.gz + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} + +Requires: trinity-twin + +%description +Mandriva theme for Trinity + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n ia_ora-kde-%{version} + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + --libdir=%{tde_libdir} \ + \ + --enable-rpath \ + --enable-closure \ + --disable-dependency-tracking \ + --enable-new-ldflags \ + --enable-final \ + --enable-shared \ + --disable-static + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{?buildroot} + ** Diff limit reached (max: 250 lines) ** |
||
acd3a19e | 2014-09-29 10:29:31 | François Andriot |
RPM Packaging: add cmake macro |
||
A redhat/applications/ksensors/ksensors-3.5.13.2.spec A redhat/extras/trinity-cmake-macros/macros.cmake R redhat/macros.cmake |
||
** Diff limit reached (max: 250 lines) ** |
||
48595f73 | 2014-09-29 10:31:31 | François Andriot |
RPM Packaging: update build script |
||
M redhat/Makefile.r14 |
||
** Diff limit reached (max: 250 lines) ** |
||
6c6b5d78 | 2014-09-29 10:33:17 | François Andriot |
RPM packaging: update TQT3 |
||
M redhat/dependencies/tqt3/tqt3-14.0.0.spec |
||
** Diff limit reached (max: 250 lines) ** |
||
fc5d3c8d | 2014-10-01 12:58:43 | François Andriot |
RPM Packaging: updates |
||
M redhat/applications/kpilot/kpilot-14.0.0.spec M redhat/build/get_rpm_package_name.sh M redhat/dependencies/tqt3/tqt3-14.0.0.spec M redhat/tdelibs/tdelibs-14.0.0.spec M redhat/tdewebdev/tdewebdev-14.0.0.spec |
||
** Diff limit reached (max: 250 lines) ** |
||
cd987458 | 2014-10-01 13:01:06 | François Andriot |
merge |
||
A redhat/dependencies/tqt3/assistant-tqt3.desktop A redhat/dependencies/tqt3/build-examples.sh A redhat/dependencies/tqt3/designer-tqt3.desktop A redhat/dependencies/tqt3/linguist-tqt3.desktop A redhat/dependencies/tqt3/tqt3config.desktop A redhat/extras/trinity-cmake-macros/trinity-cmake-macros.spec M debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff M debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdelibs/debian/rules M debian/lenny/tdelibs/debian/tdelibs14-trinity-dev.install M debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdeutils/debian/rules M debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff M debian/squeeze/applications/kopete-otr/debian/control M debian/squeeze/applications/tde-guidance/debian/rules M debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install M debian/squeeze/dependencies/python-tqt/debian/rules M debian/squeeze/dependencies/sip4-tqt/debian/rules M debian/squeeze/libraries/python-trinity/debian/rules M debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdelibs/debian/rules M debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install M debian/squeeze/tdelibs/debian/tdelibs14-trinity-dev.install M debian/squeeze/tdelibs/debian/tdelibs14-trinity.install M debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdeutils/debian/rules M debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff M redhat/Makefile.r14 M redhat/build/build_rpm_package.sh M redhat/build/get_installed_package_version.sh M redhat/build/get_latest_built_package_filename.sh M redhat/build/get_rpm_package_name.sh M redhat/dependencies/arts/arts-14.0.0.spec M redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec M redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec M redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec M redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec M redhat/dependencies/tqt3/tqt3-14.0.0.spec M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec M redhat/packages.el6 M redhat/tdelibs/tdelibs-14.0.0.spec M redhat/tdewebdev/kdewebdev-3.5.13.1.spec M redhat/tdewebdev/kdewebdev-3.5.13.spec M redhat/tdewebdev/tdewebdev-14.0.0.spec M redhat/tdewebdev/tdewebdev-3.5.13.2.spec M ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff M ubuntu/maverick/applications/kopete-otr/debian/control M ubuntu/maverick/applications/tde-guidance/debian/rules M ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install M ubuntu/maverick/dependencies/python-tqt/debian/rules M ubuntu/maverick/dependencies/sip4-tqt/debian/rules M ubuntu/maverick/libraries/python-trinity/debian/rules M ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdelibs/debian/rules M ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install M ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install M ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install M ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeutils/debian/rules M ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff R redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch |
||
** Diff limit reached (max: 250 lines) ** |
||
cfd45638 | 2014-10-01 13:09:15 | François Andriot |
RPM Packaging: updates |
||
M redhat/Makefile.v3.5.13-sru M redhat/applications/basket/basket-14.0.0.spec M redhat/build/get_latest_tarball_filename.sh M redhat/build/get_specfile.sh M redhat/buildenv.sh M redhat/dependencies/tqt3/tqt3-14.0.0.spec M redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch M redhat/tde-i18n/tde-i18n-14.0.0-updates.patch |
||
** Diff limit reached (max: 250 lines) ** |