From 7336aed1c1722594a8e8ead94d7d1fec8e578743 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 4 Aug 2012 00:44:55 +0200 Subject: RHEL/Fedora: adds 'style-ia-ora' in 'extras' --- .../ia_ora-1.08-fix_automake_detection.patch | 11 + .../ia_ora-1.08-fix_trinity_directories.patch | 91 +++++++ .../extras/style-ia-ora/ia_ora-kde-1.0.8.tar.bz2 | Bin 0 -> 426023 bytes .../extras/style-ia-ora/style-ia-ora-1.0.8.tar.gz | 0 .../extras/style-ia-ora/trinity-style-ia-ora.spec | 274 +++++++++++++++++++++ 5 files changed, 376 insertions(+) create mode 100644 redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch create mode 100644 redhat/extras/style-ia-ora/ia_ora-1.08-fix_trinity_directories.patch create mode 100644 redhat/extras/style-ia-ora/ia_ora-kde-1.0.8.tar.bz2 create mode 100644 redhat/extras/style-ia-ora/style-ia-ora-1.0.8.tar.gz create mode 100644 redhat/extras/style-ia-ora/trinity-style-ia-ora.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 new file mode 100644 index 000000000..dcde642e3 --- /dev/null +++ b/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch @@ -0,0 +1,11 @@ +--- 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 +@@ -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[01]* ) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; 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 new file mode 100644 index 000000000..ecc9fa790 --- /dev/null +++ b/redhat/extras/style-ia-ora/ia_ora-1.08-fix_trinity_directories.patch @@ -0,0 +1,91 @@ +--- 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 new file mode 100644 index 000000000..bd3319b7d Binary files /dev/null and b/redhat/extras/style-ia-ora/ia_ora-kde-1.0.8.tar.bz2 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 new file mode 100644 index 000000000..e69de29bb diff --git a/redhat/extras/style-ia-ora/trinity-style-ia-ora.spec b/redhat/extras/style-ia-ora/trinity-style-ia-ora.spec new file mode 100644 index 000000000..430a1383a --- /dev/null +++ b/redhat/extras/style-ia-ora/trinity-style-ia-ora.spec @@ -0,0 +1,274 @@ +# 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 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_datadir %{tde_prefix}/share +%define tde_doc %{tde_datadir}/doc + +%define _docdir %{tde_docdir} +%define tde_tdelibdir %{tde_libdir}/trinity + + +Summary: Mandriva theme for TDE - Widget design +Name: trinity-style-ia-ora +Version: 1.0.8 +Release: 1%{?dist}%{?_variant} +License: GPL +Group: Environment/Desktop +URL: http://www.mandrivalinux.com/ + +Source0: ia_ora-kde-%{version}.tar.bz2 + +# [ia_ora] Fix automake 1.11 detection +Patch1: ia_ora-1.08-fix_automake_detection.patch +# [ia_ora] Fix trinity directories detection +Patch2: ia_ora-1.08-fix_trinity_directories.patch + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel + +Requires: trinity-twin + +%description +Mandriva theme for Trinity + +%prep +%setup -q -n ia_ora-kde-%{version} +%patch1 -p1 -b .automake11 +%patch2 -p1 -b .trinity + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__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" cvs + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --disable-rpath \ + --enable-closure \ + --disable-dependency-tracking \ + --enable-new-ldflags \ + --enable-final \ + --enable-shared \ + --disable-static \ + --with-extra-includes=%{tde_includedir}/tqt + +%__make %{?_smp_mflags} LIBTOOL=$(which libtool) + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{?buildroot} + +# Removes useless files +%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a +%__rm -f %{?buildroot}%{tde_tdelibdir}/plugins/styles/*.a + +%clean +%__rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%{tde_tdelibdir}/kwin3_iaora.la +%{tde_tdelibdir}/kwin3_iaora.so +%{tde_tdelibdir}/kwin_iaora_config.la +%{tde_tdelibdir}/kwin_iaora_config.so +%{tde_tdelibdir}/plugins/styles/ia_ora.la +%{tde_tdelibdir}/plugins/styles/ia_ora.so +%{tde_datadir}/apps/kstyle/themes/ia_ora.themerc +%{tde_datadir}/apps/kwin/iaora.desktop + + + + +%changelog +* Fri Aug 03 2012 Francois Andriot - 1.0.8-1 +- Initial version for TDE 3.5.13 + +* Fri Aug 05 2011 Andrey Bondrov 1.0.8-9mib2011.0 +- Port to 2011 + +* Sat Jul 10 2010 Andrey Bondrov 1.0.8-8mib2010.1 +- Rebuild for MIB users + +* Sun Nov 22 2009 Atilla ÖNTAŞ 1.0.8-8mvt2010.0 +- Rename package to avoid unwanted KDE4 upgrade +- Merge packages in one kde-style package +- Fix package group in spec file + +* Tue Nov 17 2009 Tim Williams 1.0.8-7mdv2010.0 ++ Rebuild for MDV 2010.0 + +* Thu Mar 26 2009 Helio Chissini de Castro 1.0.8-6mdv2009.1 ++ Revision: 361404 +- Bump to rebuild against cooker + +* Tue Nov 18 2008 Thierry Vignaud 1.0.8-5mdv2009.1 ++ Revision: 304189 +- rebuild for new xcb + +* Wed Aug 06 2008 Thierry Vignaud 1.0.8-4mdv2009.0 ++ Revision: 264680 +- rebuild early 2009.0 package (before pixel changes) + +* Thu May 08 2008 Helio Chissini de Castro 1.0.8-2mdv2009.0 ++ Revision: 204689 +- Move to /opt + +* Wed Feb 27 2008 Gustavo Pichorim Boiko 1.0.8-1mdv2008.1 ++ Revision: 175799 +- New release (1.0.8): + * Fix drawing of buttons when using mandriva color schemes + * Update color scheme names to match the new ones + +* Tue Feb 19 2008 Gustavo Pichorim Boiko 1.0.7-1mdv2008.1 ++ Revision: 173100 +- new release (1.0.7) fixing some drawing issues on applications that don't use + standard background colors (#33502) + +* Thu Jan 03 2008 Oden Eriksson 1.0.6-2mdv2008.1 ++ Revision: 141786 +- rebuilt against openldap-2.4.7 libs + + + Olivier Blin + - restore BuildRoot + + + Thierry Vignaud + - kill re-definition of %%buildroot on Pixel's request + +* Wed Sep 12 2007 Gustavo Pichorim Boiko 1.0.6-1mdv2008.0 ++ Revision: 84626 +- new release: 1.0.6: + * Use the right color for the bottom line of menubar + * Remove some lines that were causing double borders at menubar and toolbar + ends + * Fix the bottom of toolbars: it was being drawn using the wrong color + * Use a flat background for status bars + * Add a minimum size for the scrollbar handle +- new release: 1.0.5 + * Use the widget style in all separators (#33260) + * Fixed popup menu item drawing on menus that have titles (#33287) + +* Thu Sep 06 2007 Gustavo Pichorim Boiko 1.0.4-1mdv2008.0 ++ Revision: 81272 +- new version: 1.0.4 + * Restore the old color themes (as they will be kept as alternatives) + * Properly mask the rounded borders and properly draw the region previously + masked + * Create fake rounded corners on menu items + * Reduced the button margin to get normal sized buttons (not giant ones) + * Make it possible to resize windows by the top border +------------------------------------------------------------------------ + r227235 | boiko | 2007-09-06 13:58:18 -0300 (Qui, 06 Set 2007) | 3 lines + +* Wed Sep 05 2007 Gustavo Pichorim Boiko 1.0.3-1mdv2008.0 ++ Revision: 80378 +- new release: 1.0.3 + * Implement highligh on hovering controls + * Threat scrollbar buttons as buttons (showing them lowered when the button + is pressed for example) + * Show the combo box button as pressed when the list is opened + * Removed Powerpack+ colors + * Changed Discovery/One to just One and adjusted colors + * Used more sane values when using ia_ora together with other KDE color + schemes +- new release: + * fix gradient colors of menus (thanks Frederic Crozat for pointing that) + * implement correctly the combo box drawing according to the ia_ora spec + * Fix the text color of menubar items + +* Thu Aug 23 2007 Gustavo Pichorim Boiko 1.0.1-1mdv2008.0 ++ Revision: 70685 +- new version: 1.0.1 + * Replace the gradient code by the Plastik one (it is better written) + * Fix drawing of menubar items and popupmenu items (#30659) + +* Mon Jun 11 2007 Nicolas Lécureuil 1.0-18mdv2008.0 ++ Revision: 38004 +- REBUILD + + +* Thu Mar 22 2007 Laurent Montel 1.0-17mdv2007.1 ++ Revision: 147929 +- Fix theme + +* Mon Mar 19 2007 Laurent Montel 1.0-16mdv2007.1 ++ Revision: 146479 +- Fix progressbar text color + +* Wed Mar 07 2007 Laurent Montel 1.0-15mdv2007.1 ++ Revision: 134563 +- Fix style + +* Tue Mar 06 2007 Laurent Montel 1.0-14mdv2007.1 ++ Revision: 133854 +- New update + +* Wed Feb 28 2007 Laurent Montel 1.0-13mdv2007.1 ++ Revision: 127097 +- New update + +* Wed Jan 24 2007 Laurent Montel 1.0-12mdv2007.1 ++ Revision: 112737 +- Fix theme + +* Tue Jan 02 2007 Laurent Montel 1.0-11mdv2007.1 ++ Revision: 103350 +- Update tarball + +* Mon Dec 11 2006 Laurent Montel 1.0-10mdv2007.1 ++ Revision: 94696 +- Rename spec file name too +- Rename ia_ora to ia_ora-kde + Fix a lot of bug +- Import ia_ora-kde + +* Sat Sep 16 2006 Laurent MONTEL 1.0-9 +- Fix title bar + +* Thu Sep 14 2006 Laurent MONTEL 1.0-8 +- Fix handle + +* Thu Sep 14 2006 Laurent MONTEL 1.0-7 +- Fix toolbar color + +* Thu Sep 14 2006 Laurent MONTEL 1.0-6 +- Fix Combobox/Scrollbar/Checkbox and bidi mode + +* Tue Sep 12 2006 Laurent MONTEL 1.0-5 +- Fix tabbar + +* Tue Sep 12 2006 Laurent MONTEL 1.0-4 +- Fix scrollbar + +* Sun Sep 10 2006 Laurent MONTEL 1.0-3 +- Improve style + +* Fri Sep 08 2006 Laurent MONTEL 1.0-2 +- Some fixes + +* Tue Sep 05 2006 Laurent MONTEL 1.0-1 +- Initial package + -- cgit v1.2.1