rpms/jd/FC-6 .cvsignore, 1.29, 1.30 jd.spec, 1.35, 1.36 sources, 1.30, 1.31

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622/FC-6

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	4 Aug 2007 14:11:15 -0000	1.29
+++ .cvsignore	18 Sep 2007 13:46:26 -0000	1.30
@@ -1 +1 @@
-jd-1.9.6-beta070804.tgz
+jd-1.9.6-beta070918.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jd.spec	5 Aug 2007 09:31:26 -0000	1.35
+++ jd.spec	18 Sep 2007 13:46:26 -0000	1.36
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.9.6
-%define         strtag        beta070804
-%define         repoid        26577
+%define         strtag        beta070918
+%define         repoid        27206
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -62,6 +62,9 @@
 %if 0%{?_with_migemo} >= 1
 BuildRequires:  cmigemo-devel
 %endif
+%if %{pre_release}
+#BuildRequires:	subversion
+%endif
 Requires:       %{fontpackage}
 
 
@@ -70,7 +73,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-find . -name .svn | sort -r | xargs %{__rm} -rf
+#find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
 sh autogen.sh
@@ -90,15 +93,14 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
 %{__mkdir_p} $RPM_BUILD_ROOT%{icondir}
-
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   %{name}.desktop
+   --delete-original \
+   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -116,9 +118,13 @@
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
 %{_datadir}/applications/%{vendorname}-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
+- 1.9.6 beta 070918
+
 * Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
 - 1.9.6 beta 070804 release 2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	5 Aug 2007 09:31:26 -0000	1.30
+++ sources	18 Sep 2007 13:46:26 -0000	1.31
@@ -1 +1 @@
-e9b12a4fea009de825f6cc424a6dbd1c  jd-1.9.6-beta070804.tgz
+6ab5f1a0d954a974be5b77fbfa9c8273  jd-1.9.6-beta070918.tgz