From 8328abd416a8c182539f0ec3c90a6855eb2b7953 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 25 Nov 2011 12:29:01 +0100 Subject: [PATCH 01/14] RHEL/Fedora: add 'kile' --- redhat/applications/kile/kile.xpm | 176 ++++++ redhat/applications/kile/trinity-kile.spec | 625 +++++++++++++++++++++ redhat/components.txt | 1 + 3 files changed, 802 insertions(+) create mode 100644 redhat/applications/kile/kile.xpm create mode 100644 redhat/applications/kile/trinity-kile.spec diff --git a/redhat/applications/kile/kile.xpm b/redhat/applications/kile/kile.xpm new file mode 100644 index 000000000..408d2710b --- /dev/null +++ b/redhat/applications/kile/kile.xpm @@ -0,0 +1,176 @@ +/* XPM */ +static char *kile[] = { +/* columns rows colors chars-per-pixel */ +"32 32 138 2", +" c black", +". c #015FBC", +"X c #1067BE", +"o c #005DC0", +"O c #0063C3", +"+ c #006BC9", +"@ c #0A6EC9", +"# c #0071CC", +"$ c #0E76CE", +"% c #0076D0", +"& c #007BD2", +"* c #0978D0", +"= c #1467C0", +"- c #1468C1", +"; c #136FC9", +": c #1A6AC1", +"> c #1372CA", +", c #1C7BCE", +"< c #1B7DD0", +"1 c #267ACD", +"2 c #2878C6", +"3 c #2C7ECE", +"4 c #207ED0", +"5 c #3D7BC1", +"6 c #3F83BB", +"7 c #0080D6", +"8 c #0086DA", +"9 c #008ADC", +"0 c #0A85D8", +"q c #0C8BDB", +"w c #1A81D2", +"e c #2F81D0", +"r c #2B89D4", +"t c #2A98D9", +"y c #3D80C2", +"u c #3D8ACB", +"i c #328BD5", +"p c #3985D0", +"a c #3A89D3", +"s c #3D90CF", +"d c #3296DC", +"f c #3D92D0", +"g c #399CDF", +"h c #399EE0", +"j c #20A0E4", +"k c #4981C2", +"l c #468DD3", +"z c #4C8DD2", +"x c #4891D6", +"c c #518EC8", +"v c #5C8EC5", +"b c #5B9ECF", +"n c #5493D5", +"m c #519CD1", +"M c #549ADA", +"N c #5D98D7", +"B c #5F9AD8", +"V c #4FA2DF", +"C c #53A0DD", +"Z c #5BA4D2", +"A c #5BA3DE", +"S c #40A7E4", +"D c #4DA4E1", +"F c #53A9E3", +"G c #629CD9", +"H c #7999C3", +"J c #6DA2DB", +"K c #79A8CD", +"L c #71A5DC", +"P c #73A8DD", +"I c #7AABDE", +"U c #6DADE2", +"Y c #63B2E6", +"T c #77AEE1", +"R c #75B4E5", +"E c #7EB3E3", +"W c #79BAE8", +"Q c #829DC4", +"! c #82A2C7", +"~ c #82A7CA", +"^ c #89B6D8", +"/ c #88BCDF", +"( c #92A6C5", +") c #92AECA", +"_ c #91B3CF", +"` c #96B6D0", +"' c #9BBCD5", +"] c #84B2E1", +"[ c #8EB7E3", +"{ c #8EBBE5", +"} c #92BAE5", +"| c #98BEE6", +" . c #A1BED5", +".. c #B6B6C5", +"X. c #87C9EF", +"o. c #95C2E9", +"O. c #9CC0E7", +"+. c #9AC5EA", +"@. c #ADC2D6", +"#. c #BEC1CF", +"$. c #B2C2D4", +"%. c #B6C4DA", +"&. c #BDC8D7", +"*. c #A4C5E9", +"=. c #A1C8E3", +"-. c #ABCBEB", +";. c #AAD0EF", +":. c #AAD3F0", +">. c #B1CDEC", +",. c #B5D0ED", +"<. c #BDD5ED", +"1. c #B7D6F1", +"2. c #B4D8F2", +"3. c #BBD7F0", +"4. c #BFE6F9", +"5. c #C0C9D7", +"6. c #C1CCDD", +"7. c #C0D6EF", +"8. c #C6DBEC", +"9. c #C8D2E0", +"0. c #C0D7F0", +"q. c #C3DAF0", +"w. c #C9DDF2", +"e. c #D1DEEC", +"r. c #C6E8FA", +"t. c #CDE0F3", +"y. c #D2E3F4", +"u. c #D4EBF9", +"i. c #DBE8F6", +"p. c #DBEDF9", +"a. c #E1ECF7", +"s. c #E5EEF8", +"d. c #E6F1F9", +"f. c #E9F3FB", +"g. c #F1F6FB", +"h. c #F6F9FD", +"j. c #FEFEFE", +"k. c None", +/* pixels */ +"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.", +"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.", +"k.k.k.k.k.k.k.k.k.k.k... .%.&.&.&.&.@.' ....k.k.k.k.k.k.k.k.k.k.", +"k.k.k.k.k.k.k.k.k.....9.r.p.f.f.f.f.u.4.<.$...k.k.k.k.k.k.k.k.k.", +"k.k.k.k.k.k.k...#.e.s.s.s.s.s.s.f.d.s.s.d.s.8.%.....k.k.k.k.k.k.", +"k.k.k.k.k.k...6.e.i.i.i.i.i.i.i.i.i.i.i.i.i.p.y.=.` k.k.k.k.k.k.", +"k.k.k.k.k...6.t.y.w.w.y.y.w.w.y.t.t.t.y.t.w.y.w.w.X._ ..k.k.k.k.", +"k.k.k.k...%.7.7.q.8.0.8.7.w.w.0.7.w.q.7.8.q.7.8.8.3./ ..k.k.k.k.", +"k.k.k...^ 1.y.t.t.<.>.,.>.7.w.y.i.y.y.0.>.>.>.1.>.1.+.j ..k.k.k.", +"k.k.k...Y s.j.j.j.w.-.-.-.-.g.j.j.j.s.>.>.-.>.-.-.-.*.S Z ..k.k.", +"k.k._ t R i.j.j.j.7.*.| *.i.j.j.j.g.>.*.O.O.| | | O.| F t ) k.k.", +"k.k.K q U i.j.j.j.>.} } 7.h.j.j.h.0.| } } } } } } } } D 9 K k.k.", +"k...m 9 C y.j.j.j.-.^ O.h.j.j.h.>.] ] ] ^ ] ] } -.=.o.W 9 9 ..k.", +"k...8 8 d t.j.j.j.*.[ s.j.j.h.q.] ] ] ] I I ] w.j.a.O.f.q 8 N ..", +"..~ 7 7 0 2.j.j.j.*.y.j.j.j.>.^ ] I I G J J | f.-.y.C r.h 7 s ..", +"..f 7 7 7 :.j.j.j.i.j.j.j.i.I P L L G G G G | s.] 8.d u.h 7 s ..", +"..f & & & :.j.j.j.j.j.j.j.s.J G G N N n n n L s.y.i.y.p.& & f ..", +"..u & & & :.j.j.j.j.j.j.j.j.<.G n n n n l z l U i.j.y.D & & u ..", +"..u % % % -.j.j.j.q.o.h.j.j.h.*.z z l p e < * % % % % % % % u ..", +"..u # % # :.j.j.j.F w 1.j.j.j.g.M 1 , $ r +.:.:.:.:.-.:.# % u ..", +"k...# # # -.j.j.j.C # < p.j.j.j.y.i # # r ,.t.q.q.t.q.t.# # u ..", +"k.k.c + # -.j.j.j.M + + B d.j.j.j.;.+ + # < < < w < < < + + ! ..", +"k.k.H + + -.j.j.j.M + + @ T j.j.j.j.] @ , E a E { { { { + H k.k.", +"k.k.( 2 O -.j.j.j.M + O + @ 7.j.j.j.s.x a s.P s.j.h.j.j.+ H k.k.", +"k.k...v O 1 a p p ; O O O + ; a a a a 3 O O O O O O O O 5 6 k.k.", +"k.k.k...O O o . O o o O o o O + O + O O O o O O O O O o ....k.k.", +"k.k.k.k...5 . o o . o o o O O + O O o o . o o o . o - Q k.k.k.k.", +"k.k.k.k...Q o o o o o o o o o o o o o o o o o o . o Q ..k.k.k.k.", +"k.k.k.k.k.k.Q 5 o o o o o o o o o o o o o o o o 5 Q k.k.k.k.k.k.", +"k.k.k.k.k.k.....= o o o o o o o o o o o o o o . ....k.k.k.k.k.k.", +"k.k.k.k.k.k.k.k.....Q 5 o o o o o o o o - : ....k.k.k.k.k.k.k.k.", +"k.k.k.k.k.k.k.k.k.k.....k H H H H H H k 5 ..k.k.k.k.k.k.k.k.k.k." +}; diff --git a/redhat/applications/kile/trinity-kile.spec b/redhat/applications/kile/trinity-kile.spec new file mode 100644 index 000000000..b79b45c11 --- /dev/null +++ b/redhat/applications/kile/trinity-kile.spec @@ -0,0 +1,625 @@ +# Default version for this component +%define kdecomp kile +%define version 2.0.2 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: KDE Integrated LaTeX Environment [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Publishing + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Source1: %{kdecomp}.xpm + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +%package i18n-ar +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Arabic (ar) translations for Kile [Trinity] +%description i18n-ar +This package contains the Arabic translations for Kile. + +%package i18n-bg +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Bulgarian (bg) translations for Kile [Trinity] +%description i18n-bg +This package contains the Bulgarian translations for Kile. + +%package i18n-br +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Brazilian (br) translations for Kile [Trinity] +%description i18n-br +This package contains the Brazilian translations for Kile. + +%package i18n-ca +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Catalan (ca) translations for Kile [Trinity] +%description i18n-ca +This package contains the Catalan translations for Kile. + +%package i18n-cs +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Czech (cs) translations for Kile [Trinity] +%description i18n-cs +This package contains the Czech translations for Kile. + +%package i18n-cy +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Welsh (cy) translations for Kile [Trinity] +%description i18n-cy +This package contains the Welsh translations for Kile. + +%package i18n-da +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Danish (da) translations for Kile [Trinity] +%description i18n-da +This package contains the Danish translations for Kile. + +%package i18n-de +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: German (de) translations for Kile [Trinity] +%description i18n-de +This package contains the German translations for Kile. + +%package i18n-el +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Greek (el) translations for Kile [Trinity] +%description i18n-el +This package contains the greek translations for Kile. + +%package i18n-engb +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: British English (en_GB) translations for Kile [Trinity] +%description i18n-engb +This package contains the British English (en_GB) translations for Kile [Trinity]. + +%package i18n-es +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Spanish (es) translations for Kile [Trinity] +%description i18n-es +This package contains the Spanish translations for Kile. + +%package i18n-et +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Estonian (et) translations for Kile [Trinity] +%description i18n-et +This package contains the Estonian translations for Kile. + +%package i18n-eu +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Basque (eu) translations for Kile [Trinity] +%description i18n-eu +This package contains the Basque translations for Kile. + +%package i18n-fi +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Finnish (fi) translations for Kile [Trinity] +%description i18n-fi +This package contains the Finnish translations for Kile. + +%package i18n-fr +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: French (fr) translations for Kile [Trinity] +%description i18n-fr +This package contains the French translations for Kile. + +%package i18n-ga +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Irish Gaelic (ga) translations for Kile [Trinity] +%description i18n-ga +This package contains the Irish Gaelic translations for Kile. + +%package i18n-gl +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Galician (gl) translations for Kile [Trinity] +%description i18n-gl +This package contains the Galician translations for Kile. + +%package i18n-hi +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Hindi (hi) translations for Kile [Trinity] +%description i18n-hi +This package contains the Hindi translations for Kile. + +%package i18n-hu +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Hungarian (hu) translations for Kile [Trinity] +%description i18n-hu +This package contains the Hungarian translations for Kile. + +%package i18n-is +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Icelandic (is) translations for Kile [Trinity] +%description i18n-is +This package contains the Icelandic translations for Kile. + +%package i18n-it +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Italian (it) translations for Kile [Trinity] +%description i18n-it +This package contains the Italian translations for Kile. + +%package i18n-ja +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Japanese (ja) translations for Kile [Trinity] +%description i18n-ja +This package contains the Japanese translations for Kile. + +%package i18n-lt +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Lithuanian (lt) translations for Kile [Trinity] +%description i18n-lt +This package contains the Lithuanian translations for Kile. + +%package i18n-ms +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Malay (ms) translations for Kile [Trinity] +%description i18n-ms +This package contains the Malay translations for Kile. + +%package i18n-mt +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Maltese (mt) translations for Kile [Trinity] +%description i18n-mt +This package contains the Maltese translations for Kile. + +%package i18n-nb +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Norwegian Bookmal (nb) translations for Kile [Trinity] +%description i18n-nb +This package contains the Norwegian Bookmal translations for Kile. + +%package i18n-nds +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Low Saxon (nds) translations for Kile [Trinity] +%description i18n-nds +This package contains the Low Saxon translations for Kile. + +%package i18n-nl +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Dutch (nl) translations for Kile [Trinity] +%description i18n-nl +This package contains the Dutch translations for Kile. + +%package i18n-nn +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Norwegian Nynorsk (nn) translations for Kile [Trinity] +%description i18n-nn +This package contains the Norwegian Nynorsk translations for Kile. + +%package i18n-pa +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Punjabi (pa) translations for Kile [Trinity] +%description i18n-pa +This package contains the Punjabi translations for Kile. + +%package i18n-pl +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Polish (pl) translations for Kile [Trinity] +%description i18n-pl +This package contains the Polish translations for Kile. + +%package i18n-pt +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Portuguese (pt) translations for Kile [Trinity] +%description i18n-pt +This package contains the Portuguese translations for Kile. + +%package i18n-ptbr +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Brazilian Portuguese (pt_BR) translations for Kile [Trinity] +%description i18n-ptbr +This package contains the Brazilian Portuguese translations for Kile. + +%package i18n-ro +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Romanian (ro) translations for Kile [Trinity] +%description i18n-ro +This package contains the Romanian translations for Kile. + +%package i18n-ru +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Russian (ru) translations for Kile [Trinity] +%description i18n-ru +This package contains the Russian translations for Kile. + +%package i18n-rw +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Kinyarwanda (rw) translations for Kile [Trinity] +%description i18n-rw +This package contains the Kinyarwanda translations for Kile. + +%package i18n-sk +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Slovak (sk) translations for Kile [Trinity] +%description i18n-sk +This package contains the Slovak translations for Kile. + +%package i18n-sr +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Serbian (sr) translations for Kile [Trinity] +%description i18n-sr +This package contains the Serbian translations for Kile. + +%package i18n-srlatin +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Latin Serbian (sr@Latn) translations for Kile [Trinity] +%description i18n-srlatin +This package contains the Latin Serbian translations for Kile. + +%package i18n-sv +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Swedish (sv) translations for Kile [Trinity] +%description i18n-sv +This package contains the Swedish translations for Kile. + +%package i18n-ta +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Tamil (ta) translations for Kile [Trinity] +%description i18n-ta +This package contains the Tamil translations for Kile. + +%package i18n-th +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Thai (th) translations for Kile [Trinity] +%description i18n-th +This package contains the Thai translations for Kile. + +%package i18n-tr +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Turkish (tr) translations for Kile [Trinity] +%description i18n-tr +This package contains the Turkish translations for Kile. + +%package i18n-uk +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Ukrainian (uk) translations for Kile [Trinity] +%description i18n-uk +This package contains the Ukrainian translations for Kile. + +%package i18n-zhcn +Group: Applications/Publishing +Requires: %{name} >= %{version} +Provides: trinity-kile-i18n +Summary: Chinese Simplified (zh_CN) translations for Kile [Trinity] +%description i18n-zhcn +This package contains the Chinese Simplified translations for Kile. + + +%description +Kile is a user-friendly LaTeX source editor and TeX shell for KDE. + +The source editor is a multi-document editor designed for .tex and .bib +files. Menus, wizards and auto-completion are provided to assist with +tag insertion and code generation. A structural view of the document +assists with navigation within source files. + +The TeX shell integrates the various tools required for TeX processing. +It assists with LaTeX compilation, DVI and postscript document viewing, +generation of bibliographies and indices and other common tasks. + +Kile can support large projects consisting of several smaller files. + +%prep +%setup -q -n applications/%{kdecomp} + +# 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,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%__install -D -p -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/kile.xpm +%__chmod +x %{buildroot}%{_datadir}/apps/kile/test/runTests.sh + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{_bindir}/kile +%{_datadir}/applications/kde/kile.desktop +%{_datadir}/apps/katepart/syntax/bibtex.xml +%{_datadir}/apps/katepart/syntax/latex.xml +%{_datadir}/apps/kconf_update +%{_datadir}/apps/kile +%{_datadir}/config.kcfg/kile.kcfg +%{_datadir}/icons/hicolor/*/apps/kile.png +%{_datadir}/icons/hicolor/scalable/apps/kile.svgz +%{_docdir}/HTML/en/kile +%{_datadir}/mimelnk/text/x-kilepr.desktop +%{_datadir}/pixmaps/kile.xpm + +%files i18n-da +%lang(da) %{_docdir}/HTML/da/kile +%lang(da) %{_datadir}/locale/da/LC_MESSAGES/kile.mo + +%files i18n-es +%lang(es) %{_docdir}/HTML/es/kile +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/kile.mo + +%files i18n-et +%lang(et) %{_docdir}/HTML/et/kile +%lang(et) %{_datadir}/locale/et/LC_MESSAGES/kile.mo + +%files i18n-it +%lang(it) %{_docdir}/HTML/it/kile +%lang(it) %{_datadir}/locale/it/LC_MESSAGES/kile.mo + +%files i18n-nl +%lang(nl) %{_docdir}/HTML/nl/kile +%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/kile.mo + +%files i18n-pt +%lang(pt) %{_docdir}/HTML/pt/kile +%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/kile.mo + +%files i18n-sv +%lang(sv) %{_docdir}/HTML/sv/kile +%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/kile.mo + +%files i18n-ar +%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/kile.mo + +%files i18n-bg +%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/kile.mo + +%files i18n-br +%lang(br) %{_datadir}/locale/br/LC_MESSAGES/kile.mo + +%files i18n-ca +%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/kile.mo + +%files i18n-cs +%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/kile.mo + +%files i18n-cy +%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/kile.mo + +%files i18n-de +%lang(de) %{_datadir}/locale/de/LC_MESSAGES/kile.mo + +%files i18n-el +%lang(el) %{_datadir}/locale/el/LC_MESSAGES/kile.mo + +%files i18n-engb +%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/kile.mo + +%files i18n-eu +%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/kile.mo + +%files i18n-fi +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/kile.mo + +%files i18n-fr +%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/kile.mo + +%files i18n-ga +%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/kile.mo + +%files i18n-gl +%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/kile.mo + +%files i18n-hi +%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/kile.mo + +%files i18n-hu +%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/kile.mo + +%files i18n-is +%lang(is) %{_datadir}/locale/is/LC_MESSAGES/kile.mo + +%files i18n-ja +%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/kile.mo + +%files i18n-lt +%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/kile.mo + +%files i18n-ms +%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/kile.mo + +%files i18n-mt +%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/kile.mo + +%files i18n-nb +%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/kile.mo + +%files i18n-nds +%lang(nds) %{_datadir}/locale/nds/LC_MESSAGES/kile.mo + +%files i18n-nn +%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/kile.mo + +%files i18n-pa +%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/kile.mo + +%files i18n-pl +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/kile.mo + +%files i18n-ptbr +%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/kile.mo + +%files i18n-ro +%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/kile.mo + +%files i18n-ru +%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/kile.mo + +%files i18n-rw +%lang(rw) %{_datadir}/locale/rw/LC_MESSAGES/kile.mo + +%files i18n-sk +%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/kile.mo + +%files i18n-sr +%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/kile.mo + +%files i18n-srlatin +%lang(sr@Latn) %{_datadir}/locale/sr@Latn/LC_MESSAGES/kile.mo + +%files i18n-ta +%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/kile.mo + +%files i18n-th +%lang(th) %{_datadir}/locale/th/LC_MESSAGES/kile.mo + +%files i18n-tr +%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/kile.mo + +%files i18n-uk +%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/kile.mo + +%files i18n-zhcn +%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/kile.mo + + + + +%Changelog +* Fri Nov 25 2011 Francois Andriot - 2.0.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/components.txt b/redhat/components.txt index 1a8ac75ca..2da055a56 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -76,3 +76,4 @@ applications/ktechlab applications/piklab applications/keep applications/tellico +applications/kile From 53d774ddafae0d24af856bc9de2bac57d498a605 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 25 Nov 2011 12:29:59 +0100 Subject: [PATCH 02/14] RHEL/Fedora: updates tellico --- redhat/applications/tellico/trinity-tellico.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/redhat/applications/tellico/trinity-tellico.spec b/redhat/applications/tellico/trinity-tellico.spec index c01c0c9b6..706eb4c30 100644 --- a/redhat/applications/tellico/trinity-tellico.spec +++ b/redhat/applications/tellico/trinity-tellico.spec @@ -80,6 +80,7 @@ This package contains the architecture independent files, such data files and documentation. %package scripts +Group: Applications/Utilities Summary: collection manager for books, videos, music [scripts] [Trinity] %description scripts From 9cb32be668bb47269935fec75c8ec7348843a4a8 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 25 Nov 2011 13:02:11 +0100 Subject: [PATCH 03/14] RHEL/Fedora: add kdmtheme --- .../kdmtheme/kdmtheme.lintian-overrides | 6 + .../kdmtheme/trinity-kdmtheme.spec | 107 ++++++++++++++++++ redhat/components.txt | 1 + 3 files changed, 114 insertions(+) create mode 100644 redhat/applications/kdmtheme/kdmtheme.lintian-overrides create mode 100644 redhat/applications/kdmtheme/trinity-kdmtheme.spec diff --git a/redhat/applications/kdmtheme/kdmtheme.lintian-overrides b/redhat/applications/kdmtheme/kdmtheme.lintian-overrides new file mode 100644 index 000000000..4932c5f8a --- /dev/null +++ b/redhat/applications/kdmtheme/kdmtheme.lintian-overrides @@ -0,0 +1,6 @@ +# provided by tdelibs +kdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/kdmtheme.desktop kcmshell +# kcontrol module +kdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/kdmtheme.desktop +kdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/kdmtheme.desktop + diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme.spec b/redhat/applications/kdmtheme/trinity-kdmtheme.spec new file mode 100644 index 000000000..74fadc821 --- /dev/null +++ b/redhat/applications/kdmtheme/trinity-kdmtheme.spec @@ -0,0 +1,107 @@ +# Default version for this component +%define kdecomp kdmtheme +%define version 1.2.2 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: theme manager for KDM [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://beta.smileaf.org/projects + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Source1: kdmtheme.lintian-overrides + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +kdmtheme is a theme manager for KDM. It provides a KDE Control Module (KCM) +that allows you to easily install, remove and change your KDM themes. + + + +%prep +%setup -q -n applications/%{kdecomp} + +# 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,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%__install -D -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/lintian/overrides/kdmtheme-trinity + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{tde_libdir}/kcm_kdmtheme.la +%{tde_libdir}/kcm_kdmtheme.so +%{_datadir}/applications/kde/kdmtheme.desktop +%{_docdir}/HTML/en/kdmtheme/common +%{_docdir}/HTML/en/kdmtheme/index.cache.bz2 +%{_docdir}/HTML/en/kdmtheme/index.docbook +%{_datadir}/lintian/overrides/kdmtheme-trinity + + +%Changelog +* Fri Nov 25 2011 Francois Andriot - 1.2.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/components.txt b/redhat/components.txt index 2da055a56..b6516a8b5 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -77,3 +77,4 @@ applications/piklab applications/keep applications/tellico applications/kile +applications/kdmtheme From 19e8ebbf1911ddee443c39715cd2ddac9d52332d Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 25 Nov 2011 14:08:18 +0100 Subject: [PATCH 04/14] RHEL/Fedora: add kerry, knemo --- redhat/applications/kerry/kerry.1.docbook | 109 ++++++++++++++++ redhat/applications/kerry/trinity-kerry.spec | 127 +++++++++++++++++++ redhat/applications/knemo/trinity-knemo.spec | 114 +++++++++++++++++ redhat/components.txt | 2 + 4 files changed, 352 insertions(+) create mode 100644 redhat/applications/kerry/kerry.1.docbook create mode 100644 redhat/applications/kerry/trinity-kerry.spec create mode 100644 redhat/applications/knemo/trinity-knemo.spec diff --git a/redhat/applications/kerry/kerry.1.docbook b/redhat/applications/kerry/kerry.1.docbook new file mode 100644 index 000000000..49eb68460 --- /dev/null +++ b/redhat/applications/kerry/kerry.1.docbook @@ -0,0 +1,109 @@ + + + + + + Jonathan Patrick + Davies + jpatrick@ubuntu.com + + + 2006 + Jonathan Patrick Davies + + + + 2006-03-26 + + + + kerry + 1 + + + kerry + a Beagle frontend for KDE + + + + kautoclick + + + + + + + + + + DESCRIPTION + + Kerry is a frontend for Beagle for the KDE desktop. + + + + OPTIONS + + All KDE and Qt + programs accept a some common command-line options. Kerry has no + application-specific options. + + + + Generic options: + + + Show help about options + + + + Show Qt specific options + + + + Show KDE specific options + + + + Show all options + + + + Show author information + + + , + Show version information + + + + Show license information + + + + Indicates end of options + + + + + + + COPYRIGHT + + This manual page was written by Jonathan Patrick Davies + jpatrick@ubuntu.com for the + Ubuntu system (but may be used by others). + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License, + Version 2 or any later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + + diff --git a/redhat/applications/kerry/trinity-kerry.spec b/redhat/applications/kerry/trinity-kerry.spec new file mode 100644 index 000000000..2949edcb4 --- /dev/null +++ b/redhat/applications/kerry/trinity-kerry.spec @@ -0,0 +1,127 @@ +# Default version for this component +%define kdecomp kerry +%define version 0.2.1 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: a KDE frontend for the Beagle desktop search daemon [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://en.opensuse.org/Kerry + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Source1: kerry.1.docbook + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: libbeagle-devel >= 0.3.0 +#BuildRequires: docbook-utils +BuildRequires: docbook2X + +%description +Kerry is a Trinity frontend for the Beagle desktop search daemon. + +A program for indexing and searching user's data. At the moment, it can index +filesystems, chat logs, mail and data, RSS and other. + + + +%prep +%setup -q -n applications/%{kdecomp} + +# 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,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +#%__install -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/kerry.1.docbook +#docbook2man %{buildroot}%{_mandir}/man1/kerry.1.docbook + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{_datadir}/locale/*/LC_MESSAGES/kcmbeagle.mo +%{_bindir}/beagled-shutdown +%{_bindir}/kerry +%{_libdir}/libkdeinit_kerry.la +%{_libdir}/libkdeinit_kerry.so +%{tde_libdir}/kcm_beagle.la +%{tde_libdir}/kcm_beagle.so +%{tde_libdir}/kerry.la +%{tde_libdir}/kerry.so +%{_datadir}/applications/kde/kcmbeagle.desktop +%{_datadir}/applications/kde/kerry.desktop +%{_datadir}/applnk/.hidden/kcmkerry.desktop +%{_datadir}/apps/kerry/search-running.mng +%{_datadir}/autostart/beagled.desktop +%{_datadir}/autostart/kerry.autostart.desktop +%{_datadir}/icons/hicolor/*/*/* + + +%Changelog +* Fri Nov 25 2011 Francois Andriot - 0.2.1-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knemo/trinity-knemo.spec b/redhat/applications/knemo/trinity-knemo.spec new file mode 100644 index 000000000..0f71d6799 --- /dev/null +++ b/redhat/applications/knemo/trinity-knemo.spec @@ -0,0 +1,114 @@ +# Default version for this component +%define kdecomp knemo +%define version 0.4.8 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: network interfaces monitor for the Trinity systray +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://beta.smileaf.org/projects + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +KNemo displays an icon in the systray for every network interface. +Tooltips and an info dialog provide further information about the +interface. Passive popups inform about interface changes. +A traffic plotter is also integrated. + +knemo polls the network interface status every second using the +ifconfig, route and iwconfig tools. + +Homepage: http://extragear.kde.org/apps/knemo/ + + + +%prep +%setup -q -n applications/%{kdecomp} + +# 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,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{tde_libdir}/kcm_knemo.la +%{tde_libdir}/kcm_knemo.so +%{tde_libdir}/kded_knemod.la +%{tde_libdir}/kded_knemod.so +%{_datadir}/applications/kde/kcm_knemo.desktop +%{_datadir}/apps/knemo/eventsrc +%{_datadir}/icons/crystalsvg/*/*/*.png +%{_datadir}/locale/*/LC_MESSAGES/knemod.mo +%{_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo +%{_datadir}/services/kded/knemod.desktop + + +%Changelog +* Fri Nov 25 2011 Francois Andriot - 0.4.8-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/components.txt b/redhat/components.txt index b6516a8b5..49a0cd0dd 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -78,3 +78,5 @@ applications/keep applications/tellico applications/kile applications/kdmtheme +applications/knemo +applications/kerry From c72b76a46361164fa731cceeadd94220e1a573bf Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 10:14:14 +0100 Subject: [PATCH 05/14] Move Fedora/RHEL specific components to extra subdir --- redhat/{ => extras}/trinity-desktop/trinity-3.5.13-fedora.repo | 0 redhat/{ => extras}/trinity-desktop/trinity-3.5.13-rhel.repo | 0 redhat/{ => extras}/trinity-desktop/trinity-desktop.spec | 0 redhat/{ => extras}/trinity-live/fedora-live-tde-base.ks | 0 redhat/{ => extras}/trinity-live/fedora-livecd-tde.ks | 0 redhat/{ => extras}/trinity-live/trinity-live.spec | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename redhat/{ => extras}/trinity-desktop/trinity-3.5.13-fedora.repo (100%) rename redhat/{ => extras}/trinity-desktop/trinity-3.5.13-rhel.repo (100%) rename redhat/{ => extras}/trinity-desktop/trinity-desktop.spec (100%) rename redhat/{ => extras}/trinity-live/fedora-live-tde-base.ks (100%) rename redhat/{ => extras}/trinity-live/fedora-livecd-tde.ks (100%) rename redhat/{ => extras}/trinity-live/trinity-live.spec (100%) diff --git a/redhat/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo similarity index 100% rename from redhat/trinity-desktop/trinity-3.5.13-fedora.repo rename to redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo diff --git a/redhat/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo similarity index 100% rename from redhat/trinity-desktop/trinity-3.5.13-rhel.repo rename to redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec similarity index 100% rename from redhat/trinity-desktop/trinity-desktop.spec rename to redhat/extras/trinity-desktop/trinity-desktop.spec diff --git a/redhat/trinity-live/fedora-live-tde-base.ks b/redhat/extras/trinity-live/fedora-live-tde-base.ks similarity index 100% rename from redhat/trinity-live/fedora-live-tde-base.ks rename to redhat/extras/trinity-live/fedora-live-tde-base.ks diff --git a/redhat/trinity-live/fedora-livecd-tde.ks b/redhat/extras/trinity-live/fedora-livecd-tde.ks similarity index 100% rename from redhat/trinity-live/fedora-livecd-tde.ks rename to redhat/extras/trinity-live/fedora-livecd-tde.ks diff --git a/redhat/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec similarity index 100% rename from redhat/trinity-live/trinity-live.spec rename to redhat/extras/trinity-live/trinity-live.spec From 7d8386fd488689270894fcb6c4f7a058c59bb623 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 10:15:07 +0100 Subject: [PATCH 06/14] RHEL/Fedora: fix kdebindings, kdeutils, kdevelop HTML directory location. --- .../trinity-kdebindings-3.5.13.spec | 14 +++++--- redhat/kdeutils/trinity-kdeutils-3.5.13.spec | 35 +++++++++++-------- redhat/kdevelop/trinity-kdevelop-3.5.13.spec | 14 +++++--- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index 0a6a57f39..a095e581a 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -13,8 +13,8 @@ # TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir}/kde -%define tde_libdir %{_libdir}/trinity %define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity Name: trinity-kdebindings @@ -113,8 +113,9 @@ Perl bindings to the DCOP interprocess communication protocol used by KDE # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -260,7 +261,7 @@ update-desktop-database >& /dev/null ||: #%{ruby_sitelib}/Qt* %{_usr}/lib/ruby/*/* %{ruby_arch}/*.so.* -%doc %lang(en) %{_docdir}/HTML/en/javalib/* +%doc %lang(en) %{tde_docdir}/HTML/en/javalib/* # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" @@ -286,6 +287,9 @@ update-desktop-database >& /dev/null ||: %{ruby_arch}/*.la %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-3 +- Fix HTML directory location + * Fri Nov 04 2011 Francois Andriot - 3.5.13-2 - Add missing BuildRequires diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index 67af6e856..657e53abe 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 4 +%define release 5 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -120,8 +120,10 @@ More Utilities for the K Desktop Environment: # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -143,7 +145,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" --with-xscreensaver \ --with-extra-includes=%{_includedir}/tqt \ --enable-closure - + %__make %{?_smp_mflags} %install @@ -186,17 +188,17 @@ done fi # using pam -install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper -install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper +%__install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper +%__install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper pushd %{buildroot}%{_bindir} - mkdir -p %{buildroot}%{_sbindir} - mv klaptop_acpi_helper ../sbin - ln -s /usr/bin/consolehelper klaptop_acpi_helper + %__mkdir_p %{buildroot}%{_sbindir} + %__mv klaptop_acpi_helper ../sbin + %__ln_s /usr/bin/consolehelper klaptop_acpi_helper popd # klaptop setting -install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc +%__install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc %clean @@ -246,7 +248,7 @@ done %{_datadir}/servicetypes/kmilo # ksim -%doc %{_docdir}/HTML/*/ksim/ +%doc %{tde_docdir}/HTML/*/ksim/ %{tde_libdir}/ksim* %{_libdir}/libksimcore.la %{_libdir}/libksimcore.so.* @@ -257,7 +259,7 @@ done %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png # klaptop -%doc %{_docdir}/HTML/en/kcontrol +%doc %{tde_docdir}/HTML/en/kcontrol %{_sysconfdir}/pam.d/klaptop_acpi_helper %attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper %{_bindir}/klaptop* @@ -287,7 +289,7 @@ done %exclude %{_datadir}/servicetypes/kmilo # ksim -%exclude %{_docdir}/HTML/*/ksim/ +%exclude %{tde_docdir}/HTML/*/ksim/ %exclude %{tde_libdir}/ksim* %exclude %{_libdir}/libksimcore.la %exclude %{_libdir}/libksimcore.so.* @@ -309,7 +311,7 @@ done %exclude %{_libdir}/libkcmlaptop.* %exclude %{_datadir}/applications/kde/laptop.desktop %exclude %{_datadir}/config/kcmlaptoprc -%exclude %{_docdir}/HTML/en/kcontrol/ +%exclude %{tde_docdir}/HTML/en/kcontrol/ %exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png %exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png %exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz @@ -334,7 +336,7 @@ done %{_datadir}/mimelnk/application/* %endif %{_datadir}/autostart/* -%doc %lang(en) %{_docdir}/HTML/en/* +%doc %lang(en) %{tde_docdir}/HTML/en/* %files devel %defattr(-,root,root,-) @@ -347,6 +349,9 @@ done %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-5 +- Fix HTML directory location + * Thu Nov 17 2011 Francois Andriot - 3.5.13-4 - Fix symbolic link to 'consolehelper' diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec index 969f6bab5..ca27fc19f 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -12,6 +12,8 @@ # TDE 3.5.13 specific variables BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity %define _default_patch_fuzz 2 @@ -127,8 +129,9 @@ Requires: %{name} = %{version}-%{release} # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin @@ -202,7 +205,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files %defattr(-,root,root,-) -%{_docdir}/HTML/en/* +%{tde_docdir}/HTML/en/* %{_bindir}/* %{tde_libdir}/* %{_libdir}/kconf_update_bin/* @@ -229,6 +232,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-2 +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 From e2bd7a7c7d6839d050e69fde803e0816c1aa8d6b Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 10:39:45 +0100 Subject: [PATCH 07/14] RHEL/Fedora: fix gwenview, k9copy, knights HTML directory location --- .../gwenview/trinity-gwenview-3.5.13.spec | 13 ++++++++----- redhat/applications/k9copy/trinity-k9copy.spec | 12 ++++++++---- redhat/applications/knights/trinity-knights.spec | 12 ++++++++---- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec index 98b178c0f..d8b62c9a1 100644 --- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec +++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp gwenview %define version 1.4.2 -%define release 5 +%define release 6 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -70,8 +70,9 @@ KIPI image framework. # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -138,7 +139,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/services/*.desktop %{_datadir}/apps/*/ %{_datadir}/config.kcfg/* -%{_docdir}/HTML/en/*/ +%{tde_docdir}/HTML/en/*/ %{_datadir}/icons/*/*/*/* %{_mandir}/man*/* @@ -149,8 +150,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %Changelog +* Fri Nov 25 2011 Francois Andriot - 1.4.2-6 +- Fix HTML directory location + * Fri Nov 04 2011 Francois Andriot - 1.4.2-5 - Adds missing files diff --git a/redhat/applications/k9copy/trinity-k9copy.spec b/redhat/applications/k9copy/trinity-k9copy.spec index ab79315ea..c26b384f2 100644 --- a/redhat/applications/k9copy/trinity-k9copy.spec +++ b/redhat/applications/k9copy/trinity-k9copy.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp k9copy %define version 1.2.3 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -54,8 +54,9 @@ This is the Trinity version # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -101,10 +102,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/applications/kde/k9copy.desktop %{_datadir}/apps/k9copy %{_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop -%{_docdir}/HTML/en/k9copy +%{tde_docdir}/HTML/en/k9copy %{_datadir}/icons/hicolor/*/apps/k9copy.png %Changelog +* Fri Nov 25 2011 Francois Andriot - 1.2.3-2 +- Fix HTML directory location + * Sat Nov 19 2011 Francois Andriot - 1.2.3-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knights/trinity-knights.spec b/redhat/applications/knights/trinity-knights.spec index 2dbbdc1a4..f1b53b788 100644 --- a/redhat/applications/knights/trinity-knights.spec +++ b/redhat/applications/knights/trinity-knights.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp knights %define version 0.6 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -61,8 +61,9 @@ Here's a quick list of Knights' key features: # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -105,11 +106,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/knights %{_datadir}/applnk/Games/Board/knights.desktop %{_datadir}/apps/knights -%{_docdir}/HTML/*/knights +%{tde_docdir}/HTML/*/knights %{_datadir}/icons/*/*/*/*.png %{_datadir}/mimelnk/application/pgn.desktop %Changelog +* Fri Nov 25 2011 Francois Andriot - 0.6-2 +- Fix HTML directory location + * Sun Nov 20 2011 Francois Andriot - 0.6-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 From de0135181135c32bd910b698e924bc02916afac5 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 11:22:41 +0100 Subject: [PATCH 08/14] RHEL/Fedora: fix kdemultimedia, kdetoys, kdewebdev HTML directory location --- .../trinity-kdemultimedia-3.5.13.spec | 16 +++++++++------ redhat/kdetoys/trinity-kdetoys-3.5.13.spec | 12 +++++++---- .../kdewebdev/trinity-kdewebdev-3.5.13.spec | 20 +++++++++---------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index c595d542c..24d538b36 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -136,8 +136,9 @@ Requires: %{name} = %{version}-%{release} # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -281,7 +282,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : # kaboodle %doc rpmdocs/kaboodle/ -%doc %lang(en) %{_docdir}/HTML/en/kaboodle/ +%doc %lang(en) %{tde_docdir}/HTML/en/kaboodle/ %{_bindir}/kaboodle %{tde_libdir}/libkaboodlepart.* %{_datadir}/applications/kde/kaboodle.desktop @@ -290,7 +291,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/kaboodle* # noatun -%doc %lang(en) %{_docdir}/HTML/en/noatun/ +%doc %lang(en) %{tde_docdir}/HTML/en/noatun/ %{_bindir}/noatun %{_libdir}/kconf_update_bin/noatun20update %{tde_libdir}/noatun* @@ -304,7 +305,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mimelnk/interface/x-winamp-skin.desktop # juk -%doc %lang(en) %{_docdir}/HTML/en/juk/ +%doc %lang(en) %{tde_docdir}/HTML/en/juk/ %{_bindir}/juk %{_datadir}/applications/kde/juk.desktop %{_datadir}/apps/juk/ @@ -411,6 +412,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libyafxplayer.so %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-4 +- Fix HTML directory location + * Sat Nov 12 2011 Francois Andriot - 3.5.13-3 - Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec index f9ef1f207..ebba35cf7 100644 --- a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec +++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -61,8 +61,9 @@ and user to be logged-in to KDE. # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" @@ -150,13 +151,16 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %{_datadir}/apps/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/service*/*.desktop -%doc %lang(en) %{_docdir}/HTML/en/* +%doc %lang(en) %{tde_docdir}/HTML/en/* %clean %__rm -rf %{buildroot} %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-2 +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec index 53acedb23..c0b464096 100644 --- a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec +++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -98,13 +98,14 @@ Requires: trinity-kdelibs # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %patch0 -p0 -b .javascript %patch1 -p1 -b .kxsldbg-icons -install -m644 -p %{SOURCE5} kxsldbg/ +%__install -m644 -p %{SOURCE5} kxsldbg/ %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -116,10 +117,6 @@ unset QTDIR || : ; source /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" -%if 0%{?fedora} >= 15 -#export CXXFLAGS="${CXXFLAGS} -fpermissive" -%endif - %configure \ --includedir=%{tde_includedir} \ --disable-rpath \ @@ -151,7 +148,7 @@ done cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/ # make symlinks relative -pushd %{buildroot}%{_docdir}/HTML/en +pushd %{buildroot}%{tde_docdir}/HTML/en for i in *; do if [ -d $i -a -L $i/common ]; then rm -f $i/common @@ -209,7 +206,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mimelnk/application/* %{_datadir}/services/* %{_datadir}/servicetypes/* -%doc %lang(en) %{_docdir}/HTML/en/* +%doc %lang(en) %{tde_docdir}/HTML/en/* %files libs @@ -224,6 +221,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-2 +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 From b9d5f70527bd7513bd58ca5581a762de4e52e630 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 11:43:08 +0100 Subject: [PATCH 09/14] RHEL/Fedora: fix kdeaccessibility, kdeadmin, kdeedu, kdegames HTML directory location --- .../trinity-kdeaccessibility-3.5.13.spec | 20 +++++++++++-------- redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec | 19 ++++++++++-------- redhat/kdeedu/trinity-kdeedu-3.5.13.spec | 11 ++++++---- redhat/kdegames/trinity-kdegames-3.5.13.spec | 11 ++++++---- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec index e996a7261..917c44a2b 100644 --- a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec +++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -10,7 +10,7 @@ %define _docdir %{_prefix}/share/doc %endif -# TDE 3.5.12 specific building variables +# TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 %define tde_docdir %{_docdir}/kde %define tde_includedir %{_includedir}/kde @@ -69,8 +69,9 @@ Requires: trinity-kdelibs-devel # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -171,10 +172,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{tde_libdir}/* # Misc docs -%doc %lang(en) %{_docdir}/HTML/en/kmag -%doc %lang(en) %{_docdir}/HTML/en/kmousetool -%doc %lang(en) %{_docdir}/HTML/en/kmouth -%doc %lang(en) %{_docdir}/HTML/en/kttsd +%doc %lang(en) %{tde_docdir}/HTML/en/kmag +%doc %lang(en) %{tde_docdir}/HTML/en/kmousetool +%doc %lang(en) %{tde_docdir}/HTML/en/kmouth +%doc %lang(en) %{tde_docdir}/HTML/en/kttsd %files devel @@ -184,6 +185,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-2 +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec index abc5006ca..e77e8e17b 100644 --- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec +++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -69,8 +69,9 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser. # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -105,10 +106,10 @@ export PATH="%{_bindir}:${PATH}" %if 0%{?rhel} > 1 comps="kcron kdat knetworkconf" -rm -rf %{buildroot}%{_docdir}/HTML/en/kuser \ - %{buildroot}%{_docdir}/HTML/en/kpackage \ - %{buildroot}%{_docdir}/HTML/en/ksysv \ - %{buildroot}%{_docdir}/HTML/en/lilo-config +rm -rf %{buildroot}%{tde_docdir}/HTML/en/kuser \ + %{buildroot}%{tde_docdir}/HTML/en/kpackage \ + %{buildroot}%{tde_docdir}/HTML/en/ksysv \ + %{buildroot}%{tde_docdir}/HTML/en/lilo-config %else comps="kcron kdat knetworkconf kpackage ksysv kuser" mkdir -p %{buildroot}%{_datadir}/config \ @@ -189,10 +190,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/service*/*.desktop %{tde_libdir}/* %{_libdir}/pkgconfig/*.pc -%doc %lang(en) %{_docdir}/HTML/en/* %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-2 +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec index 26730e4db..6858904fe 100644 --- a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec +++ b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -98,8 +98,9 @@ Requires: %{name} = %{version}-%{release} # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %if 0%{?rhel} > 0 rm -rf doc/kgeography kgeography @@ -215,7 +216,6 @@ update-desktop-database >& /dev/null ||: %{_datadir}/icons/locolor/*/*/* %{_datadir}/services/* %{tde_libdir}/* -%doc %lang(en) %{_docdir}/HTML/en/* %files libs %defattr(-,root,root,-) @@ -230,6 +230,9 @@ update-desktop-database >& /dev/null ||: %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-2 +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec index 97e64fb35..1595a17f5 100644 --- a/redhat/kdegames/trinity-kdegames-3.5.13.spec +++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -75,8 +75,9 @@ License: LGPLv2 # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -175,7 +176,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/service*/* %{tde_libdir}/* %{_libdir}/libkdeinit_*.so -%doc %lang(en) %{_docdir}/HTML/en/* %files libs %defattr(-,root,root,-) @@ -192,6 +192,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Fri Nov 25 2011 Francois Andriot - 3.5.13-2 +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 From 76b5bf9294f99cda55e366be1bcd28d4a13fae6a Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 11:59:36 +0100 Subject: [PATCH 10/14] RHEL/Fedora: fix koffice, tellico, piklab, ktechlab HTML Directory location Add kvirc. --- .../applications/koffice/trinity-koffice.spec | 43 ++-- .../ktechlab/trinity-ktechlab.spec | 12 +- .../kvirc/kvirc-3.5.13-directories.patch | 15 ++ .../kvirc/kvirc-3.5.13-ftbfs.patch | 11 ++ redhat/applications/kvirc/trinity-kvirc.spec | 185 ++++++++++++++++++ .../applications/piklab/trinity-piklab.spec | 12 +- .../applications/tellico/trinity-tellico.spec | 14 +- redhat/components.txt | 2 + 8 files changed, 261 insertions(+), 33 deletions(-) create mode 100644 redhat/applications/kvirc/kvirc-3.5.13-directories.patch create mode 100644 redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch create mode 100644 redhat/applications/kvirc/trinity-kvirc.spec diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec index aa0fe2321..17a6329c4 100644 --- a/redhat/applications/koffice/trinity-koffice.spec +++ b/redhat/applications/koffice/trinity-koffice.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp koffice %define version 1.6.3 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -289,8 +289,9 @@ sed -i.dejavu-lgc \ # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -329,7 +330,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %__install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png # Replace absolute symlinks with relative ones -pushd %{buildroot}%{_docdir}/HTML +pushd %{buildroot}%{tde_docdir}/HTML for lang in *; do if [ -d $lang ]; then pushd $lang @@ -483,9 +484,9 @@ update-desktop-database -q &> /dev/null ||: %{_datadir}/apps/koshell/ %{_datadir}/apps/thesaurus/ %{_datadir}/config.kcfg/koshell.kcfg -%{_datadir}/doc/HTML/en/koffice/ -%{_datadir}/doc/HTML/en/koshell/ -%{_datadir}/doc/HTML/en/thesaurus/ +%{tde_docdir}/HTML/en/koffice/ +%{tde_docdir}/HTML/en/koshell/ +%{tde_docdir}/HTML/en/thesaurus/ %{_datadir}/icons/crystalsvg/*/*/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/locolor/*/*/* @@ -538,7 +539,7 @@ update-desktop-database -q &> /dev/null ||: %files devel %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/koffice-apidocs/ +%lang(en) %{tde_docdir}/HTML/en/koffice-apidocs/ %{_includedir}/* # FIXME: include only shlib symlinks we know/want to export %{_libdir}/lib*.so @@ -547,7 +548,7 @@ update-desktop-database -q &> /dev/null ||: %files kword %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/kword/ +%lang(en) %{tde_docdir}/HTML/en/kword/ %{_bindir}/kword %{_libdir}/libkdeinit_kword.so %{_libdir}/libkwordprivate.so.* @@ -562,7 +563,7 @@ update-desktop-database -q &> /dev/null ||: %files kspread %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/kspread/ +%lang(en) %{tde_docdir}/HTML/en/kspread/ %{_bindir}/kspread %{_libdir}/libkdeinit_kspread.so %{tde_libdir}/kspread.* @@ -589,7 +590,7 @@ update-desktop-database -q &> /dev/null ||: %files kpresenter %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/kpresenter/ +%lang(en) %{tde_docdir}/HTML/en/kpresenter/ %{_bindir}/kpresenter %{_bindir}/kprconverter.pl %{_libdir}/libkdeinit_kpresenter.so @@ -604,7 +605,7 @@ update-desktop-database -q &> /dev/null ||: %files karbon %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/karbon/ +%lang(en) %{tde_docdir}/HTML/en/karbon/ %{_bindir}/karbon %{_libdir}/libkdeinit_karbon.so %{tde_libdir}/*karbon*.* @@ -619,7 +620,7 @@ update-desktop-database -q &> /dev/null ||: %files kugar %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/kugar/ +%lang(en) %{tde_docdir}/HTML/en/kugar/ %{_bindir}/kugar %{_bindir}/kudesigner %{_libdir}/libkdeinit_kugar.so @@ -638,7 +639,7 @@ update-desktop-database -q &> /dev/null ||: %files kexi %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/kexi/ +%lang(en) %{tde_docdir}/HTML/en/kexi/ %{_bindir}/kexi* %{_bindir}/ksqlite* %{_libdir}/libkdeinit_kexi.so @@ -682,7 +683,7 @@ update-desktop-database -q &> /dev/null ||: %files kchart %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/kchart/ +%lang(en) %{tde_docdir}/HTML/en/kchart/ %{_bindir}/kchart %{_libdir}/libkchart*.so.* %{_libdir}/libkdeinit_kchart.so @@ -693,7 +694,7 @@ update-desktop-database -q &> /dev/null ||: %files kformula %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/kformula/ +%lang(en) %{tde_docdir}/HTML/en/kformula/ %{_bindir}/kformula %{_libdir}/libkdeinit_kformula.so %{tde_libdir}/*kformula*.* @@ -703,7 +704,7 @@ update-desktop-database -q &> /dev/null ||: %files kivio %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/kivio/ +%lang(en) %{tde_docdir}/HTML/en/kivio/ %{_bindir}/kivio %{_libdir}/libkdeinit_kivio.so %{_libdir}/libkiviocommon.so.* @@ -770,7 +771,7 @@ update-desktop-database -q &> /dev/null ||: %files kplato %defattr(-,root,root,-) -%lang(en) %{_docdir}/HTML/en/kplato/ +%lang(en) %{tde_docdir}/HTML/en/kplato/ %{_bindir}/kplato %{_libdir}/libkdeinit_kplato.so %{tde_libdir}/kplato.* @@ -950,8 +951,7 @@ update-desktop-database -q &> /dev/null ||: %{_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop %{_datadir}/apps/chalk %{_datadir}/apps/chalkplugins -#%{tde_docdir}/HTML/en/chalk -%lang(en) %{_docdir}/HTML/en/chalk +%lang(en) %{tde_docdir}/HTML/en/chalk %{_datadir}/icons/hicolor/*/apps/chalk.png %{_datadir}/services/chalk*.desktop %{_datadir}/servicetypes/chalk*.desktop @@ -959,6 +959,9 @@ update-desktop-database -q &> /dev/null ||: %changelog +* Fri Nov 25 2011 Francois Andriot - 1.6.3-2 +- Fix HTML directory location + * Tue Nov 22 2011 Francois Andriot - 1.6.3-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn' diff --git a/redhat/applications/ktechlab/trinity-ktechlab.spec b/redhat/applications/ktechlab/trinity-ktechlab.spec index b93b6d73a..5e5cf5673 100644 --- a/redhat/applications/ktechlab/trinity-ktechlab.spec +++ b/redhat/applications/ktechlab/trinity-ktechlab.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp ktechlab %define version 0.3 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -55,8 +55,9 @@ Homepage: http://ktechlab.org/ # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -102,7 +103,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/katepart/syntax/microbe.xml %{_datadir}/apps/ktechlab %{_datadir}/config.kcfg/ktechlab.kcfg -%{_docdir}/HTML/en/ktechlab/ +%{tde_docdir}/HTML/en/ktechlab/ %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/mimelnk/application/x-circuit.desktop %{_datadir}/mimelnk/application/x-flowcode.desktop @@ -111,5 +112,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Fri Nov 25 2011 Francois Andriot - 0.3-2 +- Fix HTML directory location + * Thu Nov 24 2011 Francois Andriot - 0.3-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kvirc/kvirc-3.5.13-directories.patch b/redhat/applications/kvirc/kvirc-3.5.13-directories.patch new file mode 100644 index 000000000..021671fee --- /dev/null +++ b/redhat/applications/kvirc/kvirc-3.5.13-directories.patch @@ -0,0 +1,15 @@ +--- kvirc/admin/acinclude.m4.in.ORI 2011-11-25 19:57:17.296988361 +0100 ++++ kvirc/admin/acinclude.m4.in 2011-11-25 19:57:47.365665354 +0100 +@@ -2603,10 +2603,10 @@ + helpdir="\${globalkvircdir}/help/en" + AC_SUBST(helpdir) + +- pluglibdir="\${globalkvircdir}/modules" ++ pluglibdir="\${libdir}/kvirc/$SS_DIRTAG/modules" + AC_SUBST(pluglibdir) + +- modulelibdir="\${globalkvircdir}/modules" ++ modulelibdir="\${libdir}/kvirc/$SS_DIRTAG/modules" + AC_SUBST(modulelibdir) + + defscriptdir="\${globalkvircdir}/defscript" diff --git a/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch b/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch new file mode 100644 index 000000000..4aca15ea1 --- /dev/null +++ b/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch @@ -0,0 +1,11 @@ +--- kvirc/src/kvirc/build/Makefile.am.ORI 2011-11-26 22:37:04.065565368 +0100 ++++ kvirc/src/kvirc/build/Makefile.am 2011-11-26 22:37:17.139565032 +0100 +@@ -8,7 +8,7 @@ + AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/include/ \ + $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\" + +-kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) ++kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio + kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la + + bin_PROGRAMS = kvirc diff --git a/redhat/applications/kvirc/trinity-kvirc.spec b/redhat/applications/kvirc/trinity-kvirc.spec new file mode 100644 index 000000000..1d4de4b88 --- /dev/null +++ b/redhat/applications/kvirc/trinity-kvirc.spec @@ -0,0 +1,185 @@ +# Default version for this component +%define kdecomp kvirc +%define version 3.4.0 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Trinity based next generation IRC client with module support +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://kvirc.net/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Patch0: kvirc-3.5.13-directories.patch +Patch1: kvirc-3.5.13-ftbfs.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +Requires: %{name}-data = %{version}-%{release} + +%description +A highly configurable graphical IRC client with an MDI interface, +built-in scripting language, support for IRC DCC, drag & drop file +browsing, and much more. KVIrc uses the KDE widget set, can be extended +using its own scripting language, integrates with KDE, and supports +custom plugins. + +If you are a developer and you want to write a custom module for KVIrc, +you need to install the kvirc-dev package. + +%package data +Group: Applications/Utilities +Summary: Data files for KVIrc +Requires: %{name} = %{version}-%{release} + +%description data +This package contains the architecture-independent data needed by KVIrc in +order to run, such as icons and images, language files, and shell scripts. +It also contains complete reference guides on scripting and functions +within KVIrc in its internal help format. Unless you want to use KVIrc only +as a very simple IRC client you are likely to want to write scripts to +tailor KVIrc to your needs. + +KVIrc is a graphical IRC client based on the KDE widget set which integrates +with the K Desktop Environment version 3. + +%package devel +Group: Development/Libraries +Summary: Development files for KVIrc +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains KVIrc libraries and include files you need if you +want to develop plugins for KVIrc. + +KVIrc is a graphical IRC client based on the KDE widget set which integrates +with the K Desktop Environment version 3. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 +%patch1 -p1 + +# 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,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +# Hardcoded absolute PATH to KDEDIR in source code ! That sucks ! +%__sed -i src/kvirc/kernel/kvi_app_fs.cpp \ + -e "s,/opt/kde3/lib,%{_prefix}/%{_lib},g" +%__sed -i src/kvirc/kernel/kvi_app_setup.cpp \ + -e "s,/opt/kde3,%{_prefix},g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +./autogen.sh + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export KDEDIR=%{_prefix} + +%configure \ + --disable-rpath \ + --with-fno-rtti --with-aa-fonts --with-big-channels \ + --enable-perl --with-pic --enable-wall \ + --with-ix86-asm \ + --with-qt-moc=%{_bindir}/tmoc \ + --with-extra-includes=%{_includedir}/tqt \ + --with-kde-services-dir=%{_datadir}/services \ + --with-kde-library-dir=%{_libdir} \ + --with-kde-include-dir=%{_includedir} + +# Symbolic links must exist prior to parallel building +%__make symlinks -C src/kvilib/build +%__make symlinks -C src/kvirc/build + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ... +%__mv \ + %{?buildroot}%{_datadir}/kvirc/3.4/license/COPYING \ + %{?buildroot}%{_datadir}/kvirc/3.4/license/EULA + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc ChangeLog FAQ README TODO +%{_bindir}/kvirc +%{_libdir}/*.so.* +%{_libdir}/kvirc/*/modules/*.so + +%files data +%defattr(-,root,root,-) +%{_bindir}/kvi_run_netscape +%{_bindir}/kvi_search_help +%{_libdir}/kvirc/*/modules/caps/ +%{_datadir}/applnk/Internet/kvirc.desktop +%{_datadir}/icons/hicolor/ +%{_datadir}/kvirc +%{_datadir}/mimelnk/text/*.desktop +%{_datadir}/services/*.protocol +%{_mandir}/man1/kvirc.1.gz + +%files devel +%defattr(-,root,root,-) +%{_bindir}/kvirc-config +%{_includedir}/kvirc/ +%{_libdir}/*.la +%{_libdir}/*.so +%{_libdir}/kvirc/*/modules/*.la + + +%Changelog +* Fri Nov 25 2011 Francois Andriot - 3.4.0-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/piklab/trinity-piklab.spec b/redhat/applications/piklab/trinity-piklab.spec index 3ee2a54eb..a2c698665 100644 --- a/redhat/applications/piklab/trinity-piklab.spec +++ b/redhat/applications/piklab/trinity-piklab.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp piklab %define version 0.15.2 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -56,8 +56,9 @@ are supported. A command-line programmer and debugger are also available. # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -110,7 +111,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/katepart/syntax/coff-pic.xml %{_datadir}/apps/katepart/syntax/jal-pic.xml %{_datadir}/apps/piklab -%{_docdir}/HTML/en/piklab +%{tde_docdir}/HTML/en/piklab %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/mimelnk/application/x-piklab.desktop %{_mandir}/man1/piklab-coff.1.gz @@ -120,5 +121,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Fri Nov 25 2011 Francois Andriot - 0.15.2-2 +- Fix HTML directory location + * Thu Nov 24 2011 Francois Andriot - 0.15.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tellico/trinity-tellico.spec b/redhat/applications/tellico/trinity-tellico.spec index 706eb4c30..b08853722 100644 --- a/redhat/applications/tellico/trinity-tellico.spec +++ b/redhat/applications/tellico/trinity-tellico.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp tellico %define version 1.3.2.1 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -107,8 +107,9 @@ as a separate package which can be updated through debian-volatile. # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -136,7 +137,7 @@ export PATH="%{_bindir}:${PATH}" %__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg # Remove dead symlink from French translation -%__rm %{?buildroot}%{_docdir}/HTML/fr/tellico/common +%__rm %{?buildroot}%{tde_docdir}/HTML/fr/tellico/common %__install -D -c -p -m 644 -T %{SOURCE1} %{?buildroot}%{_datadir}/pixmaps/tellico.xpm @@ -179,7 +180,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/apps/tellico/tellicoui.rc %{_datadir}/apps/tellico/welcome.html %{_datadir}/config.kcfg -%{_docdir}/HTML/*/tellico/ +%{tde_docdir}/HTML/*/tellico/ %{_datadir}/icons %{_datadir}/apps/mime %{_datadir}/mimelnk @@ -194,5 +195,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Fri Nov 25 2011 Francois Andriot - 1.3.2.1-2 +- Fix HTML directory location + * Thu Nov 24 2011 Francois Andriot - 1.3.2.1-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/components.txt b/redhat/components.txt index 49a0cd0dd..576d1cad2 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -38,6 +38,7 @@ applications/krename applications/yakuake #applications/desktop-effects-kde applications/filelight +applications/filelight-l10n applications/kdiff3 #applications/kuickshow #applications/basket @@ -80,3 +81,4 @@ applications/kile applications/kdmtheme applications/knemo applications/kerry +applications/kvirc From d57dfd781704d95f0f54638329d79eee8aa04163 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 14:33:19 +0100 Subject: [PATCH 11/14] RHEL/Fedora: updates kde-i18n, add filelight-l10n --- .../trinity-filelight-l10n.spec | 111 ++++++++++++++++++ redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec | 91 +++++++------- 2 files changed, 159 insertions(+), 43 deletions(-) create mode 100644 redhat/applications/filelight-l10n/trinity-filelight-l10n.spec diff --git a/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec b/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec new file mode 100644 index 000000000..835fa143c --- /dev/null +++ b/redhat/applications/filelight-l10n/trinity-filelight-l10n.spec @@ -0,0 +1,111 @@ +# Default version for this component +%define kdecomp filelight-l10n +%define version 1.0 +%define release 1 + +%define debug_package %{nil} + + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Localization (l10n) for Filelight, disk space usage tool [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities +%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 +BuildArch: noarch +%endif + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +Requires: trinity-filelight + +%description +This package provides localization(l10n) files (translations and docs) for +Filelight, Filelight allows you to understand your disk usage by graphically +representing your filesystem as a set of concentric, segmented rings. + +See the 'filelight' package description for more information. + + + +%prep +%setup -q -n applications/%{kdecomp} + +# 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,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{tde_docdir}/HTML/*/filelight +%{_datadir}/locale/*/LC_MESSAGES/filelight.mo + + +%Changelog +* Fri Nov 25 2011 Francois Andriot - 1.0-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec index 855b4aef4..dfd9eb97f 100644 --- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec +++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -639,12 +639,14 @@ done export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export kde_htmldir=%{tde_docdir}/HTML + for l in %{KDE_LANGS}; do for f in kde-i18n-${l}-*/; do if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then pushd ${f} %configure --prefix=%{_prefix} - %{__make} %{?_smp_mflags} + %__make %{?_smp_mflags} popd fi done @@ -660,9 +662,9 @@ for l in %{KDE_LANGS}; do pushd ${f} # RHEL/Fedora: dirty hack to remove directory 'common' from install list (else it fails to install) - if [ -r docs/Makefile ]; then - sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2," - fi +# if [ -r docs/Makefile ]; then +# sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2," +# fi %__make install DESTDIR=%{?buildroot} popd @@ -671,7 +673,7 @@ for l in %{KDE_LANGS}; do done # make symlinks relative -pushd %{buildroot}%{_docdir}/HTML +pushd %{buildroot}%{tde_docdir}/HTML for lang in *; do if [ -d $lang ]; then pushd $lang @@ -702,7 +704,7 @@ done popd # remove zero-length file -find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; +find %{buildroot}%{tde_docdir}/HTML -size 0 -exec rm -f {} \; # See http://fedoraproject.org/wiki/Languages (???) %__rm -f %{buildroot}%{_datadir}/locale/*/flag.png @@ -722,7 +724,7 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Afrikaans %defattr(-,root,root,-) %lang(af) %{_datadir}/locale/af/* -%lang(af) %{_docdir}/HTML/af/ +%lang(af) %{tde_docdir}/HTML/af/ %endif %if "%( grep -w ar <<< '%{KDE_LANGS}' )" != "" @@ -777,14 +779,14 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Catalan %defattr(-,root,root,-) %lang(ca) %{_datadir}/locale/ca/* -%lang(ca) %{_docdir}/HTML/ca/ +%lang(ca) %{tde_docdir}/HTML/ca/ %endif %if "%( grep -w cs <<< '%{KDE_LANGS}' )" != "" %files Czech %defattr(-,root,root,-) %lang(cs) %{_datadir}/locale/cs/* -%lang(cs) %{_docdir}/HTML/cs/ +%lang(cs) %{tde_docdir}/HTML/cs/ %endif %if "%( grep -w cy <<< '%{KDE_LANGS}' )" != "" @@ -797,14 +799,14 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Danish %defattr(-,root,root,-) %lang(da) %{_datadir}/locale/da/* -%lang(da) %{_docdir}/HTML/da/ +%lang(da) %{tde_docdir}/HTML/da/ %endif %if "%( grep -w de <<< '%{KDE_LANGS}' )" != "" %files German %defattr(-,root,root,-) %lang(de) %{_datadir}/locale/de/* -%lang(de) %{_docdir}/HTML/de/ +%lang(de) %{tde_docdir}/HTML/de/ %endif %if "%( grep -w el <<< '%{KDE_LANGS}' )" != "" @@ -817,7 +819,7 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files British %defattr(-,root,root,-) %lang(en_GB) %{_datadir}/locale/en_GB/* -%lang(en_GB) %{_docdir}/HTML/en_GB/ +%lang(en_GB) %{tde_docdir}/HTML/en_GB/ %endif %if "%( grep -w eo <<< '%{KDE_LANGS}' )" != "" @@ -830,14 +832,14 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Spanish %defattr(-,root,root,-) %lang(es) %{_datadir}/locale/es/* -%lang(es) %{_docdir}/HTML/es/ +%lang(es) %{tde_docdir}/HTML/es/ %endif %if "%( grep -w et <<< '%{KDE_LANGS}' )" != "" %files Estonian %defattr(-,root,root,-) %lang(et) %{_datadir}/locale/et/* -%lang(et) %{_docdir}/HTML/et/ +%lang(et) %{tde_docdir}/HTML/et/ %endif %if "%( grep -w eu <<< '%{KDE_LANGS}' )" != "" @@ -856,7 +858,7 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Finnish %defattr(-,root,root,-) %lang(fi) %{_datadir}/locale/fi/* -%lang(fi) %{_docdir}/HTML/fi/ +%lang(fi) %{tde_docdir}/HTML/fi/ %endif %if "%( grep -w fo <<< '%{KDE_LANGS}' )" != "" @@ -869,7 +871,7 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files French %defattr(-,root,root,-) %lang(fr) %{_datadir}/locale/fr/* -%lang(fr) %{_docdir}/HTML/fr/ +%lang(fr) %{tde_docdir}/HTML/fr/ %endif %if "%( grep -w fy <<< '%{KDE_LANGS}' )" != "" @@ -894,7 +896,7 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Hebrew %defattr(-,root,root,-) %lang(he) %{_datadir}/locale/he/* -%lang(he) %{_docdir}/HTML/he/ +%lang(he) %{tde_docdir}/HTML/he/ %endif %if "%( grep -w hi <<< '%{KDE_LANGS}' )" != "" @@ -907,21 +909,21 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Croatian %defattr(-,root,root,-) %lang(hr) %{_datadir}/locale/hr/* -%lang(hr) %{_docdir}/HTML/hr/ +%lang(hr) %{tde_docdir}/HTML/hr/ %endif %if "%( grep -w hu <<< '%{KDE_LANGS}' )" != "" %files Hungarian %defattr(-,root,root,-) %lang(hu) %{_datadir}/locale/hu/* -%lang(hu) %{_docdir}/HTML/hu/ +%lang(hu) %{tde_docdir}/HTML/hu/ %endif %if "%( grep -w id <<< '%{KDE_LANGS}' )" != "" %files Indonesian %defattr(-,root,root,-) %lang(id) %{_datadir}/locale/id/* -%lang(id) %{_docdir}/HTML/id/ +%lang(id) %{tde_docdir}/HTML/id/ %endif %if "%( grep -w is <<< '%{KDE_LANGS}' )" != "" @@ -934,35 +936,35 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Italian %defattr(-,root,root,-) %lang(it) %{_datadir}/locale/it/* -%lang(it) %{_docdir}/HTML/it/ +%lang(it) %{tde_docdir}/HTML/it/ %endif %if "%( grep -w ja <<< '%{KDE_LANGS}' )" != "" %files Japanese %defattr(-,root,root,-) %lang(ja) %{_datadir}/locale/ja/* -%lang(ja) %{_docdir}/HTML/ja/ +%lang(ja) %{tde_docdir}/HTML/ja/ %endif %if "%( grep -w ko <<< '%{KDE_LANGS}' )" != "" %files Korean %defattr(-,root,root,-) %lang(ko) %{_datadir}/locale/ko/* -%lang(ko) %{_docdir}/HTML/ko/ +%lang(ko) %{tde_docdir}/HTML/ko/ %endif %if "%( grep -w ku <<< '%{KDE_LANGS}' )" != "" %files Kurdish %defattr(-,root,root,-) %lang(ku) %{_datadir}/locale/ku/* -%lang(ku) %{_docdir}/HTML/ku/ +%lang(ku) %{tde_docdir}/HTML/ku/ %endif %if "%( grep -w lao <<< '%{KDE_LANGS}' )" != "" %files Lao %defattr(-,root,root,-) %lang(lo) %{_datadir}/locale/lo/* -%lang(lo) %{_docdir}/HTML/lo/ +%lang(lo) %{tde_docdir}/HTML/lo/ %endif %if "%( grep -w lt <<< '%{KDE_LANGS}' )" != "" @@ -999,21 +1001,21 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Dutch %defattr(-,root,root,-) %lang(nl) %{_datadir}/locale/nl/* -%lang(nl) %{_docdir}/HTML/nl/ +%lang(nl) %{tde_docdir}/HTML/nl/ %endif %if "%( grep -w nb <<< '%{KDE_LANGS}' )" != "" %files Norwegian %defattr(-,root,root,-) %lang(nb) %{_datadir}/locale/nb/* -#%lang(nb) %{_docdir}/HTML/nb/ +#%lang(nb) %{tde_docdir}/HTML/nb/ %endif %if "%( grep -w nn <<< '%{KDE_LANGS}' )" != "" %files Norwegian-Nynorsk %defattr(-,root,root,-) %lang(nn) %{_datadir}/locale/nn/* -#%lang(nn) %{_docdir}/HTML/nn/ +#%lang(nn) %{tde_docdir}/HTML/nn/ %endif %if "%( grep -w oc <<< '%{KDE_LANGS}' )" != "" @@ -1032,63 +1034,63 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Polish %defattr(-,root,root,-) %lang(pl) %{_datadir}/locale/pl/* -%lang(pl) %{_docdir}/HTML/pl/ +%lang(pl) %{tde_docdir}/HTML/pl/ %endif %if "%( grep -w pt <<< '%{KDE_LANGS}' )" != "" %files Portuguese %defattr(-,root,root,-) %lang(pt) %{_datadir}/locale/pt/* -%lang(pt) %{_docdir}/HTML/pt/ +%lang(pt) %{tde_docdir}/HTML/pt/ %endif %if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != "" %files Brazil %defattr(-,root,root,-) %lang(pt_BR) %{_datadir}/locale/pt_BR/* -%lang(pt_BR) %{_docdir}/HTML/pt_BR/ +%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/ %endif %if "%( grep -w ro <<< '%{KDE_LANGS}' )" != "" %files Romanian %defattr(-,root,root,-) %lang(ro) %{_datadir}/locale/ro/* -%lang(ro) %{_docdir}/HTML/ro/ +%lang(ro) %{tde_docdir}/HTML/ro/ %endif %if "%( grep -w ru <<< '%{KDE_LANGS}' )" != "" %files Russian %defattr(-,root,root,-) %lang(ru) %{_datadir}/locale/ru/* -%lang(ru) %{_docdir}/HTML/ru/ +%lang(ru) %{tde_docdir}/HTML/ru/ %endif %if "%( grep -w sk <<< '%{KDE_LANGS}' )" != "" %files Slovak %defattr(-,root,root,-) %lang(sk) %{_datadir}/locale/sk/* -%lang(sk) %{_docdir}/HTML/sk/ +%lang(sk) %{tde_docdir}/HTML/sk/ %endif %if "%( grep -w sl <<< '%{KDE_LANGS}' )" != "" %files Slovenian %defattr(-,root,root,-) %lang(sl) %{_datadir}/locale/sl/* -%lang(sl) %{_docdir}/HTML/sl/ +%lang(sl) %{tde_docdir}/HTML/sl/ %endif %if "%( grep -w sr <<< '%{KDE_LANGS}' )" != "" %files Serbian %defattr(-,root,root,-) %lang(sr) %{_datadir}/locale/sr/* -%lang(sr) %{_docdir}/HTML/sr/ +%lang(sr) %{tde_docdir}/HTML/sr/ %endif %if "%( grep -w sv <<< '%{KDE_LANGS}' )" != "" %files Swedish %defattr(-,root,root,-) %lang(sv) %{_datadir}/locale/sv/* -%lang(sv) %{_docdir}/HTML/sv/ +%lang(sv) %{tde_docdir}/HTML/sv/ %endif %if "%( grep -w ta <<< '%{KDE_LANGS}' )" != "" @@ -1113,13 +1115,13 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Turkish %defattr(-,root,root,-) %lang(tr) %{_datadir}/locale/tr/* -%lang(tr) %{_docdir}/HTML/tr/ +%lang(tr) %{tde_docdir}/HTML/tr/ %endif %if "%( grep -w uk <<< '%{KDE_LANGS}' )" != "" %files Ukrainian %defattr(-,root,root,-) -%lang(uk) %{_docdir}/HTML/uk/ +%lang(uk) %{tde_docdir}/HTML/uk/ %lang(uk) %{_datadir}/locale/uk/* %endif @@ -1145,24 +1147,27 @@ find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; %files Xhosa %defattr(-,root,root,-) %lang(xh) %{_datadir}/locale/xh/* -%lang(xh) %{_docdir}/HTML/xh/ +%lang(xh) %{tde_docdir}/HTML/xh/ %endif %if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != "" %files Chinese %defattr(-,root,root,-) %lang(zh_CN) %{_datadir}/locale/zh_CN/* -%lang(zh_CN) %{_docdir}/HTML/zh_CN/ +%lang(zh_CN) %{tde_docdir}/HTML/zh_CN/ %endif %if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != "" %files Chinese-Big5 %defattr(-,root,root,-) %lang(zh_TW) %{_datadir}/locale/zh_TW/* -%lang(zh_TW) %{_docdir}/HTML/zh_TW/ +%lang(zh_TW) %{tde_docdir}/HTML/zh_TW/ %endif %changelog +* Fri Nov 26 2011 Francois Andriot - 3.5.13-4 +- Fix HTML directory location + * Fri Nov 11 2011 Francois Andriot - 3.5.13-3 - Re-adds missing files 'entry.desktop' - Updates zh_TW translation, thanks to Wei-Lun Chao From d468a69eef2fceed375309974bdf571dac84d61b Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 14:47:37 +0100 Subject: [PATCH 12/14] RHEL/Fedora: fix kdmtheme, kile, knemo HTML directory location --- .../kdmtheme/trinity-kdmtheme.spec | 11 ++++++----- redhat/applications/kile/trinity-kile.spec | 19 ++++++++++--------- redhat/applications/knemo/trinity-knemo.spec | 5 +++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme.spec b/redhat/applications/kdmtheme/trinity-kdmtheme.spec index 74fadc821..05f4b43a5 100644 --- a/redhat/applications/kdmtheme/trinity-kdmtheme.spec +++ b/redhat/applications/kdmtheme/trinity-kdmtheme.spec @@ -52,8 +52,9 @@ that allows you to easily install, remove and change your KDM themes. # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -96,9 +97,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_libdir}/kcm_kdmtheme.la %{tde_libdir}/kcm_kdmtheme.so %{_datadir}/applications/kde/kdmtheme.desktop -%{_docdir}/HTML/en/kdmtheme/common -%{_docdir}/HTML/en/kdmtheme/index.cache.bz2 -%{_docdir}/HTML/en/kdmtheme/index.docbook +%{tde_docdir}/HTML/en/kdmtheme/common +%{tde_docdir}/HTML/en/kdmtheme/index.cache.bz2 +%{tde_docdir}/HTML/en/kdmtheme/index.docbook %{_datadir}/lintian/overrides/kdmtheme-trinity diff --git a/redhat/applications/kile/trinity-kile.spec b/redhat/applications/kile/trinity-kile.spec index b79b45c11..a012fd69e 100644 --- a/redhat/applications/kile/trinity-kile.spec +++ b/redhat/applications/kile/trinity-kile.spec @@ -420,8 +420,9 @@ Kile can support large projects consisting of several smaller files. # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" @@ -476,31 +477,31 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/pixmaps/kile.xpm %files i18n-da -%lang(da) %{_docdir}/HTML/da/kile +%lang(da) %{tde_docdir}/HTML/da/kile %lang(da) %{_datadir}/locale/da/LC_MESSAGES/kile.mo %files i18n-es -%lang(es) %{_docdir}/HTML/es/kile +%lang(es) %{tde_docdir}/HTML/es/kile %lang(es) %{_datadir}/locale/es/LC_MESSAGES/kile.mo %files i18n-et -%lang(et) %{_docdir}/HTML/et/kile +%lang(et) %{tde_docdir}/HTML/et/kile %lang(et) %{_datadir}/locale/et/LC_MESSAGES/kile.mo %files i18n-it -%lang(it) %{_docdir}/HTML/it/kile +%lang(it) %{tde_docdir}/HTML/it/kile %lang(it) %{_datadir}/locale/it/LC_MESSAGES/kile.mo %files i18n-nl -%lang(nl) %{_docdir}/HTML/nl/kile +%lang(nl) %{tde_docdir}/HTML/nl/kile %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/kile.mo %files i18n-pt -%lang(pt) %{_docdir}/HTML/pt/kile +%lang(pt) %{tde_docdir}/HTML/pt/kile %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/kile.mo %files i18n-sv -%lang(sv) %{_docdir}/HTML/sv/kile +%lang(sv) %{tde_docdir}/HTML/sv/kile %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/kile.mo %files i18n-ar diff --git a/redhat/applications/knemo/trinity-knemo.spec b/redhat/applications/knemo/trinity-knemo.spec index 0f71d6799..4a26e682b 100644 --- a/redhat/applications/knemo/trinity-knemo.spec +++ b/redhat/applications/knemo/trinity-knemo.spec @@ -58,8 +58,9 @@ Homepage: http://extragear.kde.org/apps/knemo/ # 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,%{_includedir}/tqt,g" +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" From 4d660f8b46b5ab5cdb2c6e125a9d842b355f83f8 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 16:37:54 +0100 Subject: [PATCH 13/14] RHEL/Fedora: - add '/sbin/ldconfig' to kpowersave postinstall - fix HTML directory location for kile --- redhat/applications/kile/trinity-kile.spec | 2 +- .../applications/kpowersave/trinity-kpowersave.spec | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/redhat/applications/kile/trinity-kile.spec b/redhat/applications/kile/trinity-kile.spec index a012fd69e..f3defbc8e 100644 --- a/redhat/applications/kile/trinity-kile.spec +++ b/redhat/applications/kile/trinity-kile.spec @@ -472,7 +472,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/config.kcfg/kile.kcfg %{_datadir}/icons/hicolor/*/apps/kile.png %{_datadir}/icons/hicolor/scalable/apps/kile.svgz -%{_docdir}/HTML/en/kile +%{tde_docdir}/HTML/en/kile %{_datadir}/mimelnk/text/x-kilepr.desktop %{_datadir}/pixmaps/kile.xpm diff --git a/redhat/applications/kpowersave/trinity-kpowersave.spec b/redhat/applications/kpowersave/trinity-kpowersave.spec index c69f96f5e..7ae8ec505 100644 --- a/redhat/applications/kpowersave/trinity-kpowersave.spec +++ b/redhat/applications/kpowersave/trinity-kpowersave.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kpowersave %define version 0.7.3 -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -60,6 +60,7 @@ Current feature list: * KNotify support * online help * localisations for many languages + KPowersave supports schemes with following configurable specific settings for: * screensaver @@ -95,17 +96,19 @@ export PATH="%{_bindir}:${PATH}" %post +/sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun +/sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) -%doc AUTHORS COPYING +%doc AUTHORS ChangeLog COPYING NEWS README TODO %{_bindir}/kpowersave %{_libdir}/libkdeinit_kpowersave.la %{_libdir}/libkdeinit_kpowersave.so @@ -119,5 +122,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/config/kpowersaverc %Changelog +* Sat Nov 26 2011 Francois Andriot - 0.7.3-2 +- Add missing /sbin/ldconfig +- Add missing doc file + * Sat Nov 19 2011 Francois Andriot - 0.7.3-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 From 3e075d9948911d74cf0ff0a373224bfce6e6bc75 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 17:13:31 +0100 Subject: [PATCH 14/14] RHEL/Fedora: add katapult, basket --- .../basket/trinity-basket-3.5.13.spec | 123 +++++++++++++++++ .../katapult/trinity-katapult-3.5.13.spec | 125 ++++++++++++++++++ redhat/components.txt | 4 +- 3 files changed, 250 insertions(+), 2 deletions(-) create mode 100644 redhat/applications/basket/trinity-basket-3.5.13.spec create mode 100644 redhat/applications/katapult/trinity-katapult-3.5.13.spec diff --git a/redhat/applications/basket/trinity-basket-3.5.13.spec b/redhat/applications/basket/trinity-basket-3.5.13.spec new file mode 100644 index 000000000..866bf10db --- /dev/null +++ b/redhat/applications/basket/trinity-basket-3.5.13.spec @@ -0,0 +1,123 @@ +# Default version for this component +%define kdecomp basket +%define version 1.0.3.1 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Taking care of your ideas. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +BuildRequires: gpgme-devel +BuildRequires: trinity-kdepim-devel + +%description +This application is mainly an all-purpose notes taker. It provide several baskets where +to drop every sort of items: text, rich text, links, images, sounds, files, colors, +application launcher... Objects can be edited, copied, dragged... So, you can arrange +them as you want ! This application can be used to quickly drop web objects (link, text, +images...) or notes, as well as to free your clutered desktop (if any). It is also useful +to collect informations for a report. Those data can be shared with co-workers by exporting +baskets to HTML. + + +%prep +%setup -q -n applications/%{kdecomp} + +# 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,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applications/*/*.desktop +%{_datadir}/apps/*/ +%{_datadir}/icons/*/*/*/* +%{_datadir}/locale/*/*/*.mo +%{tde_docdir}/HTML/en/*/ +%{_datadir}/services/*.desktop +%{_datadir}/mimelnk/application/*.desktop +%{_datadir}/services/*/*.desktop +%{_datadir}/config/magic/*.magic +%{_libdir}/*.so +%{_libdir}/*.la +%{tde_libdir}/*.so +%{tde_libdir}/*.la + + + +%Changelog +* Mon Aug 22 2011 Francois Andriot - 1.0.3.1-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 + diff --git a/redhat/applications/katapult/trinity-katapult-3.5.13.spec b/redhat/applications/katapult/trinity-katapult-3.5.13.spec new file mode 100644 index 000000000..c746befce --- /dev/null +++ b/redhat/applications/katapult/trinity-katapult-3.5.13.spec @@ -0,0 +1,125 @@ +# Default version for this component +%define kdecomp katapult +%define version 0.3.2.1 +%define release 3 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Faster access to applications, bookmarks, and other items. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +Katapult is an application for KDE, designed to allow faster access to +applications, bookmarks, and other items. It is plugin-based, so it can +launch anything that is has a plugin for. Its display is driven by +plugins as well, so its appearance is completely customizable. It was +inspired by Quicksilver for OS X. + + +%prep +%setup -q -n applications/%{kdecomp} + +# 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,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applications/*/*.desktop +%{_datadir}/icons/*/*/*/* +%{_datadir}/locale/*/*/*.mo +%{_datadir}/services/*.desktop +%{_datadir}/servicetypes/*.desktop +%{tde_libdir}/*.so +%{tde_libdir}/*.la +%{_libdir}/*.so.* +%{tde_docdir}/HTML/en/katapult + + +%exclude %{_libdir}/*.so +%exclude %{_libdir}/*.la + +%Changelog +* Fri Nov 25 2011 Francois Andriot - 0.3.2.1-3 +- Fix HTML directory location + +* Sun Oct 30 2011 Francois Andriot - 0.3.2.1-2 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 0.3.2.1-1 +- Initial build for RHEL 6.0 +- Import to GIT + diff --git a/redhat/components.txt b/redhat/components.txt index 576d1cad2..982971db9 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -41,8 +41,8 @@ applications/filelight applications/filelight-l10n applications/kdiff3 #applications/kuickshow -#applications/basket -#applications/katapult +applications/basket +applications/katapult #compizconfig-backend-kconfig applications/kbookreader applications/kdbusnotification