rpms/keurocalc/devel .cvsignore, 1.2, 1.3 keurocalc.spec, 1.4, 1.5 sources, 1.2, 1.3 keurocalc-0.9.7-autotools.patch, 1.1, NONE

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/pkgs/rpms/keurocalc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30657/devel

Modified Files:
	.cvsignore keurocalc.spec sources 
Removed Files:
	keurocalc-0.9.7-autotools.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/keurocalc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Dec 2006 17:36:58 -0000	1.2
+++ .cvsignore	27 Feb 2008 07:09:57 -0000	1.3
@@ -1 +1 @@
-keurocalc-0.9.7.tgz
+keurocalc-1.0.0.tgz


Index: keurocalc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keurocalc/devel/keurocalc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- keurocalc.spec	18 Feb 2008 22:43:13 -0000	1.4
+++ keurocalc.spec	27 Feb 2008 07:09:57 -0000	1.5
@@ -1,6 +1,6 @@
 Name:          keurocalc
-Version:       0.9.7
-Release:       4%{?dist}
+Version:       1.0.0
+Release:       1.rc2%{?dist}
 Summary:       KEuroCalc is a universal currency converter and calculator
 
 License:       GPLv2
@@ -8,13 +8,13 @@
 
 URL:           http://opensource.bureau-cornavin.com/%{name}/
 Source:        http://opensource.bureau-cornavin.com/%{name}/%{name}-%{version}.tgz
-Patch0:        keurocalc-0.9.7-autotools.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdelibs-devel, gettext, automake
-# desktop-file-utils
+BuildRequires: kdelibs-devel, gettext, cmake, desktop-file-utils
 
+#ownership of /usr/share/applications/kde4/
+Requires:      kde-filesystem
 
 %description
 KEuroCalc is a universal currency converter and calculator. It
@@ -24,21 +24,13 @@
 
 
 %prep
-%setup -q -n %{name}
-
-# fix for autoconf >= 2.6 & automake >= 2.10 on admin/cvs.sh
-%if "%{?fedora}" > "6"
-%patch -p0 -b .autotools
-%endif
-
-# to skip unsermake dependency
-%{__make} -f admin/Makefile.common cvs
-
+%setup -q
 
 %build
-%configure --disable-rpath
 
-%{__make} %{?_smp_mflags}
+%{__cmake} -DCMAKE_INSTALL_PREFIX=%{_prefix} .
+
+%{__make} VERBOSE=1 %{?_smp_mflags}
 
 
 %install
@@ -46,42 +38,11 @@
 %{__make} DESTDIR=%{buildroot} install
 
 
-# Prior to desktop-file-install, the small hack below was used:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172423
-#desktop-file-install --vendor ""             \
-#  --dir %{buildroot}%{_datadir}/applications \
-#  --add-category "Office"                    \
-#  --delete-original                          \
-#  %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop
-
-# to skip the Lost&Found menu
-echo "Categories=Office;" >> \
-    %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop
-
-# The "Application" category is non-standard
-install -d %{buildroot}%{_datadir}/applications
-%{__mv} %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop \
-        %{buildroot}%{_datadir}/applications
+desktop-file-install --vendor fedora             \
+  %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
-## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
 
 %post
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -100,14 +61,28 @@
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING* TODO
+%{_bindir}/curconvd
 %{_bindir}/%{name}
-%{_datadir}/apps/%{name}/
+%{_datadir}/kde4/apps/%{name}/
+%{_datadir}/kde4/apps/curconvd/
 %{_docdir}/HTML/??/%{name}/
 %{_datadir}/icons/hicolor/??x??/apps/%{name}.png
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/kde4/fedora-%{name}.desktop
 
 
 %Changelog
+* Wed Feb 27 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.0-1.rc2
+- New upstream release candidate 2
+
+* Tue Feb 26 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.0-1.rc1
+- New upstream release candidate 1
+
+* Mon Feb 25 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.10-1
+- fixed for KDE4 and prepared for F9 Sulphur
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.7-4
+- Autorebuild for GCC 4.3
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.9.7-3
 - queued for mass rebuild for Fedora 8 - BUILDID
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/keurocalc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Dec 2006 17:36:58 -0000	1.2
+++ sources	27 Feb 2008 07:09:57 -0000	1.3
@@ -1 +1 @@
-d2e22dcbba267549bf3a93ed8bf715c2  keurocalc-0.9.7.tgz
+ad165731128c62a6f395ca6e625f4c6b  keurocalc-1.0.0.tgz


--- keurocalc-0.9.7-autotools.patch DELETED ---