From b566058ccb7fa94c6e34fb1e1349b093d4482d6a Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 3 Jan 2013 20:17:46 +0100 Subject: RPM packaging: lots of updates --- .../kasablanca/trinity-kasablanca-3.5.13.1.spec | 1 - .../extras/kdebluetooth/trinity-kdebluetooth.spec | 6 +- redhat/extras/theme-baghira/baghira-0.8.tar.bz2 | Bin 0 -> 916658 bytes .../theme-baghira/baghira-3.5.13.1-fix_ftbfs.patch | 140 ++++++++++++++ redhat/extras/theme-baghira/theme-baghira.tar.gz | 0 .../theme-baghira/trinity-theme-baghira.spec | 204 +++++++++++++++++++++ 6 files changed, 347 insertions(+), 4 deletions(-) create mode 100644 redhat/extras/theme-baghira/baghira-0.8.tar.bz2 create mode 100644 redhat/extras/theme-baghira/baghira-3.5.13.1-fix_ftbfs.patch create mode 100644 redhat/extras/theme-baghira/theme-baghira.tar.gz create mode 100644 redhat/extras/theme-baghira/trinity-theme-baghira.spec (limited to 'redhat/extras') diff --git a/redhat/extras/kasablanca/trinity-kasablanca-3.5.13.1.spec b/redhat/extras/kasablanca/trinity-kasablanca-3.5.13.1.spec index 5cd2ae5aa..effbdeefa 100644 --- a/redhat/extras/kasablanca/trinity-kasablanca-3.5.13.1.spec +++ b/redhat/extras/kasablanca/trinity-kasablanca-3.5.13.1.spec @@ -87,7 +87,6 @@ Kasablanca is an ftp client, among its features are currently: unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - export KDEDIR=%{tde_prefix} ## Needed(?) for older/legacy setups, harmless otherwise diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec index 69360204b..27bac51d2 100644 --- a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec +++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec @@ -106,7 +106,7 @@ KDE Bluetooth framework development libraries and headers. %patch3 -p1 -b .gcc46 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%patch4 -p1 -b .bluez4 +#patch4 -p1 -b .bluez4 %endif %patch11 -p1 @@ -120,6 +120,7 @@ KDE Bluetooth framework development libraries and headers. # 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|include/kde|include/tde|g" \ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" @@ -128,10 +129,9 @@ KDE Bluetooth framework development libraries and headers. %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - export KDEDIR=%{tde_prefix} # FIXME: dbus-tqt headers are not found without this ... diff --git a/redhat/extras/theme-baghira/baghira-0.8.tar.bz2 b/redhat/extras/theme-baghira/baghira-0.8.tar.bz2 new file mode 100644 index 000000000..e6549b4ae Binary files /dev/null and b/redhat/extras/theme-baghira/baghira-0.8.tar.bz2 differ diff --git a/redhat/extras/theme-baghira/baghira-3.5.13.1-fix_ftbfs.patch b/redhat/extras/theme-baghira/baghira-3.5.13.1-fix_ftbfs.patch new file mode 100644 index 000000000..f9a78a566 --- /dev/null +++ b/redhat/extras/theme-baghira/baghira-3.5.13.1-fix_ftbfs.patch @@ -0,0 +1,140 @@ +--- baghira-0.8/bab/main.cpp.ORI 2012-11-20 19:33:04.093794934 +0100 ++++ baghira-0.8/bab/main.cpp 2012-11-20 19:33:08.022717622 +0100 +@@ -330,7 +330,7 @@ + delete config; + } + +-QPoint *BabSwitcher::globalPos = new QPoint::QPoint(0,0); ++QPoint *BabSwitcher::globalPos = new QPoint(0,0); + + BabSwitcher::BabSwitcher(bab *parent, const char *name) + : KSystemTray(parent,name), DCOPObject("babInterface") { +--- baghira-0.8/bab/Makefile.am.ORI 2012-11-20 19:34:26.540172464 +0100 ++++ baghira-0.8/bab/Makefile.am 2012-11-20 19:34:35.265000752 +0100 +@@ -19,4 +19,4 @@ + # the application source, library search path, and link libraries + bab_SOURCES = main.cpp styleconfdialog.cpp bab_iface.skel + bab_LDFLAGS = $(KDE_RPATH) $(all_libraries) +-bab_LDADD = $(LIB_KDEUI) ++bab_LDADD = $(LIB_KDEUI) $(LIB_QT) +--- baghira-0.8/config/generatePixmaps.sh.OLD 2012-11-20 19:53:24.431860823 +0100 ++++ baghira-0.8/config/generatePixmaps.sh 2012-11-20 19:53:47.753402165 +0100 +@@ -1,7 +1,7 @@ + #!/bin/sh + top_srcdir="${1:-../..}" + imagebase="$top_srcdir/imagebase" +-UIC=$(grep "UIC = " ../Makefile | cut -f3- -d" ") ++UIC=$QTDIR/bin/uic + echo -e "#ifndef SCPIXMAPS_H\n#define SCPIXMAPS_H\n" > pixmaps.h + $UIC -embed baghira \ + $imagebase/button-base \ +--- baghira-0.8/config/Makefile.am.ORI 2012-11-20 19:55:33.699318284 +0100 ++++ baghira-0.8/config/Makefile.am 2012-11-20 19:55:37.841236807 +0100 +@@ -7,7 +7,7 @@ + + kstyle_baghira_config_la_SOURCES = kstyle_baghira_config.cpp colordialog.cpp colorpicker.cpp configdialog.ui help.ui about.ui + # kstyle_baghira_config_la_METASOURCES = AUTO +-kstyle_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) ++kstyle_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) -lDCOP + kstyle_baghira_config_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_PLUGIN) + + +--- baghira-0.8/deco/config/generatePixmaps.sh.ORI 2012-11-20 19:59:34.835573683 +0100 ++++ baghira-0.8/deco/config/generatePixmaps.sh 2012-11-20 19:59:45.590362018 +0100 +@@ -1,7 +1,7 @@ + #!/bin/sh + top_srcdir="${1:-../..}" + imagebase="$top_srcdir/imagebase" +-UIC=$(grep "UIC = " ../../Makefile | cut -f3- -d" ") ++UIC=$QTDIR/bin/uic + echo -e "#ifndef DCPIXMAPS_H\n#define DCPIXMAPS_H\n" > pixmaps.h + $UIC -embed baghira \ + $imagebase/icon_help \ +--- baghira-0.8/deco/config/Makefile.am.ORI 2012-11-20 20:00:37.549339366 +0100 ++++ baghira-0.8/deco/config/Makefile.am 2012-11-20 20:00:50.370087013 +0100 +@@ -9,7 +9,7 @@ + kde_module_LTLIBRARIES = kwin_baghira_config.la + kwin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui + kwin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +-kwin_baghira_config_la_LIBADD = $(LIB_KDEUI) ++kwin_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) + kwin_baghira_config_la_METASOURCES = AUTO + + DISTCLEANFILES = $(kwin_baghira_config_la_METASOURCES) +--- baghira-0.8/deco/generatePixmaps.sh.ORI 2012-11-20 20:03:20.543131500 +0100 ++++ baghira-0.8/deco/generatePixmaps.sh 2012-11-20 20:03:29.464956023 +0100 +@@ -1,7 +1,7 @@ + #!/bin/sh + top_srcdir="${1:-../..}" + imagebase="$top_srcdir/imagebase" +-UIC=$(grep "UIC = " ../Makefile | cut -f3- -d" ") ++UIC=$QTDIR/bin/uic + echo -e "#ifndef DPIXMAPS_H\n#define DPIXMAPS_H\n" > pixmaps.h + $UIC -embed baghira \ + $imagebase/brushed-gradient \ +--- baghira-0.8/deco/Makefile.am.ORI 2012-11-20 20:04:20.899944322 +0100 ++++ baghira-0.8/deco/Makefile.am 2012-11-20 20:04:44.230485387 +0100 +@@ -16,7 +16,7 @@ + kde_module_LTLIBRARIES = kwin3_baghira.la + kwin3_baghira_la_SOURCES = baghiraclient.cc + kwin3_baghira_la_LIBADD = $(kde_libraries)/libkdecorations.la +-kwin3_baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -module ++kwin3_baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -module + kwin3_baghira_la_METASOURCES = AUTO + + DISTCLEANFILES = $(kwin3_baghira_la_METASOURCES) +--- baghira-0.8/sessionapplet/dmctl.cpp~ 2005-07-11 21:23:58.000000000 +0200 ++++ baghira-0.8/sessionapplet/dmctl.cpp 2012-11-20 20:16:58.925023092 +0100 +@@ -37,7 +37,7 @@ + + DM::DM() : fd( -1 ) + { +- char *ptr; ++ const char *ptr; + struct sockaddr_un sa; + + if (DMType == Dunno) { +--- baghira-0.8/style/generatePixmaps.sh.ORI 2012-11-20 20:20:08.024297835 +0100 ++++ baghira-0.8/style/generatePixmaps.sh 2012-11-20 20:20:22.149019999 +0100 +@@ -1,7 +1,7 @@ + #!/bin/sh + top_srcdir="${1:-../..}" + imagebase="$top_srcdir/imagebase" +-UIC=$(grep "UIC = " ../Makefile | cut -f3- -d" ") ++UIC=$QTDIR/bin/uic + echo -e "#ifndef SPIXMAPS_H\n#define SPIXMAPS_H\n" > pixmaps.h + $UIC -embed baghira \ + $imagebase/brushed-gradient \ +--- baghira-0.8/style/Makefile.am.ORI 2012-11-20 20:21:23.703809116 +0100 ++++ baghira-0.8/style/Makefile.am 2012-11-20 20:21:34.795590907 +0100 +@@ -5,7 +5,7 @@ + METASOURCES = AUTO + kde_style_LTLIBRARIES = baghira.la + baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +-baghira_la_LIBADD = -lkdefx -lXtst $(LIB_KDEUI) ++baghira_la_LIBADD = -lkdefx -lXtst $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) + baghira_la_SOURCES = baghira.cpp optionHandler.cpp polish.cpp utils.cpp + lnkdir = $(kde_datadir)/kstyle/themes + lnk_DATA = baghira.themerc +--- baghira-0.8/kickermenu/Makefile.am.ORI 2012-11-20 20:23:35.843209238 +0100 ++++ baghira-0.8/kickermenu/Makefile.am 2012-11-20 20:23:41.101105774 +0100 +@@ -9,7 +9,7 @@ + b_menu_panelapplet_la_METASOURCES = AUTO + + b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +-b_menu_panelapplet_la_LIBADD = $(LIB_KDEUI) ++b_menu_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP + + messages: + $(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot +--- baghira-0.8/sidebar/Makefile.am.ORI 2012-11-20 20:25:55.797454906 +0100 ++++ baghira-0.8/sidebar/Makefile.am 2012-11-20 20:26:05.393266033 +0100 +@@ -7,7 +7,7 @@ + + konqsidebar_baghirasidebar_la_SOURCES = baghiralinkdrag.cpp baghirasidebar.cpp linkview.cpp listboxlink.cpp dndlistbox.cpp linkconfig.ui baghirasidebariface.skel + konqsidebar_baghirasidebar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin +-konqsidebar_baghirasidebar_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ++konqsidebar_baghirasidebar_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) + + baghirasidebar_entry_DATA = baghirasidebar.desktop + baghirasidebar_entrydir = $(kde_datadir)/konqsidebartng/entries diff --git a/redhat/extras/theme-baghira/theme-baghira.tar.gz b/redhat/extras/theme-baghira/theme-baghira.tar.gz new file mode 100644 index 000000000..e69de29bb diff --git a/redhat/extras/theme-baghira/trinity-theme-baghira.spec b/redhat/extras/theme-baghira/trinity-theme-baghira.spec new file mode 100644 index 000000000..78d77eed8 --- /dev/null +++ b/redhat/extras/theme-baghira/trinity-theme-baghira.spec @@ -0,0 +1,204 @@ +# 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 + +# Speed build options +%define debug_package %{nil} +%define __spec_install_post %{nil} +AutoReq: no + +# TDE 3.5.13 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_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + +Name: trinity-theme-baghira +Version: 0.8 +Release: 1%{?dist}%{?_variant} +Summary: Baghira theme for Trinity +License: GPL +Group: Graphical desktop/KDE +Source0: http://prdownloads.sourceforge.net/baghira/baghira-%{version}.tar.bz2 +Source1: admin-3.5.13.1.tar.gz +Patch0: baghira-3.5.13.1-fix_ftbfs.patch +Url: http://baghira.sourceforge.net/ +BuildRequires: X11-devel +BuildRequires: jpeg-devel +BuildRequires: qt3-devel +BuildRequires: trinity-tdebase-devel +BuildRoot: %{_tmppath}/baghira-%{version}-buildroot + +%description +Baghira is a very nice native Trinity style and windec +originally based on Mosfet's Liquid style. + +This package contains non-free icons.. + +%package devel +Summary: Header files and static libraries from %name +Group: Development/C +Requires: %{name} = %{version}-%{release} + +%description devel +Libraries and includes files for +developing programs based on %name + +This package is in PLF because it contains non-free icons. + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + +%prep +%setup -q -n baghira-%{version} +%setup -q -n baghira-%{version} -a 1 +%patch0 -p1 -b .ftbfs + +%__rm -rf admin +%__mv -f admin-3.5.13.1 admin + +# 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" + +%build +unset QTDIR || : ; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export KDEDIR=%{tde_prefix} + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + --datadir=%{tde_datadir} \ + --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \ + --disable-static \ + --disable-rpath \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --enable-final \ + --with-extra-includes=%{tde_includedir}/tqt + +%__make %{?_smp_mflags} + +%install +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT + +install -d %{buildroot}/%{tde_libdir}/baghira-%{version} +install -d %{buildroot}/%{tde_tdeincludedir}/baghira-%{version} + +mv %{buildroot}/%{tde_libdir}/libbaghirastarter.la %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.la +mv %{buildroot}/%{tde_libdir}/libbaghirastarter.so %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so.%{major} +mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.la %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la +mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.so %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so.%{major} +mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebar.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h +mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebariface.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h +mv %{buildroot}/%{tde_tdeincludedir}/dndlistbox.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h +mv %{buildroot}/%{tde_tdeincludedir}/linkview.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/linkview.h +mv %{buildroot}/%{tde_tdeincludedir}/listboxlink.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h + +ln -s libbaghirastarter.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so +ln -s usermanager_panelapplet.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%doc README AUTHORS ChangeLog COPYING NEWS TODO +%{tde_bindir}/bab +%{tde_tdelibdir}/b_menu_panelapplet.* +%{tde_tdelibdir}/kstyle_baghira_config.* +%{tde_tdelibdir}/kwin3_baghira.* +%{tde_tdelibdir}/kwin_baghira_config.* +%{tde_tdelibdir}/plugins/styles/baghira.* +%{tde_datadir}/apps/kdisplay/color-schemes/Aqua* +#%{tde_datadir}/apps/kicker/applets/b_menuapplet.desktop +%{tde_datadir}/apps/kicker/applets/usermanager.desktop +%{tde_datadir}/apps/konqsidebartng/add/baghirasidebar_add.desktop +%{tde_datadir}/apps/konqsidebartng/entries/baghirasidebar.desktop +%{tde_datadir}/apps/kicker/applets/starter.desktop +%{tde_datadir}/apps/kstyle/themes/baghira.themerc +%{tde_datadir}/apps/kwin/baghira.desktop +%{tde_datadir}/icons/crystalsvg/*/*/baghira* +%{tde_datadir}/icons/crystalsvg/*/*/bab_* +%{tde_datadir}/apps/baghira/poof.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_down.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_hover.png + + +%files devel +%defattr(-,root,root) +%{tde_libdir}/baghira-%{version}/libbaghirastarter.la +%{tde_libdir}/baghira-%{version}/libbaghirastarter.so* +%{tde_tdelibdir}/konqsidebar_baghirasidebar.la +%{tde_tdelibdir}/konqsidebar_baghirasidebar.so +%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la +%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so* +%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h +%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h +%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h +%{tde_tdeincludedir}/baghira-%{version}/linkview.h +%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h + + +%changelog +* Tue Nov 20 2012 Francois Andriot - 0.8.1 +- Initial build for TDE 3.5.13.1 + +* Tue Jan 8 2008 Javier Rodas 0.8-2plf2008.1 +- KDE 3.5.8 version in Mandriva 2008.1 +- KDE svn admin headers now packaged in Source1 + +* Mon Sep 18 2006 Javier Rodas 0.8-2plf2007.0 +- Fix Source0 local reference +- KDE 3.5.4 admin headers are downloaded with subversion +- Fix Baghira devel package directory paths +- Fix BuildRequires + +* Fri Sep 15 2006 Javier Rodas 0.8-1plf2007.0 +- 0.8 +- Replaced KDE admin headers in the source file (for KDE 3.5.4) +- Fix BuildRequires +- Removed the patch file + +* Thu Oct 13 2005 neoclust 0.7-1plf +- 0.7 +- remove redundant buildrequires + +* Mon Mar 04 2005 Nicolas L�ureuil 0.6-3plf +- Add PLF reason +- bzipped patch +- Make rpmlint happier + +* Mon Mar 04 2005 Nicolas L�ureuil 0.6-2plf +- New version +- Fix compile ( Patch0 from Gentoo) +- Spec Cleanup +- rpmbuildupdatable + +* Mon Dec 06 2004 Laurent Culioli 0.6-1plf +- Initial Release. -- cgit v1.2.1