rpms/jsch/devel jsch.spec,1.31,1.32

Andrew Overholt overholt at fedoraproject.org
Mon Jan 11 16:40:09 UTC 2010


Author: overholt

Update of /cvs/pkgs/rpms/jsch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15466

Modified Files:
	jsch.spec 
Log Message:
* Mon Jan 11 2010 Andrew Overholt <overholt at redhat.com> 0.1.41-3
- Update URL in comment for MANIFEST.MF
- Fix Groups
- Remove ghost symlinking


Index: jsch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- jsch.spec	25 Jul 2009 04:11:00 -0000	1.31
+++ jsch.spec	11 Jan 2010 16:40:09 -0000	1.32
@@ -34,15 +34,15 @@
 
 Name:           jsch
 Version:        0.1.41
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 License:        BSD
 URL:            http://www.jcraft.com/jsch/
 Source0:        http://download.sourceforge.net/sourceforge/jsch/jsch-%{version}.zip
 # wget \
-# http://download.eclipse.org/tools/orbit/downloads/drops/S20090307012903/bundles/com.jcraft.jsch_0.1.41.v200903070017.jar
+# http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/com.jcraft.jsch_0.1.41.v200903070017.jar
 # unzip com.jcraft.jsch_*.jar META-INF/MANIFEST.MF
 # mv META-INF/MANIFEST.MF .
 # sed -i "/^Name/d" MANIFEST.MF
@@ -77,20 +77,14 @@ functionality into your own Java program
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
+Group:          Documentation
 
 %description    javadoc
 %{summary}.
 
 %package        demo
 Summary:        Examples for %{name}
-Group:          Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
+Group:          Documentation
 
 %description    demo
 %{summary}.
@@ -118,12 +112,12 @@ ln -s %{name}-%{version}.jar $RPM_BUILD_
 # javadoc
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # examples
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 cp -pr examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %if %{gcj_support}
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=234989
@@ -144,24 +138,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/rebuild-gcj-db
 %endif
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
-%post demo
-rm -f %{_datadir}/%{name}
-ln -s %{name}-%{version} %{_datadir}/%{name}
-
-%postun demo
-if [ "$1" = "0" ]; then
-    rm -f %{_datadir}/%{name}
-fi
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*.jar
@@ -174,16 +150,19 @@ fi
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}*
 
 %files demo
 %defattr(-,root,root,-)
-%doc %{_datadir}/%{name}-%{version}
-%ghost %doc %{_datadir}/%{name}
+%doc %{_datadir}/%{name}*
 
 
 %changelog
+* Mon Jan 11 2010 Andrew Overholt <overholt at redhat.com> 0.1.41-3
+- Update URL in comment for MANIFEST.MF
+- Fix Groups
+- Remove ghost symlinking
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:0.1.41-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list