[meego-commits] 8073: Changes to Trunk:Testing/kcalcore

[Fathi Boudra]

Hi,
I have made the following changes to kcalcore in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Fathi Boudra

[This message was auto-generated]

---

Request #8073:

  submit:   devel:qt-mtf/kcalcore(r7) -> Trunk:Testing/kcalcore


Message:
    * Mon Oct 04 2010 Fathi Boudra <fathi.boudra at nokia.com> - 4.0.5
- Various cleanup in the packaging
- Remove useless BuildRequires (dbus-1, meegotouch and qtopiamail)
- Use qmake macros
- More verbosity in %files

State:   new          2010-10-04T01:51:33 boudra
Comment: None



changes files:
--------------
--- kcalcore.changes
+++ kcalcore.changes
@@ -0,0 +1,6 @@
+* Mon Oct 04 2010 Fathi Boudra <fathi.boudra at nokia.com> - 4.0.5
+- Various cleanup in the packaging
+- Remove useless BuildRequires (dbus-1, meegotouch and qtopiamail)
+- Use qmake macros
+- More verbosity in %files
+
@@ -2 +8 @@
-- Fixes: BMC#6440
+- Fix mkcal's time zone detection. It fails zones with three slashes (BMC#6440)

spec files:
-----------
--- kcalcore.spec
+++ kcalcore.spec
@@ -1,3 +1,5 @@
+# spec file for package kcalcore
+
 %define ver_maj 4
 %define ver_min 0
 %define ver_pat 5
@@ -5,45 +7,30 @@
 Name: kcalcore
 Version: %{ver_maj}.%{ver_min}.%{ver_pat}
 Release: 1
+License:        Other
 Summary: Extended KDE kcal calendar library port for Maemo
 Group: System/Libraries
-License: Other
 Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  doxygen
+BuildRequires:  fdupes
+BuildRequires:  graphviz
+BuildRequires:  pkgconfig(QtCore)
+BuildRequires:  pkgconfig(libical)
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(uuid)
-BuildRequires: pkgconfig(dbus-1)
-BuildRequires: pkgconfig(qtopiamail)
-BuildRequires: pkgconfig(meegotouch)
-BuildRequires: pkgconfig(libical)
-BuildRequires: pkgconfig(QtCore)
 BuildRequires: timed-devel
-BuildRequires: doxygen, graphviz
-BuildRequires: fdupes
 
 %description
 %{summary}.
 
-%files
-%defattr(-,root,root,-)
-%{_libdir}/*.so.*
-
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}
 
 %description devel
 %{summary}.
 
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_includedir}/kcalcoren/*.h
-%{_includedir}/kcalcoren/kpimutils/*.h
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/qt4/mkspecs/features/*.prf
-
 %package doc
 Summary: Documentation files for %{name}
 Group: Documentation
@@ -51,30 +38,108 @@
 %description doc
 %{summary}.
 
-%files doc
-%defattr(-,root,root,-)
-%{_docdir}/libkcalcoren-doc/*
-
 %prep
 %setup -q
 
 %build
 touch src/libkcalcoren.so.%{ver_maj}.%{ver_min}.%{ver_pat}
-qmake
+%qmake
 make VER_MAJ=%{ver_maj} VER_MIN=%{ver_min} VER_PAT=%{ver_pat} %{?_smp_mflags}
 make doc
 
-
 %install
-rm -rf %{buildroot}
-make INSTALL_ROOT=%{buildroot} VER_MAJ=%{ver_maj} VER_MIN=%{ver_min} VER_PAT=%{ver_pat} install
-%fdupes %{buildroot}/%{_includedir}/
-%fdupes %{buildroot}/%{_docdir}/libkcalcoren-doc/
-ln -s %{_libdir}/libkcalcoren.so.%{ver_maj}.%{ver_min}.%{ver_pat} %{buildroot}/%{_libdir}/libkcalcoren.so
-
-%clean
-rm -rf %{buildroot}
-
+%qmake_install VER_MAJ=%{ver_maj} VER_MIN=%{ver_min} VER_PAT=%{ver_pat}
+%fdupes %{buildroot}%{_includedir}/
+%fdupes %{buildroot}%{_docdir}/libkcalcoren-doc/
+ln -s %{_libdir}/libkcalcoren.so.%{ver_maj}.%{ver_min}.%{ver_pat} %{buildroot}%{_libdir}/libkcalcoren.so
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/libkcalcoren.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libkcalcoren.so
+%{_includedir}/kcalcoren/alarm.h
+%{_includedir}/kcalcoren/attachment.h
+%{_includedir}/kcalcoren/attendee.h
+%{_includedir}/kcalcoren/calendar.h
+%{_includedir}/kcalcoren/calfilter.h
+%{_includedir}/kcalcoren/calformat.h
+%{_includedir}/kcalcoren/calstorage.h
+%{_includedir}/kcalcoren/compat.h
+%{_includedir}/kcalcoren/config-kcalcore.h
+%{_includedir}/kcalcoren/config.h
+%{_includedir}/kcalcoren/customproperties.h
+%{_includedir}/kcalcoren/duration.h
+%{_includedir}/kcalcoren/event.h
+%{_includedir}/kcalcoren/exceptions.h
+%{_includedir}/kcalcoren/filestorage.h
+%{_includedir}/kcalcoren/freebusy.h
+%{_includedir}/kcalcoren/freebusycache.h
+%{_includedir}/kcalcoren/freebusyperiod.h
+%{_includedir}/kcalcoren/freebusyurlstore.h
+%{_includedir}/kcalcoren/global.h
+%{_includedir}/kcalcoren/icalformat.h
+%{_includedir}/kcalcoren/icalformat_p.h
+%{_includedir}/kcalcoren/icaltimezones.h
+%{_includedir}/kcalcoren/incidence.h
+%{_includedir}/kcalcoren/incidencebase.h
+%{_includedir}/kcalcoren/incidenceformatter.h
+%{_includedir}/kcalcoren/invitationhandlerif.h
+%{_includedir}/kcalcoren/journal.h
+%{_includedir}/kcalcoren/kaboutdata.h
+%{_includedir}/kcalcoren/kapplication.h
+%{_includedir}/kcalcoren/kcalcore_export.h
+%{_includedir}/kcalcoren/kcalendarsystem.h
+%{_includedir}/kcalcoren/kcalendarsystemgregorian.h
+%{_includedir}/kcalcoren/kcalendarsystemhebrew.h
+%{_includedir}/kcalcoren/kcalendarsystemhijri.h
+%{_includedir}/kcalcoren/kcalendarsystemjalali.h
+%{_includedir}/kcalcoren/kcmdlineargs.h
+%{_includedir}/kcalcoren/kcodecs.h
+%{_includedir}/kcalcoren/kcomponentdata.h
+%{_includedir}/kcalcoren/kconfig.h
+%{_includedir}/kcalcoren/kconfiggroup.h
+%{_includedir}/kcalcoren/kdatetime.h
+%{_includedir}/kcalcoren/kde_static.h
+%{_includedir}/kcalcoren/kdebug.h
+%{_includedir}/kcalcoren/kdecore_export.h
+%{_includedir}/kcalcoren/kdemacros.h
+%{_includedir}/kcalcoren/kglobal.h
+%{_includedir}/kcalcoren/klocale.h
+%{_includedir}/kcalcoren/kmessagebox.h
+%{_includedir}/kcalcoren/kpimutils/email.h
+%{_includedir}/kcalcoren/kpimutils/supertrait.h
+%{_includedir}/kcalcoren/krandom.h
+%{_includedir}/kcalcoren/ksavefile.h
+%{_includedir}/kcalcoren/kstandarddirs.h
+%{_includedir}/kcalcoren/kstringhandler.h
+%{_includedir}/kcalcoren/ksystemtimezone.h
+%{_includedir}/kcalcoren/ktemporaryfile.h
+%{_includedir}/kcalcoren/ktimezone.h
+%{_includedir}/kcalcoren/ktzfiletimezone.h
+%{_includedir}/kcalcoren/kurl.h
+%{_includedir}/kcalcoren/meego_port.h
+%{_includedir}/kcalcoren/memorycalendar.h
+%{_includedir}/kcalcoren/period.h
+%{_includedir}/kcalcoren/person.h
+%{_includedir}/kcalcoren/qtest_kde.h
+%{_includedir}/kcalcoren/recurrence.h
+%{_includedir}/kcalcoren/recurrencerule.h
+%{_includedir}/kcalcoren/schedulemessage.h
+%{_includedir}/kcalcoren/sortablelist.h
+%{_includedir}/kcalcoren/sorting.h
+%{_includedir}/kcalcoren/supertrait.h
+%{_includedir}/kcalcoren/todo.h
+%{_includedir}/kcalcoren/vcalformat.h
+%{_includedir}/kcalcoren/visitor.h
+%{_libdir}/pkgconfig/libkcalcoren.pc
+%{_datadir}/qt4/mkspecs/features/kcalcoren.prf
+
+%files doc
+%defattr(-,root,root,-)
+%doc %{_docdir}/libkcalcoren-doc/*

other changes:
--------------