updated: attica, kde-i18n-ja, kde-settings, soprano

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1392 ec354946-7b23-47d6-9f5a-488ba84defc7

a/attica/attica-vl.spec

@@ -1,7 +1,7 @@
 Name:           attica
-Version:        0.1.3
-Release:        1%{?_dist_release}
 Summary:        Implementation of the Open Collaboration Services API
+Version:        0.1.4
+Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -10,8 +10,6 @@ Source0:        ftp://ftp.kde.org/pub/kde/stable/attica/attica-%{version}.tar.bz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 ## upstreamable patches
-# fix Version in libattica.pc
-Patch50: attica-0.1.2-pkgconfig.patch
 
 BuildRequires:  cmake
 BuildRequires:  qt4-devel
@@ -35,8 +33,6 @@ developing applications that use %{name}.
 %prep
 %setup -q
 
-%patch50 -p1 -b .pkgconfig
-
 
 %build
 %ifarch x86_64
@@ -77,6 +73,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jul 10 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.4-1
+- new upstream release
+- dropt Patch50 (merged into upstream)
+
 * Sat Apr 10 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.3-1
 - new upstream release
 

k/kde-i18n-ja/kde-i18n-ja-vl.spec

@@ -1,28 +1,19 @@
-%define beta 0
-%define srcdir ftp://ftp.kde.org/pub/kde/snapshots/current
-
 Name: kde-i18n-ja
-Version: 3.5.10
-%if %{beta}
-Release: 1.%{beta}%{?_dist_release}
-%else
-Release: 1%{?_dist_release}
-%endif
 Summary: K Desktop Environment - Japanese Messages
 Summary(ja): Kデスクトップ環境 3 - 日本語メッセージ
-%if %{beta}
-Source: ftp://ftp.kde.org/pub/kde/unstable/%{version}-%{beta}/src/kde-i18n/%{name}-%{version}-%{beta}.tar.bz2
-%else
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-i18n/%{name}-%{version}.tar.bz2
-%endif
+Version: 3.5.10
+Release: 3%{?_dist_release}
 
 URL: http://www.kde.gr.jp/
 Group: User Interface/Desktops
 License: GPL/LGPL
 
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-i18n/%{name}-%{version}.tar.bz2
+
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: kdelibs3-devel
+BuildRequires: arts-devel
 Requires: kdelibs3
 
 %description
@@ -51,6 +42,7 @@ done
 # See http://fedoraproject.org/wiki/Languages
 rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/flag.png
 
+%if %{?_dist_release} != "vl4" && %{?_dist_release} != "vl5"
 # remove .mo and entry.desktop files which conflict with KDE 4 kde-l10n
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/amor.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ark.mo
@@ -678,6 +670,7 @@ rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkholidays.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkleopatra.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpgp.mo
 rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libksieve.mo
+%endif
 
 # Generieren der Fileliste
 cd $RPM_BUILD_ROOT
@@ -692,6 +685,12 @@ rm -f ../file.list
 %files -f ../file.list
 
 %changelog
+* Sat Jul 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-3
+- added BR: arts-devel
+
+* Wed Jun 23 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-2
+- rebuilt for Vine Linux 5
+
 * Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
 - new upstream release
 

k/kde-settings/kde-settings-vl.spec

@@ -5,7 +5,7 @@ Summary: Config files for kde
 Summary(ja): KDE の設定ファイル
 Name:    kde-settings
 Version: %{majorver}.%{minorver}
-Release: 4%{?_dist_release}
+Release: 6%{?_dist_release}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -18,6 +18,9 @@ Source20: kdm.pamd
 Source21: kdm-np.pamd
 # konversation
 Source22: konversationrc.vine
+# kdmrc
+Source23: kdmrc.vine5
+Source24: kdmrc.seed
 
 # customized for Vine Linux by Patch
 Patch1:   kdmrc_vine.patch
@@ -59,6 +62,7 @@ Obsoletes: kde-config-kdm < 4.0
 Requires: kdm
 #Requires: system-kdm-theme
 Requires: xorg-x11-xdm
+Requires: vine-backgrounds
 Requires(pre): coreutils
 Requires(post): coreutils grep sed
 #Requires(post): kde4-macros(api) = %{_kde4_macros_api}
@@ -87,7 +91,7 @@ Requires: alsa-plugins-pulseaudio
 %prep
 %setup -q -n %{name}-%{majorver}-%{minorver}
 
-%patch1 -p1 
+#patch1 -p1 
 %patch2 -p1
 %patch3 -p1
 
@@ -123,6 +127,13 @@ install -m644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kdm-np
 # overwrite konversationrc
 install -m644 %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/kde-settings/kde-profile/default/share/config/konversationrc
 
+# overwrite kdmrc
+%if %{?_dist_release} == "vl4" || %{?_dist_release} == "vl5"
+install -m644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/kde/kdm/kdmrc
+%else
+install -m644 %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/kde/kdm/kdmrc
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -136,16 +147,28 @@ rm -rf $RPM_BUILD_ROOT
 [ -d %{_datadir}/config/kdm -a ! -L %{_datadir}/config/kdm ] && \
   mv -v %{_datadir}/config/kdm %{_datadir}/config/kdm.rpmorig ||:
 
-%post kdm
+#post kdm
 ## KDM fixup(s)
 # handle move from /etc/X11/xdm/kdmrc to /etc/kde/kdm/kdmrc
-[ ! -f %{_sysconfdir}/kde/kdm/kdmrc -a -f %{_sysconfdir}/kde/kdm/kdmrc.rpmnew ] && \
-  cp -a %{_sysconfdir}/kde/kdm/kdmrc.rpmnew %{_sysconfdir}/kde/kdm/kdmrc ||:
+#[ ! -f %{_sysconfdir}/kde/kdm/kdmrc -a -f %{_sysconfdir}/kde/kdm/kdmrc.rpmnew ] && \
+#  cp -a %{_sysconfdir}/kde/kdm/kdmrc.rpmnew %{_sysconfdir}/kde/kdm/kdmrc ||:
+## kdm v3 themes don't work (#444730)
+## this hack assumes %_datadir != %_kde4_datadir
+#(grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
+# sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_datadir}/kde4/apps/kdm/themes/Constantine|" \
+# %{_sysconfdir}/kde/kdm/kdmrc
+#) ||:
+
+%triggerin kdm -- kdm >= 4
 # kdm v3 themes don't work (#444730)
 # this hack assumes %_datadir != %_kde4_datadir
-(grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
- sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/Constantine|" \
- %{_sysconfdir}/kde/kdm/kdmrc
+(grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_datadir}/kde4/apps/kdm/themes/oxygen-air|" %{_sysconfdir}/kde/kdm/kdmrc
+) ||:
+
+%triggerin kdm -- kdmbase3
+# kdm v3 themes don't work (#444730)
+# this hack assumes %_datadir != %_kde4_datadir
+(grep "^Theme=%{_datadir}/kde4/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && sed -i -e "s|^Theme=%{_datadir}/kde4/apps/kdm/themes/.*|Theme=%{_datadir}/apps/kdm/themes/circles|" %{_sysconfdir}/kde/kdm/kdmrc
 ) ||:
 
 
@@ -189,6 +212,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.13-6
+- added %%triggerin for kdmrc
+
+* Sun Jun 27 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.13-5
+- add Source23, 24 instead of Patch1
+
 * Mon Jun  7 2010 IWAI, Masaharu <iwai@alib.jp> 4.4.13-4
 - add Vine Linux URL patch (Patch3)
 

s/soprano/soprano-vl.spec

@@ -1,12 +1,14 @@
-Summary:   Qt wrapper API to different RDF storage solutions
 Name:      soprano
-Version:   2.4.1
+Summary:   Qt wrapper API to different RDF storage solutions
+Version:   2.4.4
 Release:   1%{?_dist_release}
+
 License:   LGPLv2+
 Group:     System Environment/Libraries
-Source:    %{name}-%{version}.tar.bz2
 URL:       http://sourceforge.net/projects/soprano
 
+Source:    %{name}-%{version}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cmake
 BuildRequires: qt4-devel
@@ -101,6 +103,9 @@ make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 
 %changelog
+* Sat Jul 10 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.4-1
+- new upstream release
+
 * Sun Mar 14 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.1-1
 - new upstream release