[kbibtex] - Update to 0.3 - BR: cmake kdelibs-devel poppler-qt4-devel added, kdelibs3-devel removed - Cmake-ba

cheeselee cheeselee at fedoraproject.org
Fri Jun 24 19:41:31 UTC 2011 

commit fd903197608976b5468276e76e3e6020c0f0cc6c
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Sat Jun 25 03:41:45 2011 +0800

    - Update to 0.3
    - BR: cmake kdelibs-devel poppler-qt4-devel added, kdelibs3-devel removed
    - Cmake-based build
    - Scriptlets revised
    - Specfile Untabified
    - URL and Source0 updated
    - kbibtex-0.2-desktop-file-type.patch removed
    - Other cleanup

 .gitignore                                        |    1 +
 kbibtex-0.1.5-filteredselection.patch             |   41 -------
 kbibtex-0.1.5-gcc4.2.patch                        |   13 --
 kbibtex-0.1.5-storesearchurls.patch               |   12 --
 kbibtex-0.1.5-viewdocument.patch                  |   56 ---------
 kbibtex-0.1.5-webquerypubmedmultiplequeries.patch |   10 --
 kbibtex-0.1.5-xslthtmlexport.patch                |   15 ---
 kbibtex-0.2-desktop-file-type.patch               |    9 --
 kbibtex-qualifier.patch                           |   11 --
 kbibtex.spec                                      |  130 +++++++++------------
 sources                                           |    2 +-
 11 files changed, 56 insertions(+), 244 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1fe72cf..bbc9f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 kbibtex-0.2.2.tar.bz2
+/kbibtex-0.3.tar.bz2
diff --git a/kbibtex.spec b/kbibtex.spec
index 70a4b81..a7d34f6 100644
--- a/kbibtex.spec
+++ b/kbibtex.spec
@@ -1,106 +1,84 @@
-Name:		kbibtex
-Version:	0.2.2
-Release:	20%{?dist}
-Summary:	A BibTeX editor for KDE  
-
-Group:		Applications/Editors
-License:	GPLv2+
-URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
-Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
-Patch1:		kbibtex-0.2-desktop-file-type.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  kdelibs3-devel >= 3.3 libxslt-devel desktop-file-utils gettext
-#Requires:       
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+Name:       kbibtex
+Version:    0.3
+Release:    1%{?dist}
+Summary:    A BibTeX editor for KDE
+
+Group:      Applications/Editors
+License:    GPLv2+
+URL:        http://home.gna.org/kbibtex/index.html
+Source0:    http://download.gna.org/%{name}/%{version}/%{name}-%{version}.tar.bz2
+
+BuildRequires:  cmake kdelibs-devel libxslt-devel desktop-file-utils gettext
+BuildRequires:  poppler-qt4-devel
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 %description
 KBibTeX is a BibTeX editor for KDE
 
 %prep
 %setup -q
-%patch1 -p1 -b .type
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-
-%configure --disable-rpath --disable-debug
-make %{?_smp_mflags}
-
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-#
-# Replace original .desktop files with proper ones
-#
-desktop-file-install --vendor fedora				\
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
-        --add-category X-Fedora					\
-	--delete-original \
-	${RPM_BUILD_ROOT}%{_datadir}/services/kbibtex_part.desktop
-
-desktop-file-install --vendor fedora				\
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
-        --add-category X-Fedora					\
-	--delete-original \
-	${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kbibtex.desktop
-
-%find_lang %{name}
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
+desktop-file-install \
+    --dir %{buildroot}%{_kde4_datadir}/applications/kde4 \
+    --add-category Education \
+    --delete-original \
+    %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
 
 %post
+/sbin/ldconfig
+update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null ||:
-
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %postun
+/sbin/ldconfig
+update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null ||:
-
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+   touch --no-create %{_datadir}/icons/hicolor || :
+   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%files -f %{name}.lang
-%defattr(-,root,root,-) 
-%doc AUTHORS COPYING NEWS README TODO
-
-%{_bindir}/kbibtex
-
-%{_libdir}/kde3/libkbibtexpart.la
-%{_libdir}/kde3/libkbibtexpart.so
-
-%{_datadir}/apps/kbibtexpart/ 
-%{_datadir}/apps/kbibtex/ 
-%{_docdir}/HTML/en/kbibtex/ 
-
-%{_datadir}/icons/hicolor/128x128/apps/kbibtex.png
-%{_datadir}/icons/hicolor/16x16/apps/kbibtex.png
-%{_datadir}/icons/hicolor/22x22/apps/kbibtex.png
-%{_datadir}/icons/hicolor/32x32/apps/kbibtex.png
-%{_datadir}/icons/hicolor/48x48/apps/kbibtex.png
-%{_datadir}/icons/hicolor/64x64/apps/kbibtex.png
-#%{_datadir}/locale/de/LC_MESSAGES/kbibtex.mo
-#%{_datadir}/locale/fr/LC_MESSAGES/kbibtex.mo
-#%{_datadir}/locale/it/LC_MESSAGES/kbibtex.mo
-#%{_datadir}/locale/pl/LC_MESSAGES/kbibtex.mo
-#%{_datadir}/locale/ru/LC_MESSAGES/kbibtex.mo
-
-%{_mandir}/man1/kbibtex.1.gz
-
-%{_datadir}/applications/fedora-kbibtex_part.desktop
-%{_datadir}/applications/fedora-kbibtex.desktop
+%posttrans
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%files
+%doc LICENSE README
+%{_kde4_bindir}/%{name}
+%{_kde4_libdir}/lib%{name}*.so
+%{_kde4_libdir}/kde4/%{name}part.so
+%{_kde4_datadir}/applications/kde4/%{name}.desktop
+%{_kde4_appsdir}/%{name}/
+%{_kde4_appsdir}/%{name}part/
+%{_kde4_datadir}/kde4/services/%{name}part.desktop
+%{_datadir}/mime/packages/bibliography.xml
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_mandir}/man1/%{name}.1.*
 
 %changelog
+* Sat Jun 25 2011 Robin Lee <cheeselee at fedoraproject.org> - 0.3-1
+- Update to 0.3
+- BR: cmake kdelibs-devel poppler-qt4-devel added, kdelibs3-devel removed
+- Cmake-based build
+- Scriptlets revised
+- Specfile Untabified
+- URL and Source0 updated
+- kbibtex-0.2-desktop-file-type.patch removed
+- Other cleanup
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index bd2797f..754d873 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9681167ed7942c3cc502f116023927d  kbibtex-0.2.2.tar.bz2
+79fc7ea383014ea84ca5d9e71f24be5a  kbibtex-0.3.tar.bz2

More information about the scm-commits mailing list