From 5da81c3ef2b95806e321a5de92f25c65d9b72647 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 21 Oct 2011 20:14:13 +0200 Subject: [PATCH 1/3] Add libcaldav and libcarddav for RHEL6 --- redhat/dependencies/libcaldav/libcaldav.spec | 59 +++++++++++++++++++ .../dependencies/libcarddav/libcarddav.spec | 58 ++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 redhat/dependencies/libcaldav/libcaldav.spec create mode 100644 redhat/dependencies/libcarddav/libcarddav.spec diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec new file mode 100644 index 000000000..220913b3b --- /dev/null +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -0,0 +1,59 @@ +Name: libcaldav +Version: 0.6.5 +Release: 2debian2%{?dist} + +Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ +Packager: Francois Andriot + +License: GPL +Group: System Environment/Libraries +Summary: A client library that adds support for the CalDAV protocol (rfc4791). + +Source0: libcaldav_0.6.5-2debian2.tar.gz + +%description +libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). +The object is to have a library which fully implements the protocol so that it is +easy to integrate CalDAV support into any PIM application. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} + +%description devel +%{summary} + + +%prep +%setup -q + +%build +autoreconf --force --install --symlink +%configure +%__make %{?_smp_mflags} + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%clean +%__rm -rf %{buildroot} + + +%files +%{_libdir}/*.so.* +%{_datadir}/doc/%{name} + +%files devel +%{_includedir}/%{name}-0.6.2 +%{_libdir}/*.a +%{_libdir}/*.la +%{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc + + +%Changelog +* Fri Oct 21 2011 Francois Andriot - 0.6.5-2debian2 +- Initial build for RHEL 6.0 diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec new file mode 100644 index 000000000..9ab0dbd9f --- /dev/null +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -0,0 +1,58 @@ +Name: libcarddav +Version: 0.6.2 +Release: 2debian2%{?dist} + +Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ +Packager: Francois Andriot + +License: GPL +Group: System Environment/Libraries +Summary: A client library that adds support for the CalDAV protocol (rfc4791). + +Source0: libcarddav_0.6.2-2debian2.tar.gz + +%description +Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. +It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. +Build dependencies are minimal, requiring only libcurl. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} + +%description devel +%{summary} + + +%prep +%setup -q + +%build +autoreconf --force --install --symlink +%configure +%__make %{?_smp_mflags} + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%clean +%__rm -rf %{buildroot} + + +%files +%{_libdir}/*.so.* + +%files devel +%{_includedir}/%{name}-0.6.1 +%{_libdir}/*.a +%{_libdir}/*.la +%{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc + + +%Changelog +* Fri Oct 21 2011 Francois Andriot - 0.6.5-2debian2 +- Initial build for RHEL 6.0 From 5b6e8c677d3fa92e8b7c75fd6d899ed0d01ddd64 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 21 Oct 2011 20:15:15 +0200 Subject: [PATCH 2/3] Small fixups for K3B --- redhat/applications/k3b/trinity-k3b-3.5.13.spec | 2 +- redhat/applications/k3b/trinity-k3b-icons.patch | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec index ebe091c1c..22f1c4238 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec @@ -39,7 +39,7 @@ Source2: k3brc # Legacy RedHat / Fedora patches # manual bufsize (upstream?) Patch4: k3b-1.0.4-manualbufsize.patch -# Thales: correction de l'icone +# RHEL6: Fix K3B icon Patch106: trinity-k3b-icons.patch diff --git a/redhat/applications/k3b/trinity-k3b-icons.patch b/redhat/applications/k3b/trinity-k3b-icons.patch index ae7c44ee9..4dd762215 100644 --- a/redhat/applications/k3b/trinity-k3b-icons.patch +++ b/redhat/applications/k3b/trinity-k3b-icons.patch @@ -11,10 +11,11 @@ diff -rcb k3b.ori/src/k3b.desktop k3b/src/k3b.desktop ! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue ! Categories=KDE;Application;AudioVideo;DiscBurning; X-DCOP-ServiceType=Unique ---- 116,123 ---- +--- 116,124 ---- Name[ar]= K3b Name[bn]=কে-থ্রি-বি Name[hi]=के3बी +! Encoding=UTF-8 ! MimeType=application/x-k3b;application/x-iso;application/x-cue; X-KDE-StartupNotify=true ! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue; From cd71be65dc30c8007ec54becdf6c50260ed8e908 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 21 Oct 2011 20:15:40 +0200 Subject: [PATCH 3/3] Update for QT3.3.3.8d --- redhat/dependencies/qt3/qt3.spec | 58 ++++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec index 62925d61c..39786c99e 100644 --- a/redhat/dependencies/qt3/qt3.spec +++ b/redhat/dependencies/qt3/qt3.spec @@ -595,7 +595,7 @@ rm -rf %{buildroot} # QT 3.3.8D (TDE): removes lots of unnecessary include files # (where do they come from ??? They were not in 3.3.8b !) %exclude %{qtdir}/include/btree.h -%exclude %{qtdir}/include/config.h +#%exclude %{qtdir}/include/config.h %exclude %{qtdir}/include/crc32.h %exclude %{qtdir}/include/debian_qsql_odbc.h %exclude %{qtdir}/include/deflate.h @@ -618,37 +618,37 @@ rm -rf %{buildroot} %exclude %{qtdir}/include/jinclude.h %exclude %{qtdir}/include/jmemsys.h %exclude %{qtdir}/include/jmorecfg.h -%exclude %{qtdir}/include/jpegint.h -%exclude %{qtdir}/include/jpeglib.h +#%exclude %{qtdir}/include/jpegint.h +#%exclude %{qtdir}/include/jpeglib.h %exclude %{qtdir}/include/jversion.h -%exclude %{qtdir}/include/libmng.h -%exclude %{qtdir}/include/libmng_chunk_io.h -%exclude %{qtdir}/include/libmng_chunk_prc.h -%exclude %{qtdir}/include/libmng_chunks.h -%exclude %{qtdir}/include/libmng_cms.h -%exclude %{qtdir}/include/libmng_conf.h -%exclude %{qtdir}/include/libmng_data.h -%exclude %{qtdir}/include/libmng_display.h -%exclude %{qtdir}/include/libmng_dither.h -%exclude %{qtdir}/include/libmng_error.h -%exclude %{qtdir}/include/libmng_filter.h -%exclude %{qtdir}/include/libmng_jpeg.h -%exclude %{qtdir}/include/libmng_memory.h -%exclude %{qtdir}/include/libmng_object_prc.h -%exclude %{qtdir}/include/libmng_objects.h -%exclude %{qtdir}/include/libmng_pixels.h -%exclude %{qtdir}/include/libmng_read.h -%exclude %{qtdir}/include/libmng_trace.h -%exclude %{qtdir}/include/libmng_types.h -%exclude %{qtdir}/include/libmng_write.h -%exclude %{qtdir}/include/libmng_zlib.h +#%exclude %{qtdir}/include/libmng.h +#%exclude %{qtdir}/include/libmng_chunk_io.h +#%exclude %{qtdir}/include/libmng_chunk_prc.h +#%exclude %{qtdir}/include/libmng_chunks.h +#%exclude %{qtdir}/include/libmng_cms.h +#%exclude %{qtdir}/include/libmng_conf.h +#%exclude %{qtdir}/include/libmng_data.h +#%exclude %{qtdir}/include/libmng_display.h +#%exclude %{qtdir}/include/libmng_dither.h +#%exclude %{qtdir}/include/libmng_error.h +#%exclude %{qtdir}/include/libmng_filter.h +#%exclude %{qtdir}/include/libmng_jpeg.h +#%exclude %{qtdir}/include/libmng_memory.h +#%exclude %{qtdir}/include/libmng_object_prc.h +#%exclude %{qtdir}/include/libmng_objects.h +#%exclude %{qtdir}/include/libmng_pixels.h +#%exclude %{qtdir}/include/libmng_read.h +#%exclude %{qtdir}/include/libmng_trace.h +#%exclude %{qtdir}/include/libmng_types.h +#%exclude %{qtdir}/include/libmng_write.h +#%exclude %{qtdir}/include/libmng_zlib.h %exclude %{qtdir}/include/moc_yacc.h %exclude %{qtdir}/include/opcodes.h %exclude %{qtdir}/include/os.h %exclude %{qtdir}/include/otlbuffer.h %exclude %{qtdir}/include/pager.h %exclude %{qtdir}/include/parse.h -%exclude %{qtdir}/include/png.h +#%exclude %{qtdir}/include/png.h %exclude %{qtdir}/include/pngasmrd.h %exclude %{qtdir}/include/pngconf.h %exclude %{qtdir}/include/sqlite.h @@ -656,10 +656,10 @@ rm -rf %{buildroot} %exclude %{qtdir}/include/trees.h %exclude %{qtdir}/include/vdbe.h %exclude %{qtdir}/include/vdbeInt.h -%exclude %{qtdir}/include/zconf.h -%exclude %{qtdir}/include/zconf.in.h -%exclude %{qtdir}/include/zlib.h -%exclude %{qtdir}/include/zutil.h +#%exclude %{qtdir}/include/zconf.h +#%exclude %{qtdir}/include/zconf.in.h +#%exclude %{qtdir}/include/zlib.h +#%exclude %{qtdir}/include/zutil.h %exclude %{qtdir}/mkspecs/linux-g++-sparc