rpms/kopete-cryptography/F-10 .cvsignore, 1.2, 1.3 kopete-cryptography.spec, 1.4, 1.5 sources, 1.2, 1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kopete-cryptography/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv874

Modified Files:
	.cvsignore kopete-cryptography.spec sources 
Log Message:
* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-9
- 1.3.0-kde4.2.3
- cleanup docdir/HTML ownership
- sync from F-10 branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kopete-cryptography/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Dec 2008 12:40:01 -0000	1.2
+++ .cvsignore	11 May 2009 15:31:16 -0000	1.3
@@ -1 +1 @@
-kopete-cryptography-1.3.0-kde4.1.3.tar.bz2
+kopete-cryptography-1.3.0-kde4.2.3.tar.bz2


Index: kopete-cryptography.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kopete-cryptography/F-10/kopete-cryptography.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kopete-cryptography.spec	11 Dec 2008 17:22:34 -0000	1.4
+++ kopete-cryptography.spec	11 May 2009 15:31:16 -0000	1.5
@@ -1,39 +1,41 @@
 %define pluginversion 1.3.0
-%define kdeversion kde4.1.3
+%define kdeversion 4.2.3
 
 Name:           kopete-cryptography
 Version:        %{pluginversion}
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Encrypts and signs messages in Kopete using the OpenPGP
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://extragear.kde.org/apps/kopete%20cryptography/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/4.1.3/src/extragear/%{name}-%{pluginversion}-%{kdeversion}.tar.bz2
-Patch0:         kopete-cryptography-1.3.0-kde4.1.3-prevent-chat-session-destroyed.patch
+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{kdeversion}/src/extragear/%{name}-%{pluginversion}-kde%{kdeversion}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs4-devel >= 4
-BuildRequires:  kde-filesystem >= 4
-BuildRequires:  cmake
-BuildRequires:  kdenetwork-devel >= 4
-BuildRequires:  kdepim-devel >= 4
-BuildRequires:  kdepimlibs-devel >= 4
+## upstremable patches
+Patch50:        kopete-cryptography-1.3.0-kde4.1.3-prevent-chat-session-destroyed.patch
+
+BuildRequires:  kdelibs4-devel >= %{kdeversion} 
+BuildRequires:  kdenetwork-devel 
+BuildRequires:  kdepim-devel
+BuildRequires:  kdepimlibs-devel
 BuildRequires:  gpgme-devel
 BuildRequires:  openldap-devel
 BuildRequires:  gettext-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-
-Requires: kdenetwork >= 7:4.1.3-2
+# for kopete
+Requires: kdenetwork >= 7:%{kdeversion}
 
 %description
 Kopete cryptography plugin encrypts and signs messages using the OpenPGP
 standard. It also handles incoming messages that are encrypted or signed.
 
 %prep
-%setup -q -n %{name}-%{pluginversion}-%{kdeversion}
-%patch0 -p1 -b .prevent-chat-session-destroyed
+%setup -q -n %{name}-%{pluginversion}-kde%{kdeversion}
+
+%patch50 -p1 -b .prevent-chat-session-destroyed
+
 
 %build
 mkdir -p %{_target_platform}
@@ -41,22 +43,24 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} 
-# HTML
-for lang_dir in %{buildroot}%{_docdir}/HTML/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) %doc %{_docdir}/HTML/$lang" >> %{name}.lang
+%find_lang %{name}
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
+  if [ -d ${lang_dir} ]; then
+    lang=$(basename ${lang_dir})
+    echo "%lang(${lang}) ${HTML_DIR}/${lang}/*/" >> %{name}.lang
   fi
 done
+fi
 
 
 %clean
@@ -72,21 +76,33 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/kopete_cryptography.desktop
 %{_kde4_appsdir}/kopete_cryptography/
 
+
 %changelog
+* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-9
+- 1.3.0-kde4.2.3
+- cleanup docdir/HTML ownership
+- sync from F-10 branch
+
 * Thu Dec 11 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-8
 - requires correct version of kopete
+
 * Tue Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-6
 - prevent chat session destroyed patch
+
 * Tue Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-5
 - remove post and postun sections
+
 * Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.3.0-4
 - rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
 * Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-3
 - post and postun sections
 - install section cleanup
+
 * Mon Dec 01 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-2
 - buildroot macro usage consistency
 - make VERBOSE=1
 - owns kopete_cryptography directory
+
 * Thu Nov 27 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-1
 - initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kopete-cryptography/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Dec 2008 12:40:01 -0000	1.2
+++ sources	11 May 2009 15:31:16 -0000	1.3
@@ -1 +1 @@
-25697c1b7f85c660f4cfc73b27c2e4c8  kopete-cryptography-1.3.0-kde4.1.3.tar.bz2
+d0b911472504f19a90ac40dbb6786ec7  kopete-cryptography-1.3.0-kde4.2.3.tar.bz2