rpms/jd/F-10 jd-rev2982-windres.patch, NONE, 1.1 .cvsignore, 1.385, 1.386 jd.spec, 1.445, 1.446 sources, 1.386, 1.387
Mamoru Tasaka
mtasaka at fedoraproject.org
Sat Jul 25 19:23:04 UTC 2009
- Previous message (by thread): rpms/jd/F-11 jd-rev2982-windres.patch, NONE, 1.1 .cvsignore, 1.379, 1.380 jd.spec, 1.441, 1.442 sources, 1.380, 1.381
- Next message (by thread): rpms/ninja/devel ninja.spec,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15467/F-10
Modified Files:
.cvsignore jd.spec sources
Added Files:
jd-rev2982-windres.patch
Log Message:
jd-rev2982-windres.patch:
configure.in | 1 +
src/Makefile.am | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
--- NEW FILE jd-rev2982-windres.patch ---
Index: configure.in
===================================================================
--- configure.in (revision 2982)
+++ configure.in (working copy)
@@ -161,6 +161,7 @@
esac
AC_SUBST(MAKE_WINDRES)
+AM_CONDITIONAL(WINDRES, test -n "$MAKE_WINDRES")
dnl
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (revision 2982)
+++ src/Makefile.am (working copy)
@@ -59,11 +59,8 @@
usrcmdpref.cpp \
linkfilterpref.cpp \
iomonitor.cpp \
- environment.cpp \
-\
- jd_windres.rc
+ environment.cpp
-
noinst_HEADERS = \
winmain.h \
httpcode.h \
@@ -123,6 +120,10 @@
MAKE_WINDRES = @MAKE_WINDRES@
+if WINDRES
+jd_SOURCES += jd_windres.rc
+endif
+
SUFFIXES = .rc .o
.rc.o:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- .cvsignore 22 Jul 2009 17:42:10 -0000 1.385
+++ .cvsignore 25 Jul 2009 19:23:01 -0000 1.386
@@ -1 +1 @@
-jd-2.4.2-svn2964_trunk.tgz
+jd-2.4.2-svn2981_trunk.tgz
Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -p -r1.445 -r1.446
--- jd.spec 22 Jul 2009 17:42:10 -0000 1.445
+++ jd.spec 25 Jul 2009 19:23:01 -0000 1.446
@@ -10,7 +10,7 @@
# Defined by upsteam
#
%define main_ver 2.4.2
-%define strtag svn2964_trunk
+%define strtag svn2981_trunk
%define repoid 41293
# Define this if this is pre-version
%define pre_release 1
@@ -19,7 +19,7 @@
##########################################
# Defined by vendor
#
-%define vendor_rel 1
+%define vendor_rel 2
%define extra_rel %{nil}
# Tag name changed from vendor to vendorname so as not to
# overwrite Vendor entry in Summary
@@ -51,6 +51,7 @@ License: GPLv2
URL: http://jd4linux.sourceforge.jp/
Source0: http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
#Source0: %{name}-%{main_ver}-%{strtag}.tgz
+Patch0: jd-rev2982-windres.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{gtkmmdevel}
@@ -77,6 +78,7 @@ JD is a 2ch browser based on gtkmm2.
%prep
%setup -q -n %{name}-%{main_ver}-%{strtag}
#find . -name .svn | sort -r | xargs %{__rm} -rf
+%patch0 -p0
sh autogen.sh
@@ -135,8 +137,8 @@ gtk-update-icon-cache %{_datadir}/icons/
%{icondir}/%{name}.png
%changelog
-* Thu Jul 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2964
+* Sun Jul 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2981
* Sun Jul 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.1-1
- 2.4.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- sources 22 Jul 2009 17:42:10 -0000 1.386
+++ sources 25 Jul 2009 19:23:01 -0000 1.387
@@ -1 +1 @@
-a822dc3e6717cf9117b98fcf04746d08 jd-2.4.2-svn2964_trunk.tgz
+5cc23e985051245bd2aa3faf3e3209fa jd-2.4.2-svn2981_trunk.tgz
- Previous message (by thread): rpms/jd/F-11 jd-rev2982-windres.patch, NONE, 1.1 .cvsignore, 1.379, 1.380 jd.spec, 1.441, 1.442 sources, 1.380, 1.381
- Next message (by thread): rpms/ninja/devel ninja.spec,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list